# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1283449491 -10800 # Node ID e6ad4ef83b23092ef3a8ec12ad9690074308485f # Parent 4633027730f5c716a34108ce40c981c1242dca6d Revision: 201033 Kit: 201035 diff -r 4633027730f5 -r e6ad4ef83b23 config.tests/all/simpleapp/main.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config.tests/all/simpleapp/main.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,29 @@ +/**************************************************************************** +** +** 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 Config 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. +** +****************************************************************************/ + +int main() +{ + return 0; +} diff -r 4633027730f5 -r e6ad4ef83b23 config.tests/all/simpleapp/simpleapp.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config.tests/all/simpleapp/simpleapp.pro Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,35 @@ +# +############################################################################# +## +## 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 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. +## +############################################################################# +# + +TEMPLATE = app +TARGET = hbconftest_simpleapp +CONFIG -= qt +DEPENDPATH += . +INCLUDEPATH += . + +# Input +SOURCES += main.cpp diff -r 4633027730f5 -r e6ad4ef83b23 configure.py --- a/configure.py Wed Aug 18 10:05:37 2010 +0300 +++ b/configure.py Thu Sep 02 20:44:51 2010 +0300 @@ -719,6 +719,8 @@ config = ConfigFile() test = ConfigTest(BUILDENV.sourcedir(), BUILDENV.builddir()) print("\nDetecting available features...") + working_qmake_and_make = test.compile("config.tests/all/simpleapp") + print("INFO: Working qmake and make:\t\t%s" % working_qmake_and_make) if options.qtmobility == None: options.qtmobility = test.compile("config.tests/all/mobility") if options.qtmobility: @@ -961,6 +963,11 @@ print line print "###############################################################################" + if not working_qmake_and_make: + print("") + print("WARNING: There does not seem to be a working qmake and/or make in the environment.") + print(" Please check the environment and/or configuration parameters.") + # print summary print("") if MAKE.bin() == "nmake" and options.msvc: diff -r 4633027730f5 -r e6ad4ef83b23 hb.pro --- a/hb.pro Wed Aug 18 10:05:37 2010 +0300 +++ b/hb.pro Thu Sep 02 20:44:51 2010 +0300 @@ -76,10 +76,13 @@ INSTALLS += cssbinary symbian { - cssbinary.commands += $$hbCopyCommand($$cssbinary.files, $$${EPOCROOT}/epoc32/data/z/resource/hb/themes/) - cssbinary.commands += && $$hbCopyCommand($$cssbinary.files, $$${EPOCROOT}/epoc32/release/winscw/udeb/z/resource/hb/themes/) - QMAKE_DISTCLEAN += $$${EPOCROOT}/epoc32/data/z/resource/hb/themes/$$cssbinary.files - QMAKE_DISTCLEAN += $$${EPOCROOT}/epoc32/release/winscw/udeb/z/resource/hb/themes/$$cssbinary.files + # TODO: Magic ahead + makefile_epocroot=$${EPOCROOT} + hbUnixStyle():makefile_epocroot=$$${EPOCROOT}/ + cssbinary.commands += $$hbCopyCommand($$cssbinary.files, $${makefile_epocroot}epoc32/data/z/resource/hb/themes/) + cssbinary.commands += && $$hbCopyCommand($$cssbinary.files, $${makefile_epocroot}epoc32/release/winscw/udeb/z/resource/hb/themes/) + QMAKE_DISTCLEAN += $${makefile_epocroot}epoc32/data/z/resource/hb/themes/$$cssbinary.files + QMAKE_DISTCLEAN += $${makefile_epocroot}epoc32/release/winscw/udeb/z/resource/hb/themes/$$cssbinary.files QMAKE_EXTRA_TARGETS += cssbinary } diff -r 4633027730f5 -r e6ad4ef83b23 mkspecs/docml2bin.prf --- a/mkspecs/docml2bin.prf Wed Aug 18 10:05:37 2010 +0300 +++ b/mkspecs/docml2bin.prf Thu Sep 02 20:44:51 2010 +0300 @@ -14,11 +14,17 @@ DOCMLFILE_PWD = $${_PRO_FILE_PWD_}/$${DOCMLFILE} rcc.depends += $${DOCMLFILE_PWD}.bin - BLD_INF_RULES.prj_extensions += "START EXTENSION qt/qmake_extra_pre_targetdep.export" \ + 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" + "END" + symbian_test { + BLD_INF_RULES.prj_testextensions += $$DOCML2BINEXTENSION + } else { + BLD_INF_RULES.prj_extensions += $$DOCML2BINEXTENSION + } } QMAKE_EXTRA_COMPILERS += docml2bin diff -r 4633027730f5 -r e6ad4ef83b23 mkspecs/hb_functions.prf --- a/mkspecs/hb_functions.prf Wed Aug 18 10:05:37 2010 +0300 +++ b/mkspecs/hb_functions.prf Thu Sep 02 20:44:51 2010 +0300 @@ -65,6 +65,29 @@ return(true) } +# params: +# eg. foo_path = $$hbStripDriveLetter($$PWD)/foo.txt +defineReplace(hbStripDriveLetter) { + stripped_path = $$1 + symbian { + contains(QMAKE_HOST.os, Windows) { + colons_found = $$find( stripped_path, "\\:" ) + !isEmpty(colons_found) { + stripped_path = $$section(stripped_path, ":", 1) + } + } + } + return($$stripped_path) +} + +# params: +# e.g. hbPrjExport("$${PWD}/foo.txt", "$${EPOCROOT}epoc32/release/foo.txt") +defineTest(hbPrjExport) { + BLD_INF_RULES.prj_exports += "$$hbStripDriveLetter($$1) $$hbStripDriveLetter($$2)" + export(BLD_INF_RULES.prj_exports) + return(true) +} + # params: # NOTE: exports PUBLIC_HEADERS, RESTRICTED_HEADERS and CONVENIENCE_HEADERS # eg. hbExportHeaders(hbcore) @@ -131,8 +154,10 @@ system($$1 > $$DEVNULL 2>&1):return($$1) # host build is runnable? - hbtoolcmd = $$hbNativePath($$HB_BUILD_DIR/bin/$$1) - system($$hbtoolcmd > $$DEVNULL 2>&1):return($$hbtoolcmd) + !isEmpty(HB_BUILD_DIR) { + hbtoolcmd = $$hbNativePath($$HB_BUILD_DIR/bin/$$1) + system($$hbtoolcmd > $$DEVNULL 2>&1):return($$hbtoolcmd) + } # tool in HB_BIN_DIR? hbtoolcmd = $$hbNativePath($$HB_BIN_DIR/$$1) @@ -142,8 +167,14 @@ hbtoolcmd = $$hbNativePath($$sprintf("%1%2", $$HB_SOURCE_DIR/bin/$$1, "_symbian.exe")) system($$hbtoolcmd > $$DEVNULL 2>&1):return($$hbtoolcmd) } - # fall back to /bin - return($$hbNativePath($$HB_BUILD_DIR/bin/$$1)) + + !isEmpty(HB_BUILD_DIR) { + # prefer /bin + return($$hbNativePath($$HB_BUILD_DIR/bin/$$1)) + } else { + # fall back to + return($$hbNativePath($$HB_BIN_DIR/$$1)) + } } # params: diff -r 4633027730f5 -r e6ad4ef83b23 src/hbapps/hbfeatureconfigapp/infoview.cpp --- a/src/hbapps/hbfeatureconfigapp/infoview.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbapps/hbfeatureconfigapp/infoview.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -36,7 +36,7 @@ #include "infoview.h" InfoView::InfoView(HbDocumentLoader* loader, HbMainWindow *window) : - mWindow(window), + mWindow(window), mLoader(loader), mResolutionLabel(0), mOrientationLabel(0), diff -r 4633027730f5 -r e6ad4ef83b23 src/hbapps/hbfeatureconfigapp/infoview.h --- a/src/hbapps/hbfeatureconfigapp/infoview.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbapps/hbfeatureconfigapp/infoview.h Thu Sep 02 20:44:51 2010 +0300 @@ -34,10 +34,10 @@ class InfoView : public HbView { - Q_OBJECT - + Q_OBJECT + public: - InfoView(HbDocumentLoader* loader, HbMainWindow *window = 0); + InfoView(HbDocumentLoader* loader, HbMainWindow *window = 0); void setSettingsView(HbView *view); private: @@ -49,7 +49,7 @@ void goToSettingsView(); private: - HbMainWindow* mWindow; + HbMainWindow* mWindow; HbDocumentLoader* mLoader; HbLabel* mResolutionLabel; HbLabel* mOrientationLabel; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbapps/hbfeatureconfigapp/main.cpp --- a/src/hbapps/hbfeatureconfigapp/main.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbapps/hbfeatureconfigapp/main.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -50,7 +50,7 @@ } else { qFatal("Unable to read :/docml/hbfeatureconfigapp.docml"); } - + window->show(); return app.exec(); } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbapps/hbfeatureconfigapp/settingsview.cpp --- a/src/hbapps/hbfeatureconfigapp/settingsview.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbapps/hbfeatureconfigapp/settingsview.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -45,15 +45,15 @@ #endif SettingsView::SettingsView(HbDocumentLoader* loader, HbMainWindow *window, HbView *infoView) : - mWindow(window), - mLoader(loader), + mWindow(window), + mLoader(loader), mResolutionComboBox(0), - mOrientationComboBox(0), + mOrientationComboBox(0), mLayoutDirectionComboBox(0), - mTouchAreaComboBox(0), + mTouchAreaComboBox(0), mTextItemComboBox(0), mIconItemComboBox(0), - mLocalizationComboBox(0), + mLocalizationComboBox(0), mTestUtilityComboBox(0), mFpsCounterComboBox(0), mInfoView(infoView) @@ -130,11 +130,11 @@ mIconItemComboBox = qobject_cast(mLoader->findWidget("iconitemSettingCombo")); mIconItemComboBox->setModel(new QStringListModel(QStringList() << tr("Invisible") << tr("Visible"))); } - - if (!mFpsCounterComboBox) { - mFpsCounterComboBox = qobject_cast(mLoader->findWidget("fpscounterSettingCombo")); - mFpsCounterComboBox->setModel(new QStringListModel(QStringList() << tr("Invisible") << tr("Visible"))); - } + + if (!mFpsCounterComboBox) { + mFpsCounterComboBox = qobject_cast(mLoader->findWidget("fpscounterSettingCombo")); + mFpsCounterComboBox->setModel(new QStringListModel(QStringList() << tr("Invisible") << tr("Visible"))); + } if( !mLocalizationComboBox ) { mLocalizationComboBox = qobject_cast(mLoader->findWidget("localizationSettingCombo")); @@ -169,9 +169,9 @@ void SettingsView::changeResolution(int index) { #if defined(Q_OS_SYMBIAN) - sendEvent(KChangeDeviceProfile, index); + sendEvent(KChangeDeviceProfile, index); #else - Q_UNUSED(index); + Q_UNUSED(index); #endif } @@ -223,9 +223,9 @@ void SettingsView::changeFpsCounterVisibility(int index) { #if defined(Q_OS_SYMBIAN) - sendEvent(KChangeFpsCounterVis, index); + sendEvent(KChangeFpsCounterVis, index); #else - Q_UNUSED(index); + Q_UNUSED(index); #endif } @@ -275,7 +275,7 @@ connect(mLayoutDirectionComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changeLayoutDirection(int))); connect(mOrientationComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changeOrientation(int))); connect(mResolutionComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changeResolution(int))); - connect(mFpsCounterComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changeFpsCounterVisibility(int))); + connect(mFpsCounterComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changeFpsCounterVisibility(int))); connect(mLocalizationComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changeLocMode(int))); connect(mTestUtilityComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changeTestUtilMode(int))); } @@ -288,7 +288,7 @@ disconnect(mLayoutDirectionComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changeLayoutDirection(int))); disconnect(mOrientationComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changeOrientation(int))); disconnect(mResolutionComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changeResolution(int))); - disconnect(mFpsCounterComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changeFpsCounterVisibility(int))); + disconnect(mFpsCounterComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changeFpsCounterVisibility(int))); disconnect(mLocalizationComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changeLocMode(int))); disconnect(mTestUtilityComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changeTestUtilMode(int))); } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbapps/hbfeatureconfigapp/settingsview.h --- a/src/hbapps/hbfeatureconfigapp/settingsview.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbapps/hbfeatureconfigapp/settingsview.h Thu Sep 02 20:44:51 2010 +0300 @@ -36,10 +36,10 @@ class SettingsView : public HbView { - Q_OBJECT + Q_OBJECT public: - SettingsView(HbDocumentLoader* loader, HbMainWindow *window, HbView *infoView); + SettingsView(HbDocumentLoader* loader, HbMainWindow *window, HbView *infoView); private: void setupMenu(); @@ -51,7 +51,7 @@ private slots: void changeOrientation(); - void changeResolution(int index); + void changeResolution(int index); void changeOrientation(int index); void changeLayoutDirection(int index); void changeTouchAreaVisibility(int index); @@ -59,7 +59,7 @@ void changeIconItemVisibility(int index); void changeLocMode(int index); void changeTestUtilMode(int index); - void changeFpsCounterVisibility(int index); + void changeFpsCounterVisibility(int index); void updateLayout(); void updateSelections(); @@ -77,8 +77,8 @@ HbComboBox* mIconItemComboBox; HbComboBox* mLocalizationComboBox; HbComboBox* mTestUtilityComboBox; - HbComboBox* mFpsCounterComboBox; - HbView* mInfoView; + HbComboBox* mFpsCounterComboBox; + HbView* mInfoView; }; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbapps/hbthemechanger/hbthemechanger.pro --- a/src/hbapps/hbthemechanger/hbthemechanger.pro Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbapps/hbthemechanger/hbthemechanger.pro Thu Sep 02 20:44:51 2010 +0300 @@ -30,8 +30,6 @@ QT += network DEFINES += HB_RESOURCES_DIR=\"\\\"$${HB_RESOURCES_DIR}\\\"\" -CONFIG += hb - # directories DESTDIR = $${HB_BUILD_DIR}/bin diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/3rdparty/qtsingleapplication/src/qtsinglecoreapplication.pri --- a/src/hbcore/3rdparty/qtsingleapplication/src/qtsinglecoreapplication.pri Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/3rdparty/qtsingleapplication/src/qtsinglecoreapplication.pri Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ -INCLUDEPATH += $$PWD +INCLUDEPATH += $$PWD DEPENDPATH += $$PWD -HEADERS += $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h -SOURCES += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp +HEADERS += $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h +SOURCES += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp QT *= network diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/core/hbapplication.cpp --- a/src/hbcore/core/hbapplication.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/core/hbapplication.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -138,6 +138,9 @@ } else if (flags & Hb::SplashFixedHorizontal) { splashFlags |= HbSplashScreen::FixedHorizontal; } + if (flags & Hb::ForceQtSplash) { + splashFlags |= HbSplashScreen::ForceQt; + } #if defined(Q_OS_SYMBIAN) && defined(HBAPP_LOGGING) ELAPSED_TIMER t; @@ -160,7 +163,7 @@ // This function contains code that needs to be executed before // the QApplication constructor. - if (!HbSplashScreenExt::needsQt()) { + if (!HbSplashScreenExt::needsQt() && !flags.testFlag(Hb::ForceQtSplash)) { // The splash screen is capable of working without relying on Qt in any // way. So launch it now. This is the ideal case because we don't have // to wait for the potentially slow QApplication construction. @@ -180,7 +183,7 @@ static void handleQtBasedSplash(Hb::ApplicationFlags flags) { - if (HbSplashScreenExt::needsQt()) { + if (HbSplashScreenExt::needsQt() || flags.testFlag(Hb::ForceQtSplash)) { // Splash needs Qt so it has not yet been started. Launch it now. initSplash(flags); } else { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/core/hbglobal.h --- a/src/hbcore/core/hbglobal.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/core/hbglobal.h Thu Sep 02 20:44:51 2010 +0300 @@ -31,7 +31,7 @@ //#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-2010wk31" +#define HB_VERSION_STR "0.5.0-2010wk33" // HB_VERSION=0xMMNNPP (MM=major, NN=minor, PP=patch) #define HB_VERSION 0x000500 diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/core/hbgraphicsscene.cpp --- a/src/hbcore/core/hbgraphicsscene.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/core/hbgraphicsscene.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -84,7 +84,7 @@ mToolTip(0), mInputFocusSet(0), mPolishWidgets(false), - mRepolishWidgets(false), + mRepolishWidgets(false), mDrawCount(0), mFPS(0), mFPSTime(0), @@ -312,7 +312,14 @@ { QGraphicsItem *oldFocusItem = focusItem(); - QGraphicsScene::mousePressEvent(mouseEvent); + QGraphicsScene::mousePressEvent(mouseEvent); + + // Return when fouswidget is a vanilla widget. no need to reset iputcontext. + // as in case of vanilla widgets reseting happens bit differently (via Qt framework) + QInputContext *ic = qApp->inputContext(); + if (ic && ic->focusWidget() && !ic->focusWidget()->inherits("HbMainWindow")) { + return; + } // If old focus item doesn't accept input method events, we might need to reset input context // manually because that is done automatically only when focus changes between items that diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/core/hbnamespace.cpp --- a/src/hbcore/core/hbnamespace.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/core/hbnamespace.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -256,19 +256,36 @@ /*! \var Hb::ApplicationFlag Hb::NoSplash - Disables the splash screen that is shown during HbApplication construction. + Disables the splash screen that is shown during HbApplication construction. Note that + the splash screen can still be launched manually using HbSplashScreen::start(). */ /*! \var Hb::ApplicationFlag Hb::SplashFixedVertical Indicates that the application will force its orientation to vertical. As a result the splash screen will also be forced to vertical orientation. + + \sa HbSplashScreen::FixedVertical */ /*! \var Hb::ApplicationFlag Hb::SplashFixedHorizontal Indicates that the application will force its orientation to horizontal. As a result the splash screen will also be forced to horizontal orientation. + + \sa HbSplashScreen::FixedHorizontal +*/ + +/*! \var Hb::ApplicationFlag Hb::ForceQtSplash + + Forces the usage of QWidget-based splash screens, even on platforms where a more + optimal, non-Qt dependent implementation would be available. Use this when it must be + guaranteed that the splash screen will use the same graphics system as Qt (e.g. because + the application forces 'raster'). The downside is a decrease in performance and user + experience, because in this case the splash can only be shown after constructing + QApplication. + + \sa HbSplashScreen::ForceQt */ /*! @@ -501,6 +518,21 @@ \image html interaction_rotated90degrees.png */ +/*! \var Hb::InstantSelectionChanged + Sent went a selectable widget (like a check box) changes its selection state. +*/ + +/*! \deprecated Hb::InstantMultitouchActivated + is deprecated. Use Hb::InstantAdvancedGestureActivated instead. +*/ + +/*! \var Hb::InstantAdvancedGestureActivated + Sent when a touch gesture involving more then one finger can be performed. + For example a second touch point is detected and a pinch gesture can be performed. +*/ + + + /*! \var Hb::InstantInstantUser User-defined interaction event type. */ diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/core/hbnamespace.h --- a/src/hbcore/core/hbnamespace.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/core/hbnamespace.h Thu Sep 02 20:44:51 2010 +0300 @@ -239,7 +239,8 @@ DefaultApplicationFlags = 0x00, NoSplash = 0x01, SplashFixedVertical = 0x02, - SplashFixedHorizontal = 0x04 + SplashFixedHorizontal = 0x04, + ForceQtSplash = 0x08 }; Q_DECLARE_FLAGS(ApplicationFlags, ApplicationFlag) @@ -302,7 +303,8 @@ InstantBoundaryReached, InstantRotated90Degrees, InstantSelectionChanged, - InstantMultitouchActivated, + InstantMultitouchActivated, // deprecated + InstantAdvancedGestureActivated, /* add new standard instant interactions here */ NumberOfInstantInteractions, InstantUser = 1000, diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/core/hborientationstatus.cpp --- a/src/hbcore/core/hborientationstatus.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/core/hborientationstatus.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -115,16 +115,28 @@ #endif { #ifdef Q_OS_SYMBIAN + // Set up the communication link between the foreground/sleep status handler + // and the sensor listener. HbForegroundWatcher::instance()->setSensorListener(mSensorListener); + // Create orientation property for Qt/Hb. RProperty::Define(KHbPsHardwareCoarseOrientationCategoryUid, KHbPsHardwareCoarseQtOrientationKey, RProperty::EInt, KRdPolicy, KWrPolicy); mQtProperty.Attach(KHbPsHardwareCoarseOrientationCategoryUid, KHbPsHardwareCoarseQtOrientationKey); + // Create orientation property for Window Server. RProperty::Define(KHbPsHardwareCoarseOrientationCategoryUid, KHbPsHardwareCoarseWsOrientationKey, RProperty::EInt, KRdPolicy, KWrPolicy); mWsProperty.Attach(KHbPsHardwareCoarseOrientationCategoryUid, KHbPsHardwareCoarseWsOrientationKey); - storeOrientation(defaultOrientation); + + // Publish the default orientation, but storeOrientation() cannot be called directly + // because it would lead to infinite loop in case of the themeserver process. If there + // is another storeOrientation() call meanwhile, overwriting the value in + // mOrientationToBeStored is perfectly fine because then there is no sense in + // publishing the default orientation anymore. + mOrientationToBeStored = defaultOrientation; + QMetaObject::invokeMethod(this, "storeOrientation", Qt::QueuedConnection); + #else Q_UNUSED(parent); Q_UNUSED(defaultOrientation); @@ -133,7 +145,8 @@ void HbOrientationStatus::sensorOrientationChanged(Qt::Orientation newOrientation) { - storeOrientation(newOrientation); + mOrientationToBeStored = newOrientation; + storeOrientation(); } void HbOrientationStatus::sensorStatusChanged(bool status, bool notify) @@ -144,25 +157,26 @@ // orientation because the state when lights come back can be anything so we // need to have a clean start then. if (status == false) { - storeOrientation(mDefaultOrientation); + mOrientationToBeStored = mDefaultOrientation; + storeOrientation(); } #else Q_UNUSED(status) #endif } -void HbOrientationStatus::storeOrientation(Qt::Orientation orientation) +void HbOrientationStatus::storeOrientation() { #ifdef Q_OS_SYMBIAN - mQtProperty.Set(orientation); + + mQtProperty.Set(mOrientationToBeStored); + #ifdef HB_WSERV_HAS_RENDER_ORIENTATION - int orientationForWserv = mapOriToRenderOri(orientation); + int orientationForWserv = mapOriToRenderOri(mOrientationToBeStored); mWsProperty.Set(orientationForWserv); #endif -#else - Q_UNUSED(orientation); -#endif +#endif // Q_OS_SYMBIAN } /*! diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/core/hborientationstatus_p.h --- a/src/hbcore/core/hborientationstatus_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/core/hborientationstatus_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -60,11 +60,13 @@ HbWsOrientationListenerPrivate *d; }; +private slots: + void storeOrientation(); + private: HbOrientationStatus(QObject *parent, Qt::Orientation defaultOrientation); void sensorOrientationChanged(Qt::Orientation newOrientation); void sensorStatusChanged(bool status, bool notify); - void storeOrientation(Qt::Orientation orientation); private: #ifdef Q_OS_SYMBIAN @@ -73,6 +75,7 @@ RProperty mWsProperty; Qt::Orientation mDefaultOrientation; #endif + Qt::Orientation mOrientationToBeStored; }; #endif // HBORIENTATIONSTATUS_P_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/core/hbs60events.h --- a/src/hbcore/core/hbs60events.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/core/hbs60events.h Thu Sep 02 20:44:51 2010 +0300 @@ -26,12 +26,12 @@ #ifndef HBS60EVENTS_H #define HBS60EVENTS_H -const int KChangeDirection = 0x20028671; -const int KChangeOrientation = 0x20028672; -const int KChangeDeviceProfile = 0x20028673; -const int KChangeTouchAreaVis = 0x20028674; -const int KChangeTextItemVis = 0x20028675; -const int KChangeIconItemVis = 0x20028676; +const int KChangeDirection = 0x20028671; +const int KChangeOrientation = 0x20028672; +const int KChangeDeviceProfile = 0x20028673; +const int KChangeTouchAreaVis = 0x20028674; +const int KChangeTextItemVis = 0x20028675; +const int KChangeIconItemVis = 0x20028676; const int KChangeFpsCounterVis = 0x20028677; #endif // HBS60EVENTS_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/core/hbsharedmemoryallocators_p.h --- a/src/hbcore/core/hbsharedmemoryallocators_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/core/hbsharedmemoryallocators_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -61,11 +61,11 @@ void *data(); int size() const; -#ifdef HB_HAVE_PROTECTED_CHUNK +#if defined(HB_HAVE_PROTECTED_CHUNK) && defined(Q_OS_SYMBIAN) void setErrorString(const QString &function, TInt errorCode); #endif private: -#ifdef HB_HAVE_PROTECTED_CHUNK +#if defined(HB_HAVE_PROTECTED_CHUNK) && defined(Q_OS_SYMBIAN) QSharedMemory::SharedMemoryError wrapperError; QString errorString; const QString key; @@ -174,7 +174,7 @@ qptrdiff alloc(int size); int allocatedSize(qptrdiff offset); void free(qptrdiff offset); - void initialize(HbSharedMemoryWrapper *sharedChunk, + void initialize(HbSharedMemoryWrapper *sharedChunk, const quintptr offset = 0, HbSharedMemoryAllocator *mainAllocator = 0); #ifdef HB_THEME_SERVER_MEMORY_REPORT diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/core/hbsharedmemorymanager_p.cpp --- a/src/hbcore/core/hbsharedmemorymanager_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/core/hbsharedmemorymanager_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -52,7 +52,7 @@ HbSharedMemoryManager *HbSharedMemoryManager::memManager = 0; -#ifdef HB_HAVE_PROTECTED_CHUNK // Symbian, protected chunk +#if defined(HB_HAVE_PROTECTED_CHUNK) && defined(Q_OS_SYMBIAN) HbSharedMemoryWrapper::HbSharedMemoryWrapper(const QString &key, QObject *parent) : wrapperError(QSharedMemory::NoError), key(key), @@ -455,7 +455,7 @@ fullAllocationHistory.append(QPair(newSize | reallocIdentifier, offset)); } #endif - newOffset = alloc(newSize); + newOffset = alloc(newSize); int allocatedSize = ALIGN(newSize); if (offset > 0) { #ifdef HB_BIN_CSS diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/core/hbsharedmemorymanagerut_p.cpp --- a/src/hbcore/core/hbsharedmemorymanagerut_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/core/hbsharedmemorymanagerut_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -92,8 +92,8 @@ } } } - success = true; - } + success = true; + } return success; } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/core/hbstring_p.cpp --- a/src/hbcore/core/hbstring_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/core/hbstring_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -332,7 +332,7 @@ HbStringData* newData = getStringData(mMemoryType, dataOffset.get()); new(newData) HbStringData(); - + // Allocate new string buffer if given size is greater than zero if (size > 0) { newData->mStartOffset = manager->alloc(size*sizeof(QChar)); @@ -475,7 +475,7 @@ } QChar *ptr = getAddress(mMemoryType, data->mStartOffset, mShared); - QChar *otherPtr = getAddress(other.mMemoryType, otherData->mStartOffset, other.mShared); + QChar *otherPtr = getAddress(other.mMemoryType, otherData->mStartOffset, other.mShared); return memEquals((quint16 *)ptr, (quint16 *)otherPtr, data->mLength); } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/core/hbvector_p.h --- a/src/hbcore/core/hbvector_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/core/hbvector_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -706,7 +706,7 @@ ~HbVectorData() { -#ifdef HB_BIN_CSS +#ifdef HB_BIN_CSS HbCssConverterUtils::unregisterOffsetHolder(mStart.offsetPtr()); #endif //HB_BIN_CSS destroyAll(); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/cssparser/hbcssformatter_p.cpp --- a/src/hbcore/cssparser/hbcssformatter_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/cssparser/hbcssformatter_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -28,13 +28,13 @@ /*! \class HbCssFormatter \brief Internal class for converting in-memory CSS structures (declarations and rules) - to string representations. - - These functions only work in builds configured with the --developer flag; in other - builds the implementation is defined-out to reduce ROM size, and an empty string - is returned from all functions. - - Example usage would be: + to string representations. + + These functions only work in builds configured with the --developer flag; in other + builds the implementation is defined-out to reduce ROM size, and an empty string + is returned from all functions. + + Example usage would be: HbVector rules; [...] qDebug() << HbCssFormatter::weightedStyleRulesToString(rules); @@ -47,14 +47,14 @@ */ QString HbCssFormatter::weightedStyleRulesToString(const HbVector &rules) { - QString str; + QString str; #ifdef HB_DEVELOPER - foreach (const HbCss::WeightedRule &rule, rules) { - if (str.length() > 0) { - str.append("\n"); - } - str.append(styleRuleToString(rule.second, rule.first)); - } + foreach (const HbCss::WeightedRule &rule, rules) { + if (str.length() > 0) { + str.append("\n"); + } + str.append(styleRuleToString(rule.second, rule.first)); + } #else Q_UNUSED( rules ); #endif diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/cssparser/hbcssparser_p.h --- a/src/hbcore/cssparser/hbcssparser_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/cssparser/hbcssparser_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -624,7 +624,7 @@ #endif // Data - uint classNameHash; + uint classNameHash; HbVector styleRules; HbVector portraitRules; HbVector landscapeRules; @@ -816,11 +816,11 @@ class HB_CORE_PRIVATE_EXPORT Parser //krazy:exclude=multiclasses { public: - enum Error{ - NoError, - OutOfMemoryError, - UnknownError - }; + enum Error{ + NoError, + OutOfMemoryError, + UnknownError + }; Parser(); explicit Parser(const QString &css, bool file = false); @@ -851,8 +851,8 @@ bool parseFunction(HbString *name, HbString *args); bool parseHexColor(QColor *col); bool testAndParseUri(HbString *uri); - - void addRuleToWidgetStack(StyleSheet *sheet, const QString &stackName, StyleRule &rule); + + void addRuleToWidgetStack(StyleSheet *sheet, const QString &stackName, StyleRule &rule); inline bool testRuleset() { return testSelector(); } inline bool testSelector() { return testSimpleSelector(); } @@ -905,7 +905,7 @@ QVector symbols; int index; int errorIndex; - Error errorCode; + Error errorCode; bool hasEscapeSequences; QString sourcePath; QString sourceFile; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/cssparser/hblayeredstyleloader_p.h --- a/src/hbcore/cssparser/hblayeredstyleloader_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/cssparser/hblayeredstyleloader_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -45,7 +45,7 @@ }; struct Layer { - HbStyleSelector styleSelector; + HbStyleSelector styleSelector; }; enum Concern { @@ -82,7 +82,7 @@ HbVector declarationsForNode(HbStyleSelector::NodePtr node, const Qt::Orientation orientation, const char *extraPseudo = 0) const; HbVector styleRulesForNode(HbStyleSelector::NodePtr node, - const Qt::Orientation orientation) const; + const Qt::Orientation orientation) const; void variableRuleSets(QHash *variables) const; protected: diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/cssparser/hbstyleloader.cpp --- a/src/hbcore/cssparser/hbstyleloader.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/cssparser/hbstyleloader.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -28,7 +28,7 @@ #include "hbwidgetstyleloader_p.h" /*! - @stable + @stable @hbcore \class HbStyleLoader \brief allows an application to override platform layout and stylesheet definitions @@ -100,3 +100,4 @@ HbLayeredStyleLoader::Concern_All, HbLayeredStyleLoader::Priority_Application); } + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/cssparser/hbstyleloader.h --- a/src/hbcore/cssparser/hbstyleloader.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/cssparser/hbstyleloader.h Thu Sep 02 20:44:51 2010 +0300 @@ -31,8 +31,8 @@ class HB_CORE_EXPORT HbStyleLoader { public: - static bool registerFilePath(const QString &filePath); - static bool unregisterFilePath(const QString &filePath); + static bool registerFilePath(const QString &filePath); + static bool unregisterFilePath(const QString &filePath); }; #endif // HBSTYLELOADER_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/cssparser/hbwidgetstyleloader_p.cpp --- a/src/hbcore/cssparser/hbwidgetstyleloader_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/cssparser/hbwidgetstyleloader_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -50,22 +50,22 @@ \class HbWidgetStyleLoader \brief allows collections of widget-specific CSS files to be automatically loaded when needed - HbWidgetStyleLoader allows widget-specific CSS files to be automatically loaded and unloaded - into the layered CSS system on demand. CSS style rules should be split into separate files - based on the widget they apply to, and named after the widget they apply to (in lower case). - - Multiple FileSets can be active at any given time, and apply to any layer of any stack. - - A list of class names that CSS has been loaded for is maintained for each FileSet, and the + HbWidgetStyleLoader allows widget-specific CSS files to be automatically loaded and unloaded + into the layered CSS system on demand. CSS style rules should be split into separate files + based on the widget they apply to, and named after the widget they apply to (in lower case). + + Multiple FileSets can be active at any given time, and apply to any layer of any stack. + + A list of class names that CSS has been loaded for is maintained for each FileSet, and the parent hierarchy is navigated up to HbWidget to load CSS for all parent classes. - - \note When a FileSet is removed, the corresponding layer of the CSS stack will be cleared. - Any other FileSets active on the same layer will have their loaded list cleared, and required - CSS will be reloaded at the next polish event, but any CSS files manually loaded to the layer - will be cleared without warning. It is therefore recommended to only load CSS either manually - or via this class for any given layer of the stack. + + \note When a FileSet is removed, the corresponding layer of the CSS stack will be cleared. + Any other FileSets active on the same layer will have their loaded list cleared, and required + CSS will be reloaded at the next polish event, but any CSS files manually loaded to the layer + will be cleared without warning. It is therefore recommended to only load CSS either manually + or via this class for any given layer of the stack. - \sa HbLayeredStyleLoader + \sa HbLayeredStyleLoader */ @@ -79,7 +79,7 @@ */ HbWidgetStyleLoader* HbWidgetStyleLoader::instance() { - return globalWidgetStyleLoader(); + return globalWidgetStyleLoader(); } @@ -181,7 +181,7 @@ into the specified layer based on the filename pattern given. The replacement string "%w" will be substituted for the widget class name, and ".css" or - ".widgetml" will be appended when loading appropriate files. For example, + ".widgetml" will be appended when loading appropriate files. For example, the pathPattern: ":/css/widgets/%w" would become: @@ -199,16 +199,16 @@ \note The pathPattern is treated as a unique identifier, so only one FileSet can be created for any given path. - + \param pathPattern, path to load CSS files from, with %w representing the widget class name - \param concern, the CSS concern stack to load the CSS files into - \param priority, the layer of the CSS stack to load the files into + \param concern, the CSS concern stack to load the CSS files into + \param priority, the layer of the CSS stack to load the files into \return whether the addition was successful */ /* bool HbWidgetStyleLoader::addFileSet(const QString &pathPattern, const HbLayeredStyleLoader::Concern concern, - const HbLayeredStyleLoader::LayerPriority priority) + const HbLayeredStyleLoader::LayerPriority priority) { return doAddFileSet(pathPattern, FileSetType_Pattern, concern, priority); } @@ -223,10 +223,10 @@ const HbLayeredStyleLoader::Concern concern, const HbLayeredStyleLoader::LayerPriority priority) { - for(int i=0; i handles = fs.loadedCss.values(); foreach( int handle, handles ) { stack->unload(handle, priority); } } - } - mFileSets.removeAt(i); + } + mFileSets.removeAt(i); #ifndef HB_BIN_CSS if (HbInstancePrivate::d_ptr()->mStyle) { HbInstancePrivate::d_ptr()->mStyle->d_func()->clearStyleSheetCaches(); @@ -338,10 +338,10 @@ } #endif found = true; - } - } - - return found; + } + } + + return found; } @@ -351,25 +351,25 @@ Attempts to load CSS for the given widget (and all parent classes) based on the currently existing filesets. Note that a list of loaded CSS files is stored, so calling this function on a widget whose CSS is already loaded will NOT cause duplicate CSS. - Failed attempts to load a file will also be cached to avoid repeated filesystem access + Failed attempts to load a file will also be cached to avoid repeated filesystem access requests. - + \param widget, Widget to load CSS for */ void HbWidgetStyleLoader::loadCss(const HbWidget *widget) { - if(!widget){ - return; - } + if(!widget){ + return; + } const char *classNameChar = widget->metaObject()->className(); uint classNameHash = qHash(classNameChar); if (mFullyLoadedWidgets.contains(classNameHash)) { return; } #ifdef WIDGETSTYLELOADER_DEBUG - qDebug() << "loadCssForWidget called for " << widget->metaObject()->className(); + qDebug() << "loadCssForWidget called for " << widget->metaObject()->className(); #endif - for(int i=0; iload(mFileSets[i].path, mFileSets[i].priority); - if (hand) { + int hand = stack->load(mFileSets[i].path, mFileSets[i].priority); + if (hand) { #ifdef WIDGETSTYLELOADER_DEBUG - qDebug() << "Successfully loaded CSS from file" << mFileSets[i].path; + qDebug() << "Successfully loaded CSS from file" << mFileSets[i].path; #endif - mFileSets[i].loadedCss.insert(0, hand); - } else { + mFileSets[i].loadedCss.insert(0, hand); + } else { #ifdef WIDGETSTYLELOADER_DEBUG - qDebug() << "Failed to load CSS from file" << mFileSets[i].path; + qDebug() << "Failed to load CSS from file" << mFileSets[i].path; #endif mFileSets[i].missedCss.append(0); - } + } } continue; } // Else -> pattern file set - const QMetaObject *meta = widget->metaObject(); - QString className = meta->className(); - while(className != HBWIDGETBASE_CLASSNAME){ - className = meta->className(); + const QMetaObject *meta = widget->metaObject(); + QString className = meta->className(); + while(className != HBWIDGETBASE_CLASSNAME){ + className = meta->className(); uint classNameHash = qHash(className); - meta = meta->superClass(); - if (!meta) { - break; - } + meta = meta->superClass(); + if (!meta) { + break; + } if (mFileSets[i].loadedCss.contains(classNameHash)){ #ifdef WIDGETSTYLELOADER_DEBUG - qDebug() << "CSS already loaded for" << className; + qDebug() << "CSS already loaded for" << className; #endif - continue; - } + continue; + } if (mFileSets[i].missedCss.contains(classNameHash)){ #ifdef WIDGETSTYLELOADER_DEBUG - qDebug() << "CSS already searched but missed for" << className; + qDebug() << "CSS already searched but missed for" << className; #endif - continue; + continue; } - QString filename = mFileSets[i].path; + QString filename = mFileSets[i].path; filename.replace(PATTERN_WILDCARD, className.toLatin1().toLower()); #ifdef WIDGETSTYLELOADER_DEBUG - qDebug() << "Loading CSS for widget" << className << "from file" << filename; + qDebug() << "Loading CSS for widget" << className << "from file" << filename; #endif - int hand = stack->load(filename, mFileSets[i].priority); - if (hand) { + int hand = stack->load(filename, mFileSets[i].priority); + if (hand) { #ifdef WIDGETSTYLELOADER_DEBUG - qDebug() << "Successfully loaded CSS for" << className; + qDebug() << "Successfully loaded CSS for" << className; #endif - mFileSets[i].loadedCss.insert(classNameHash, hand); - } else { + mFileSets[i].loadedCss.insert(classNameHash, hand); + } else { #ifdef WIDGETSTYLELOADER_DEBUG - qDebug() << "Failed to load CSS for" << className; + qDebug() << "Failed to load CSS for" << className; #endif mFileSets[i].missedCss.append(classNameHash); - } - } - } + } + } + } mFullyLoadedWidgets.append(classNameHash); } @@ -452,8 +452,8 @@ * This function attempts to load the specified layout from a WidgetML file with the matching widget name (matched by the %w substitution in the pathPatterns of loaded filesets). - If the file is not found or the layout name does not exist in the file, the pathPattern is - re-substituted with the parent widget name and loading is attempted again. + If the file is not found or the layout name does not exist in the file, the pathPattern is + re-substituted with the parent widget name and loading is attempted again. \sa addFileSet @@ -467,19 +467,19 @@ bool HbWidgetStyleLoader::loadWidgetML( HbWidget *widget, const QString &layoutName, const QString §ionName) { - if(!widget){ - return false; - } - bool loaded = false; - + if(!widget){ + return false; + } + bool loaded = false; + #ifdef WIDGETSTYLELOADER_DEBUG - qDebug() << "Looking for layout" << layoutName << "in section" << sectionName; + qDebug() << "Looking for layout" << layoutName << "in section" << sectionName; #endif - // Iterate backwards to ensure filesets override correctly (eg landscape delta overrides + // Iterate backwards to ensure filesets override correctly (eg landscape delta overrides // portrait) - int c = mFileSets.count(); - while(c-- && !loaded){ + int c = mFileSets.count(); + while(c-- && !loaded){ if ( !(mFileSets.at(c).type == FileSetType_Pattern || mFileSets.at(c).type == FileSetType_WidgetML ) ) { continue; @@ -488,13 +488,13 @@ && mFileSets.at(c).patternType != PatternType_WidgetML) { continue; } - const QMetaObject *meta = widget->metaObject(); - QString className = meta->className(); + const QMetaObject *meta = widget->metaObject(); + QString className = meta->className(); #ifdef WIDGETSTYLELOADER_DEBUG - qDebug() << "Checking fileset " << mFileSets[c].path; + qDebug() << "Checking fileset " << mFileSets[c].path; #endif - while(className != HBWIDGETBASE_CLASSNAME){ - QString filename = mFileSets[c].path; + while(className != HBWIDGETBASE_CLASSNAME){ + QString filename = mFileSets[c].path; bool attemptToLoad(true); if ( mFileSets[c].type == FileSetType_Pattern ) { filename.replace(PATTERN_WILDCARD, className.toLatin1().toLower()); @@ -503,17 +503,17 @@ classFilename.append(WIDGETML_EXTENSION); if (!filename.endsWith(classFilename)) { #ifdef WIDGETSTYLELOADER_DEBUG - qDebug() << "Not a WidgetML file" << filename << "for class" << className; + qDebug() << "Not a WidgetML file" << filename << "for class" << className; #endif attemptToLoad = false; } #ifdef WIDGETSTYLELOADER_DEBUG else { - qDebug() << "Attempting to load WidgetML from non-pattern file" << filename; + qDebug() << "Attempting to load WidgetML from non-pattern file" << filename; } #endif } - + if ( attemptToLoad ) { static HbWidgetLoader loader; #ifdef WIDGETSTYLELOADER_DEBUG @@ -534,59 +534,59 @@ } className = meta->className(); } - } + } return loaded; } #endif /*! - For any filesets loaded with the given concern, the list of loaded CSS files is cleared causing - them to be reloaded on the nextstyleRulesForNode/declarationsForNode call. This should only be - called from the LayeredStyleLoader's clear function, to keep this 'cache' up to date. + For any filesets loaded with the given concern, the list of loaded CSS files is cleared causing + them to be reloaded on the nextstyleRulesForNode/declarationsForNode call. This should only be + called from the LayeredStyleLoader's clear function, to keep this 'cache' up to date. \param concern, Concern which has been cleared */ void HbWidgetStyleLoader::clearConcernFileList(const HbLayeredStyleLoader::Concern concern) { #ifdef WIDGETSTYLELOADER_DEBUG - qDebug() << "Clearing list for stack" << concern; + qDebug() << "Clearing list for stack" << concern; #endif - for(int i=0; i loadedCss; + HbLayeredStyleLoader::Concern concern; + HbLayeredStyleLoader::LayerPriority priority; + QHash loadedCss; QList missedCss; int referenceCount; - - FileSet(const QString &pat, + + FileSet(const QString &pat, FileSetType typ, PatternType pattern, const HbLayeredStyleLoader::Concern con, - const HbLayeredStyleLoader::LayerPriority pri) { - path = pat; + const HbLayeredStyleLoader::LayerPriority pri) { + path = pat; type = typ; patternType = pattern; - concern = con; - priority = pri; + concern = con; + priority = pri; referenceCount = 1; - } - }; - - QList mFileSets; + } + }; + + QList mFileSets; QVector mFullyLoadedWidgets; }; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/decorators/hbbatteryindicator.cpp --- a/src/hbcore/decorators/hbbatteryindicator.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/decorators/hbbatteryindicator.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -105,7 +105,7 @@ updatePrimitives(); #ifdef HB_HAVE_QT_MOBILITY - Q_D(HbBatteryIndicator); + Q_D(HbBatteryIndicator); connect(d->mSystemDeviceInfo, SIGNAL(batteryLevelChanged(int)), this, SLOT(setLevel(int))); connect(d->mSystemDeviceInfo, SIGNAL(powerStateChanged(QSystemDeviceInfo::PowerState)), this, SLOT(_q_setPowerState(QSystemDeviceInfo::PowerState))); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/decorators/hbindicatorleveliconitem.cpp --- a/src/hbcore/decorators/hbindicatorleveliconitem.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/decorators/hbindicatorleveliconitem.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -46,7 +46,7 @@ const QStyleOptionGraphicsItem *option, QWidget *widget) { - Q_UNUSED(widget); + Q_UNUSED(widget); QRectF iconRect(boundingRect()); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/decorators/hbstatusbar.cpp --- a/src/hbcore/decorators/hbstatusbar.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/decorators/hbstatusbar.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -53,7 +53,7 @@ \brief HbStatusBar is the class implementing statusbar decorator. Statusbar is a container for two indicator groups (left and right), a clock which is located in the middle of indicator groups and for - a battery and signal status indicators. + a battery and signal status indicators. */ HbStatusBarPrivate::HbStatusBarPrivate() : @@ -193,23 +193,56 @@ emit q->contentChanged(HbStatusBar::IndicatorsChanged); } +QString HbStatusBarPrivate::timeFormat(){ + + QString timeFormat = ""; + HbExtendedLocale extendedLocale = HbExtendedLocale(); + + // time separator + timeFormat.append("hh"); + // Index0 HH Index1 MM Index2 SS Index3 + int indexOfHourMinuteSeparator(1); + timeFormat.append(extendedLocale.timeSeparator(indexOfHourMinuteSeparator)); + timeFormat.append("mm"); + + if (extendedLocale.timeStyle() == HbExtendedLocale::Time24){ + // 24-hour format + return timeFormat; + } + + // 12-hour time format + QString amPm = "ap"; + QString space = " "; + if (extendedLocale.amPmSpace()){ + // case: space between time & amPm text + if (extendedLocale.amPmSymbolPosition() == HbExtendedLocale::After){ + amPm.prepend(space); + timeFormat.append(amPm); + }else if (extendedLocale.amPmSymbolPosition() == HbExtendedLocale::Before){ + amPm.append(space); + timeFormat.prepend(amPm); + } + } else { + // case: no space between time & amPm text + if (extendedLocale.amPmSymbolPosition() == HbExtendedLocale::After){ + timeFormat.append(amPm); + }else if (extendedLocale.amPmSymbolPosition() == HbExtendedLocale::Before){ + timeFormat.prepend(amPm); + } + } + return timeFormat; +} + + void HbStatusBarPrivate::updateTime() { Q_Q(HbStatusBar); - QString timeFormat; - // set the time format accordingly - if (HbExtendedLocale().timeStyle() == HbExtendedLocale::Time12) { - timeFormat = "hh:mm ap"; - } else { - timeFormat = "hh:mm"; - } - QTime current = QTime::currentTime(); // set time, using a proper formatting QString oldTimeText = mTimeText; - mTimeText = current.toString(timeFormat); + mTimeText = current.toString(timeFormat()); q->updatePrimitives(); @@ -327,7 +360,7 @@ void HbStatusBar::initStyleOption(HbStyleOptionStatusBar *option) const { const Q_D(HbStatusBar); - HbWidget::initStyleOption(option); + HbWidget::initStyleOption(option); option->timeText = d->mTimeText; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/decorators/hbstatusbar_p.h --- a/src/hbcore/decorators/hbstatusbar_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/decorators/hbstatusbar_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -40,11 +40,11 @@ public: enum ContentChangeFlag { - TimeChanged, - BatteryLevelChanged, - SignalLevelChanged, - IndicatorsChanged, - BatteryCharging + TimeChanged, + BatteryLevelChanged, + SignalLevelChanged, + IndicatorsChanged, + BatteryCharging }; Q_DECLARE_FLAGS(ContentChangeFlags, ContentChangeFlag) diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/decorators/hbstatusbar_p_p.h --- a/src/hbcore/decorators/hbstatusbar_p_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/decorators/hbstatusbar_p_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -48,6 +48,7 @@ void delayedConstruction(); void init(); void updateTime(); + QString timeFormat(); #if defined(Q_OS_SYMBIAN) static TInt EnvChangeCallback(TAny *aObject); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/decorators/hbtitlepane.cpp --- a/src/hbcore/decorators/hbtitlepane.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/decorators/hbtitlepane.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -44,7 +44,7 @@ #include /*! - @beta + @beta @hbcore \class HbTitlePane \brief HbTitlePane represents a title pane decorator. diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/decorators/hbtitlepane_p.h --- a/src/hbcore/decorators/hbtitlepane_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/decorators/hbtitlepane_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -65,7 +65,7 @@ HbTitlePane(HbTitlePanePrivate &dd, QGraphicsItem *parent = 0); void initStyleOption(HbStyleOptionTitlePane *option) const; - + void gestureEvent(QGestureEvent *event); void polish(HbStyleParameters ¶ms); bool eventFilter(QObject *object, QEvent *event); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/defs/bwins/HbCoreu.def --- a/src/hbcore/defs/bwins/HbCoreu.def Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/defs/bwins/HbCoreu.def Thu Sep 02 20:44:51 2010 +0300 @@ -32,7 +32,7 @@ ?aboutToShow@HbPopupBase@@IAEXXZ @ 31 NONAME ABSENT ; void HbPopupBase::aboutToShow(void) ?showItems@HbView@@QAEXV?$QFlags@W4SceneItem@Hb@@@@@Z @ 32 NONAME ; void HbView::showItems(class QFlags) ?m_instance@HbDirectoryNameLocalizer@@0PAV1@A @ 33 NONAME ABSENT ; class HbDirectoryNameLocalizer * HbDirectoryNameLocalizer::m_instance - ?activeTouchKeyboardChanged@HbInputSettingProxy@@IAEXV?$QFlags@W4HbKeyboardTypeFlag@@@@@Z @ 34 NONAME ; void HbInputSettingProxy::activeTouchKeyboardChanged(class QFlags) + ?activeTouchKeyboardChanged@HbInputSettingProxy@@IAEXV?$QFlags@W4HbKeyboardTypeFlag@@@@@Z @ 34 NONAME ABSENT ; void HbInputSettingProxy::activeTouchKeyboardChanged(class QFlags) ?trUtf8@HbWidget@@SA?AVQString@@PBD0@Z @ 35 NONAME ; class QString HbWidget::trUtf8(char const *, char const *) ??_EHbInputLowerCaseFilter@@UAE@I@Z @ 36 NONAME ; HbInputLowerCaseFilter::~HbInputLowerCaseFilter(unsigned int) ?defaultSize@HbIconItem@@QBE?AVQSizeF@@XZ @ 37 NONAME ; class QSizeF HbIconItem::defaultSize(void) const @@ -84,7 +84,7 @@ ?instance@HbInputSettingProxy@@SAPAV1@XZ @ 83 NONAME ; class HbInputSettingProxy * HbInputSettingProxy::instance(void) ?gestureStopped@HbInteractionListener@@MAEXPBVQObject@@W4Gesture@Ia@@@Z @ 84 NONAME ABSENT ; void HbInteractionListener::gestureStopped(class QObject const *, enum Ia::Gesture) ?visualDirection@HbLayoutUtils@@SA?AW4LayoutDirection@Qt@@PAVQGraphicsLayout@@@Z @ 85 NONAME ; enum Qt::LayoutDirection HbLayoutUtils::visualDirection(class QGraphicsLayout *) - ?screenOrientation@HbInputSettingProxy@@QAE?AW4Orientation@Qt@@XZ @ 86 NONAME ; enum Qt::Orientation HbInputSettingProxy::screenOrientation(void) + ?screenOrientation@HbInputSettingProxy@@QAE?AW4Orientation@Qt@@XZ @ 86 NONAME ABSENT ; enum Qt::Orientation HbInputSettingProxy::screenOrientation(void) ?textFormat@HbLabel@@QBE?AW4TextFormat@Qt@@XZ @ 87 NONAME ABSENT ; enum Qt::TextFormat HbLabel::textFormat(void) const ??0HbStyleOptionMessageBox@@QAE@XZ @ 88 NONAME ; HbStyleOptionMessageBox::HbStyleOptionMessageBox(void) ?menu@HbAction@@QBEPAVHbMenu@@XZ @ 89 NONAME ; class HbMenu * HbAction::menu(void) const @@ -138,7 +138,7 @@ ??0HbViewPrivate@@QAE@XZ @ 137 NONAME ; HbViewPrivate::HbViewPrivate(void) ?brushValues@Declaration@HbCss@@QBEXPAVQBrush@@ABVQPalette@@@Z @ 138 NONAME ABSENT ; void HbCss::Declaration::brushValues(class QBrush *, class QPalette const &) const ?add@HbEffect@@SA_NABVQString@@00@Z @ 139 NONAME ; bool HbEffect::add(class QString const &, class QString const &, class QString const &) - ?orientationAboutToChange@HbInputSettingProxy@@IAEXXZ @ 140 NONAME ; void HbInputSettingProxy::orientationAboutToChange(void) + ?orientationAboutToChange@HbInputSettingProxy@@IAEXXZ @ 140 NONAME ABSENT ; void HbInputSettingProxy::orientationAboutToChange(void) ?insert@HbListItemStandardLayout@@QAEXPAVQGraphicsLayoutItem@@HHH@Z @ 141 NONAME ABSENT ; void HbListItemStandardLayout::insert(class QGraphicsLayoutItem *, int, int, int) ?setPredictiveInputStatus@HbInputSettingProxy@@QAEXH@Z @ 142 NONAME ABSENT ; void HbInputSettingProxy::setPredictiveInputStatus(int) ?cleanup@HbMultiSegmentAlgo@@QAEXXZ @ 143 NONAME ABSENT ; void HbMultiSegmentAlgo::cleanup(void) @@ -473,7 +473,7 @@ ??_EHbEvent@@UAE@I@Z @ 472 NONAME ; HbEvent::~HbEvent(unsigned int) ?removeAction@HbSoftKey@@QAEXPAVHbAction@@@Z @ 473 NONAME ABSENT ; void HbSoftKey::removeAction(class HbAction *) ?rawNumericModeSpecialCharacterData@HbKeyMapData@@MBEPAVQChar@@V?$QFlags@W4HbKeyboardTypeFlag@@@@AAH@Z @ 474 NONAME ABSENT ; class QChar * HbKeyMapData::rawNumericModeSpecialCharacterData(class QFlags, int &) const - ?orientationChangeCompleted@HbInputSettingProxy@@QBE_NXZ @ 475 NONAME ; bool HbInputSettingProxy::orientationChangeCompleted(void) const + ?orientationChangeCompleted@HbInputSettingProxy@@QBE_NXZ @ 475 NONAME ABSENT ; bool HbInputSettingProxy::orientationChangeCompleted(void) const ??0HbInputUpperCaseFilter@@AAE@XZ @ 476 NONAME ; HbInputUpperCaseFilter::HbInputUpperCaseFilter(void) ?staticMetaObject@HbDeviceDialogPlugin@@2UQMetaObject@@B @ 477 NONAME ; struct QMetaObject const HbDeviceDialogPlugin::staticMetaObject ?inputPluginInstance@HbInputUtils@@SAPAVQInputContextPlugin@@ABVQString@@@Z @ 478 NONAME ABSENT ; class QInputContextPlugin * HbInputUtils::inputPluginInstance(class QString const &) @@ -837,7 +837,7 @@ ?setTimeout@HbPopupBase@@QAEXW4DefaultTimeout@1@@Z @ 836 NONAME ABSENT ; void HbPopupBase::setTimeout(enum HbPopupBase::DefaultTimeout) ??1HbGraphicsScene@@UAE@XZ @ 837 NONAME ; HbGraphicsScene::~HbGraphicsScene(void) ??0HbInteractionListener@@QAE@PAVHbInteractionManager@@@Z @ 838 NONAME ABSENT ; HbInteractionListener::HbInteractionListener(class HbInteractionManager *) - ?setScreenOrientation@HbInputSettingProxy@@QAEXW4Orientation@Qt@@@Z @ 839 NONAME ; void HbInputSettingProxy::setScreenOrientation(enum Qt::Orientation) + ?setScreenOrientation@HbInputSettingProxy@@QAEXW4Orientation@Qt@@@Z @ 839 NONAME ABSENT ; void HbInputSettingProxy::setScreenOrientation(enum Qt::Orientation) ?attachmentValue@Declaration@HbCss@@QBE?AW4Attachment@2@XZ @ 840 NONAME ABSENT ; enum HbCss::Attachment HbCss::Declaration::attachmentValue(void) const ?trUtf8@HbDeviceDialogServer@@SA?AVQString@@PBD0H@Z @ 841 NONAME ; class QString HbDeviceDialogServer::trUtf8(char const *, char const *, int) ?tr@HbSignalIndicator@@SA?AVQString@@PBD0H@Z @ 842 NONAME ; class QString HbSignalIndicator::tr(char const *, char const *, int) @@ -887,7 +887,7 @@ ?getStaticMetaObject@HbSoftKey@@SAABUQMetaObject@@XZ @ 886 NONAME ABSENT ; struct QMetaObject const & HbSoftKey::getStaticMetaObject(void) ??1HbStyle@@UAE@XZ @ 887 NONAME ; HbStyle::~HbStyle(void) ?setEnabled@HbListWidgetItem@@QAEX_N@Z @ 888 NONAME ABSENT ; void HbListWidgetItem::setEnabled(bool) - ?setPluginBaseId@HbWidget@@IAEXH@Z @ 889 NONAME ; void HbWidget::setPluginBaseId(int) + ?setPluginBaseId@HbWidget@@IAEXH@Z @ 889 NONAME ABSENT ; void HbWidget::setPluginBaseId(int) ?setSelectionModel@HbAbstractItemView@@QAEXPAVQItemSelectionModel@@@Z @ 890 NONAME ABSENT ; void HbAbstractItemView::setSelectionModel(class QItemSelectionModel *) ??0HbWidgetParams@@QAE@XZ @ 891 NONAME ABSENT ; HbWidgetParams::HbWidgetParams(void) ??1HbToolButton@@UAE@XZ @ 892 NONAME ; HbToolButton::~HbToolButton(void) @@ -1189,7 +1189,7 @@ ?globalDigitType@HbInputSettingProxy@@QBE?AW4HbInputDigitType@@XZ @ 1188 NONAME ; enum HbInputDigitType HbInputSettingProxy::globalDigitType(void) const ?findByButtonCode@HbInputCustomButtonBank@@QAEPAVHbInputCustomButton@@H@Z @ 1189 NONAME ABSENT ; class HbInputCustomButton * HbInputCustomButtonBank::findByButtonCode(int) ?paint@HbSignalIndicator@@UAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 1190 NONAME ABSENT ; void HbSignalIndicator::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *) - ?primitive@HbToolButton@@UBEPAVQGraphicsItem@@W4Primitive@HbStyle@@@Z @ 1191 NONAME ; class QGraphicsItem * HbToolButton::primitive(enum HbStyle::Primitive) const + ?primitive@HbToolButton@@UBEPAVQGraphicsItem@@W4Primitive@HbStyle@@@Z @ 1191 NONAME ABSENT ; class QGraphicsItem * HbToolButton::primitive(enum HbStyle::Primitive) const ?trUtf8@HbInteractionManager@@SA?AVQString@@PBD0@Z @ 1192 NONAME ABSENT ; class QString HbInteractionManager::trUtf8(char const *, char const *) ?setFrameType@HbFrameDrawer@@QAEXW4FrameType@1@@Z @ 1193 NONAME ; void HbFrameDrawer::setFrameType(enum HbFrameDrawer::FrameType) ??0HbTextItem@@QAE@PAVQGraphicsItem@@@Z @ 1194 NONAME ; HbTextItem::HbTextItem(class QGraphicsItem *) @@ -1259,7 +1259,7 @@ ?getStaticMetaObject@HbSignalIndicator@@SAABUQMetaObject@@XZ @ 1258 NONAME ; struct QMetaObject const & HbSignalIndicator::getStaticMetaObject(void) ??1ImportRule@HbCss@@QAE@XZ @ 1259 NONAME ; HbCss::ImportRule::~ImportRule(void) ?released@HbListWidget@@IAEXPAVHbListWidgetItem@@@Z @ 1260 NONAME ABSENT ; void HbListWidget::released(class HbListWidgetItem *) - ?activeTouchKeyboard@HbInputSettingProxy@@QBE?AV?$QFlags@W4HbKeyboardTypeFlag@@@@XZ @ 1261 NONAME ; class QFlags HbInputSettingProxy::activeTouchKeyboard(void) const + ?activeTouchKeyboard@HbInputSettingProxy@@QBE?AV?$QFlags@W4HbKeyboardTypeFlag@@@@XZ @ 1261 NONAME ABSENT ; class QFlags HbInputSettingProxy::activeTouchKeyboard(void) const ?trUtf8@HbInputSettingProxy@@SA?AVQString@@PBD0@Z @ 1262 NONAME ; class QString HbInputSettingProxy::trUtf8(char const *, char const *) ?trUtf8@HbAction@@SA?AVQString@@PBD0H@Z @ 1263 NONAME ; class QString HbAction::trUtf8(char const *, char const *, int) ?tr@HbFocusObjectWidget@@SA?AVQString@@PBD0@Z @ 1264 NONAME ABSENT ; class QString HbFocusObjectWidget::tr(char const *, char const *) @@ -1476,7 +1476,7 @@ ??0HbStyleOptionDecorator@@QAE@ABV0@@Z @ 1475 NONAME ABSENT ; HbStyleOptionDecorator::HbStyleOptionDecorator(class HbStyleOptionDecorator const &) ?tr@HbAbstractViewItem@@SA?AVQString@@PBD0H@Z @ 1476 NONAME ABSENT ; class QString HbAbstractViewItem::tr(char const *, char const *, int) ?indexOf@HbTreeLayout@@QBEHPAVQGraphicsLayoutItem@@@Z @ 1477 NONAME ABSENT ; int HbTreeLayout::indexOf(class QGraphicsLayoutItem *) const - ?setActiveTouchKeyboard@HbInputSettingProxy@@QAEXV?$QFlags@W4HbKeyboardTypeFlag@@@@@Z @ 1478 NONAME ; void HbInputSettingProxy::setActiveTouchKeyboard(class QFlags) + ?setActiveTouchKeyboard@HbInputSettingProxy@@QAEXV?$QFlags@W4HbKeyboardTypeFlag@@@@@Z @ 1478 NONAME ABSENT ; void HbInputSettingProxy::setActiveTouchKeyboard(class QFlags) ??1HbKeyMapFactory@@AAE@XZ @ 1479 NONAME ABSENT ; HbKeyMapFactory::~HbKeyMapFactory(void) ??0HbExtraDictionaryCollection@@QAE@XZ @ 1480 NONAME ; HbExtraDictionaryCollection::HbExtraDictionaryCollection(void) ?hasVowelSequences@HbKeyMapData@@UBE_NV?$QFlags@W4HbKeyboardTypeFlag@@@@@Z @ 1481 NONAME ABSENT ; bool HbKeyMapData::hasVowelSequences(class QFlags) const @@ -1628,8 +1628,8 @@ ?d_func@HbView@@AAEPAVHbViewPrivate@@XZ @ 1627 NONAME ; class HbViewPrivate * HbView::d_func(void) ??1HbVkbHost@@UAE@XZ @ 1628 NONAME ; HbVkbHost::~HbVkbHost(void) ?activeMethod@HbInputModeCache@@QBEPAVHbInputMethod@@XZ @ 1629 NONAME ; class HbInputMethod * HbInputModeCache::activeMethod(void) const - ?notifyScreenOrientationChange@HbInputSettingProxy@@QAEXXZ @ 1630 NONAME ; void HbInputSettingProxy::notifyScreenOrientationChange(void) - ?updatePrimitive@HbStyle@@UBEXPAVQGraphicsItem@@W4Primitive@1@PBVQStyleOption@@@Z @ 1631 NONAME ; void HbStyle::updatePrimitive(class QGraphicsItem *, enum HbStyle::Primitive, class QStyleOption const *) const + ?notifyScreenOrientationChange@HbInputSettingProxy@@QAEXXZ @ 1630 NONAME ABSENT ; void HbInputSettingProxy::notifyScreenOrientationChange(void) + ?updatePrimitive@HbStyle@@UBEXPAVQGraphicsItem@@W4Primitive@1@PBVQStyleOption@@@Z @ 1631 NONAME ABSENT ; void HbStyle::updatePrimitive(class QGraphicsItem *, enum HbStyle::Primitive, class QStyleOption const *) const ?d_func@HbToolBarExtension@@AAEPAVHbToolBarExtensionPrivate@@XZ @ 1632 NONAME ; class HbToolBarExtensionPrivate * HbToolBarExtension::d_func(void) ??1HbListWidgetViewItemPrivate@@UAE@XZ @ 1633 NONAME ABSENT ; HbListWidgetViewItemPrivate::~HbListWidgetViewItemPrivate(void) ??0HbStyleOptionToolBarExtension@@QAE@XZ @ 1634 NONAME ABSENT ; HbStyleOptionToolBarExtension::HbStyleOptionToolBarExtension(void) @@ -1687,7 +1687,7 @@ ?tr@HbInteractionManager@@SA?AVQString@@PBD0H@Z @ 1686 NONAME ABSENT ; class QString HbInteractionManager::tr(char const *, char const *, int) ?globalInputLanguageChanged@HbInputSettingProxy@@IAEXABVHbInputLanguage@@@Z @ 1687 NONAME ; void HbInputSettingProxy::globalInputLanguageChanged(class HbInputLanguage const &) ?qt_metacast@HbDeviceDialog@@UAEPAXPBD@Z @ 1688 NONAME ; void * HbDeviceDialog::qt_metacast(char const *) - ?pluginBaseId@HbWidget@@QBEHXZ @ 1689 NONAME ; int HbWidget::pluginBaseId(void) const + ?pluginBaseId@HbWidget@@QBEHXZ @ 1689 NONAME ABSENT ; int HbWidget::pluginBaseId(void) const ?symbol@Parser@HbCss@@QBEABUSymbol@2@XZ @ 1690 NONAME ; struct HbCss::Symbol const & HbCss::Parser::symbol(void) const ?qt_metacall@HbListWidgetViewItem@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1691 NONAME ABSENT ; int HbListWidgetViewItem::qt_metacall(enum QMetaObject::Call, int, void * *) ?qt_metacall@HbGesture@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1692 NONAME ABSENT ; int HbGesture::qt_metacall(enum QMetaObject::Call, int, void * *) @@ -1695,7 +1695,7 @@ ?setTextCase@HbEditorInterface@@QAEXH@Z @ 1694 NONAME ABSENT ; void HbEditorInterface::setTextCase(int) ?negativeCurrencyFormat@HbExtendedLocale@@QBE?AW4NegativeCurrencyFormat@1@XZ @ 1695 NONAME ; enum HbExtendedLocale::NegativeCurrencyFormat HbExtendedLocale::negativeCurrencyFormat(void) const ?dataChanged@HbIndicatorInterface@@IAEXXZ @ 1696 NONAME ; void HbIndicatorInterface::dataChanged(void) - ?activeHwKeyboardChanged@HbInputSettingProxy@@IAEXV?$QFlags@W4HbKeyboardTypeFlag@@@@@Z @ 1697 NONAME ; void HbInputSettingProxy::activeHwKeyboardChanged(class QFlags) + ?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) @@ -1793,7 +1793,7 @@ ?qt_metacall@HbSoftKey@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1792 NONAME ABSENT ; int HbSoftKey::qt_metacall(enum QMetaObject::Call, int, void * *) ?parseSelector@Parser@HbCss@@QAE_NPAUSelector@2@@Z @ 1793 NONAME ; bool HbCss::Parser::parseSelector(struct HbCss::Selector *) ??1HbXmlLoaderAbstractActions@@UAE@XZ @ 1794 NONAME ; HbXmlLoaderAbstractActions::~HbXmlLoaderAbstractActions(void) - ?setActiveHwKeyboard@HbInputSettingProxy@@QAEXV?$QFlags@W4HbKeyboardTypeFlag@@@@@Z @ 1795 NONAME ; void HbInputSettingProxy::setActiveHwKeyboard(class QFlags) + ?setActiveHwKeyboard@HbInputSettingProxy@@QAEXV?$QFlags@W4HbKeyboardTypeFlag@@@@@Z @ 1795 NONAME ABSENT ; void HbInputSettingProxy::setActiveHwKeyboard(class QFlags) ?layoutDirectionChangeFinished@HbLayoutDirectionNotifier@@IAEXXZ @ 1796 NONAME ; void HbLayoutDirectionNotifier::layoutDirectionChangeFinished(void) ?addAction@HbToolBar@@QAEPAVHbAction@@ABVHbIcon@@ABVQString@@@Z @ 1797 NONAME ; class HbAction * HbToolBar::addAction(class HbIcon const &, class QString const &) ?setFilter@HbEditorInterface@@QAEXPAVHbInputFilter@@@Z @ 1798 NONAME ; void HbEditorInterface::setFilter(class HbInputFilter *) @@ -2231,7 +2231,7 @@ ?primaryAction@HbPopup@@QBEPAVHbAction@@XZ @ 2230 NONAME ABSENT ; class HbAction * HbPopup::primaryAction(void) const ?getStaticMetaObject@HbView@@SAABUQMetaObject@@XZ @ 2231 NONAME ; struct QMetaObject const & HbView::getStaticMetaObject(void) ?qt_metacast@HbInteractionListener@@UAEPAXPBD@Z @ 2232 NONAME ABSENT ; void * HbInteractionListener::qt_metacast(char const *) - ?orientationChanged@HbInputSettingProxy@@IAEXW4Orientation@Qt@@@Z @ 2233 NONAME ; void HbInputSettingProxy::orientationChanged(enum Qt::Orientation) + ?orientationChanged@HbInputSettingProxy@@IAEXW4Orientation@Qt@@@Z @ 2233 NONAME ABSENT ; void HbInputSettingProxy::orientationChanged(enum Qt::Orientation) ?setBackground@HbListWidgetItem@@QAEXABVQVariant@@@Z @ 2234 NONAME ABSENT ; void HbListWidgetItem::setBackground(class QVariant const &) ??0HbSoftKey@@IAE@AAVHbSoftKeyPrivate@@W4SoftKeyId@Hb@@PAVQGraphicsItem@@@Z @ 2235 NONAME ABSENT ; HbSoftKey::HbSoftKey(class HbSoftKeyPrivate &, enum Hb::SoftKeyId, class QGraphicsItem *) ?removeAnchor@HbAnchorLayout@@QAEXPAVQGraphicsLayoutItem@@W4Edge@Hb@@01@Z @ 2236 NONAME ABSENT ; void HbAnchorLayout::removeAnchor(class QGraphicsLayoutItem *, enum Hb::Edge, class QGraphicsLayoutItem *, enum Hb::Edge) @@ -2369,6 +2369,7 @@ ?setAspectRatioMode@HbLabel@@QAEXW4AspectRatioMode@Qt@@@Z @ 2368 NONAME ABSENT ; void HbLabel::setAspectRatioMode(enum Qt::AspectRatioMode) ?predictiveInputStatus@HbInputSettingProxy@@QBEHXZ @ 2369 NONAME ABSENT ; int HbInputSettingProxy::predictiveInputStatus(void) const ?tr@HbListModel@@SA?AVQString@@PBD0H@Z @ 2370 NONAME ABSENT ; class QString HbListModel::tr(char const *, char const *, int) + ?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 *) @@ -3182,7 +3183,7 @@ ??_EHbUrlFilter@@UAE@I@Z @ 3181 NONAME ; HbUrlFilter::~HbUrlFilter(unsigned int) ?focusObjectDestroyed@HbInputMethod@@QAEXPBVHbInputFocusObject@@@Z @ 3182 NONAME ABSENT ; void HbInputMethod::focusObjectDestroyed(class HbInputFocusObject const *) ?setId@HbExtraUserDictionary@@QAEXH@Z @ 3183 NONAME ; void HbExtraUserDictionary::setId(int) - ?activeHwKeyboard@HbInputSettingProxy@@QBE?AV?$QFlags@W4HbKeyboardTypeFlag@@@@XZ @ 3184 NONAME ; class QFlags HbInputSettingProxy::activeHwKeyboard(void) const + ?activeHwKeyboard@HbInputSettingProxy@@QBE?AV?$QFlags@W4HbKeyboardTypeFlag@@@@XZ @ 3184 NONAME ABSENT ; class QFlags HbInputSettingProxy::activeHwKeyboard(void) const ??0HbListModel@@QAE@PAVQObject@@@Z @ 3185 NONAME ABSENT ; HbListModel::HbListModel(class QObject *) ?dismissPolicy@HbPopupBase@@QBE?AW4DismissPolicy@1@XZ @ 3186 NONAME ABSENT ; enum HbPopupBase::DismissPolicy HbPopupBase::dismissPolicy(void) const ?currentIndex@HbAbstractItemView@@QBE?AVQModelIndex@@XZ @ 3187 NONAME ABSENT ; class QModelIndex HbAbstractItemView::currentIndex(void) const @@ -3270,7 +3271,7 @@ ??1HbStyleOptionSettingForm@@QAE@XZ @ 3269 NONAME ABSENT ; HbStyleOptionSettingForm::~HbStyleOptionSettingForm(void) ?trUtf8@HbAbstractButton@@SA?AVQString@@PBD0@Z @ 3270 NONAME ; class QString HbAbstractButton::trUtf8(char const *, char const *) ?tr@HbToolBarExtension@@SA?AVQString@@PBD0@Z @ 3271 NONAME ; class QString HbToolBarExtension::tr(char const *, char const *) - ?createPrimitive@HbStyle@@UBEPAVQGraphicsItem@@W4Primitive@1@PAV2@@Z @ 3272 NONAME ; class QGraphicsItem * HbStyle::createPrimitive(enum HbStyle::Primitive, class QGraphicsItem *) const + ?createPrimitive@HbStyle@@UBEPAVQGraphicsItem@@W4Primitive@1@PAV2@@Z @ 3272 NONAME ABSENT ; class QGraphicsItem * HbStyle::createPrimitive(enum HbStyle::Primitive, class QGraphicsItem *) const ?setText@HbListWidgetItem@@QAEXABVQString@@HW4ListContentType@1@W4ContentVisibility@1@@Z @ 3273 NONAME ABSENT ; void HbListWidgetItem::setText(class QString const &, int, enum HbListWidgetItem::ListContentType, enum HbListWidgetItem::ContentVisibility) ?d_func@HbStackedWidget@@ABEPBVHbStackedWidgetPrivate@@XZ @ 3274 NONAME ; class HbStackedWidgetPrivate const * HbStackedWidget::d_func(void) const ?type@HbAbstractButton@@UBEHXZ @ 3275 NONAME ; int HbAbstractButton::type(void) const @@ -3924,7 +3925,7 @@ ?tr@HbTitleBarHandle@@SA?AVQString@@PBD0H@Z @ 3923 NONAME ; class QString HbTitleBarHandle::tr(char const *, char const *, int) ?changeContentGeometry@HbTitleBar@@QAEXXZ @ 3924 NONAME ABSENT ; void HbTitleBar::changeContentGeometry(void) ??0HbTitleBarHandle@@QAE@PAVQGraphicsItem@@@Z @ 3925 NONAME ; HbTitleBarHandle::HbTitleBarHandle(class QGraphicsItem *) - ?initializeOrientation@HbInputSettingProxy@@QAEXW4Orientation@Qt@@@Z @ 3926 NONAME ; void HbInputSettingProxy::initializeOrientation(enum Qt::Orientation) + ?initializeOrientation@HbInputSettingProxy@@QAEXW4Orientation@Qt@@@Z @ 3926 NONAME ABSENT ; void HbInputSettingProxy::initializeOrientation(enum Qt::Orientation) ?rightBoundary@HbScrollAreaPrivate@@UAEMXZ @ 3927 NONAME ; float HbScrollAreaPrivate::rightBoundary(void) ??_EHbLinearLayoutHelper@@UAE@I@Z @ 3928 NONAME ABSENT ; HbLinearLayoutHelper::~HbLinearLayoutHelper(unsigned int) ??_EHbGridLayoutHelper@@UAE@I@Z @ 3929 NONAME ABSENT ; HbGridLayoutHelper::~HbGridLayoutHelper(unsigned int) @@ -4081,7 +4082,7 @@ ?setTextWrapping@HbRichTextItem@@QAEXW4TextWrapping@Hb@@@Z @ 4080 NONAME ; void HbRichTextItem::setTextWrapping(enum Hb::TextWrapping) ?setTextVisible@HbRichTextItem@@QAEX_N@Z @ 4081 NONAME ; void HbRichTextItem::setTextVisible(bool) ?keyboard@HbKeymap@@QBEPBUHbKeyboardMap@@V?$QFlags@W4HbKeyboardTypeFlag@@@@@Z @ 4082 NONAME ; struct HbKeyboardMap const * HbKeymap::keyboard(class QFlags) const - ?activeKeyboardChanged@HbInputSettingProxy@@IAEXV?$QFlags@W4HbKeyboardTypeFlag@@@@@Z @ 4083 NONAME ; void HbInputSettingProxy::activeKeyboardChanged(class QFlags) + ?activeKeyboardChanged@HbInputSettingProxy@@IAEXV?$QFlags@W4HbKeyboardTypeFlag@@@@@Z @ 4083 NONAME ABSENT ; void HbInputSettingProxy::activeKeyboardChanged(class QFlags) ?receivesInteractionsChanged@HbFeedbackEngine@@IAEX_N@Z @ 4084 NONAME ; void HbFeedbackEngine::receivesInteractionsChanged(bool) ??_EHbWidgetLoaderSyntax@@UAE@I@Z @ 4085 NONAME ABSENT ; HbWidgetLoaderSyntax::~HbWidgetLoaderSyntax(unsigned int) ?networkSignalStrengthChanged@HbSystemNetworkInfo@@IAEXW4NetworkMode@1@H@Z @ 4086 NONAME ABSENT ; void HbSystemNetworkInfo::networkSignalStrengthChanged(enum HbSystemNetworkInfo::NetworkMode, int) @@ -4313,7 +4314,7 @@ ?getStaticMetaObject@HbFeedback@@SAABUQMetaObject@@XZ @ 4312 NONAME ; struct QMetaObject const & HbFeedback::getStaticMetaObject(void) ?staticMetaObject@HbFeedbackEngine@@2UQMetaObject@@B @ 4313 NONAME ; struct QMetaObject const HbFeedbackEngine::staticMetaObject ?trUtf8@HbFeedbackManager@@SA?AVQString@@PBD0H@Z @ 4314 NONAME ; class QString HbFeedbackManager::trUtf8(char const *, char const *, int) - ?activeKeyboard@HbInputSettingProxy@@QBE?AV?$QFlags@W4HbKeyboardTypeFlag@@@@XZ @ 4315 NONAME ; class QFlags HbInputSettingProxy::activeKeyboard(void) const + ?activeKeyboard@HbInputSettingProxy@@QBE?AV?$QFlags@W4HbKeyboardTypeFlag@@@@XZ @ 4315 NONAME ABSENT ; class QFlags HbInputSettingProxy::activeKeyboard(void) const ?editorRootState@HbInputMethod@@QBEXAAVHbInputState@@@Z @ 4316 NONAME ; void HbInputMethod::editorRootState(class HbInputState &) const ??1HbStyleOptionProgressDialog@@QAE@XZ @ 4317 NONAME ; HbStyleOptionProgressDialog::~HbStyleOptionProgressDialog(void) ?homeMobileNetworkCode@HbSystemNetworkInfo@@QBE?AVQString@@XZ @ 4318 NONAME ABSENT ; class QString HbSystemNetworkInfo::homeMobileNetworkCode(void) const @@ -4435,7 +4436,7 @@ ?d_func@HbOogmWatcher@@ABEPBVHbOogmWatcherPrivate@@XZ @ 4434 NONAME ; class HbOogmWatcherPrivate const * HbOogmWatcher::d_func(void) const ?setTextCase@HbEditorInterface@@QAEXW4HbTextCase@@@Z @ 4435 NONAME ; void HbEditorInterface::setTextCase(enum HbTextCase) ?inputStateFromEditor@HbInputMethodPrivate@@QAEXAAVHbInputState@@@Z @ 4436 NONAME ; void HbInputMethodPrivate::inputStateFromEditor(class HbInputState &) - ?activeCustomInputMethod@HbInputSettingProxy@@QBE?AVHbInputMethodDescriptor@@XZ @ 4437 NONAME ; class HbInputMethodDescriptor HbInputSettingProxy::activeCustomInputMethod(void) const + ?activeCustomInputMethod@HbInputSettingProxy@@QBE?AVHbInputMethodDescriptor@@XZ @ 4437 NONAME ABSENT ; class HbInputMethodDescriptor HbInputSettingProxy::activeCustomInputMethod(void) const ?addDefinition@HbIconAnimationManagerPrivate@@QAEXABVQString@@ABVHbIconAnimationDefinition@@@Z @ 4438 NONAME ; void HbIconAnimationManagerPrivate::addDefinition(class QString const &, class HbIconAnimationDefinition const &) ?stateAllowedInEditor@HbInputMethodPrivate@@QAE_NABVHbInputState@@@Z @ 4439 NONAME ; bool HbInputMethodPrivate::stateAllowedInEditor(class HbInputState const &) ?HandleGainingForeground@HbForegroundWatcher@@UAEXXZ @ 4440 NONAME ABSENT ; void HbForegroundWatcher::HandleGainingForeground(void) @@ -4478,7 +4479,7 @@ ?addFilePath@HbWidgetStyleLoader@@QAE_NABVQString@@W4Concern@HbLayeredStyleLoader@@W4LayerPriority@4@@Z @ 4477 NONAME ; bool HbWidgetStyleLoader::addFilePath(class QString const &, enum HbLayeredStyleLoader::Concern, enum HbLayeredStyleLoader::LayerPriority) ?staticMetaObject@HbForegroundWatcher@@2UQMetaObject@@B @ 4478 NONAME ; struct QMetaObject const HbForegroundWatcher::staticMetaObject ?qt_metacall@HbTextMeasurementUtility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 4479 NONAME ABSENT ; int HbTextMeasurementUtility::qt_metacall(enum QMetaObject::Call, int, void * *) - ?setActiveCustomInputMethod@HbInputSettingProxy@@QAEXABVHbInputMethodDescriptor@@@Z @ 4480 NONAME ; void HbInputSettingProxy::setActiveCustomInputMethod(class HbInputMethodDescriptor const &) + ?setActiveCustomInputMethod@HbInputSettingProxy@@QAEXABVHbInputMethodDescriptor@@@Z @ 4480 NONAME ABSENT ; void HbInputSettingProxy::setActiveCustomInputMethod(class HbInputMethodDescriptor const &) ?removeDefinition@HbIconAnimationManagerPrivate@@QAEXABVQString@@@Z @ 4481 NONAME ; void HbIconAnimationManagerPrivate::removeDefinition(class QString const &) ?findStateLanguage@HbInputMethodPrivate@@QBE?AVHbInputLanguage@@XZ @ 4482 NONAME ; class HbInputLanguage HbInputMethodPrivate::findStateLanguage(void) const ?displayName@HbInputMethodDescriptor@@QBE?AVQString@@XZ @ 4483 NONAME ; class QString HbInputMethodDescriptor::displayName(void) const @@ -4513,7 +4514,7 @@ ?tr@HbForegroundWatcher@@SA?AVQString@@PBD0@Z @ 4512 NONAME ; class QString HbForegroundWatcher::tr(char const *, char const *) ??1HbTextMeasurementUtility@@UAE@XZ @ 4513 NONAME ; HbTextMeasurementUtility::~HbTextMeasurementUtility(void) ?transfer@HbInputMethodPrivate@@QAEXPAVHbInputMethod@@@Z @ 4514 NONAME ; void HbInputMethodPrivate::transfer(class HbInputMethod *) - ?loadIcon@HbIconLoader@@QAEPAVHbIconImpl@@ABVQString@@W4IconDataType@1@W4Purpose@1@ABVQSizeF@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@V?$QFlags@W4IconLoaderOption@HbIconLoader@@@@PAVHbIconAnimator@@ABVQColor@@@Z @ 4515 NONAME ; class HbIconImpl * HbIconLoader::loadIcon(class QString const &, enum HbIconLoader::IconDataType, enum HbIconLoader::Purpose, class QSizeF const &, enum Qt::AspectRatioMode, enum QIcon::Mode, class QFlags, class HbIconAnimator *, class QColor const &) + ?loadIcon@HbIconLoader@@QAEPAVHbIconImpl@@ABVQString@@W4IconDataType@1@W4Purpose@1@ABVQSizeF@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@V?$QFlags@W4IconLoaderOption@HbIconLoader@@@@PAVHbIconAnimator@@ABVQColor@@@Z @ 4515 NONAME ABSENT ; class HbIconImpl * HbIconLoader::loadIcon(class QString const &, enum HbIconLoader::IconDataType, enum HbIconLoader::Purpose, class QSizeF const &, enum Qt::AspectRatioMode, enum QIcon::Mode, class QFlags, class HbIconAnimator *, class QColor const &) ?trUtf8@HbTextMeasurementUtility@@SA?AVQString@@PBD0H@Z @ 4516 NONAME ABSENT ; class QString HbTextMeasurementUtility::trUtf8(char const *, char const *, int) ?d_func@HbInputModeCache@@AAEPAVHbInputModeCachePrivate@@XZ @ 4517 NONAME ; class HbInputModeCachePrivate * HbInputModeCache::d_func(void) ?testApiProtectionFlag@HbWidgetBasePrivate@@QBE_NW4ApiCssProtectionFlags@1@@Z @ 4518 NONAME ; bool HbWidgetBasePrivate::testApiProtectionFlag(enum HbWidgetBasePrivate::ApiCssProtectionFlags) const @@ -4572,7 +4573,7 @@ ?setSmileyTheme@HbEditorInterface@@QAEXABVHbSmileyTheme@@@Z @ 4571 NONAME ; void HbEditorInterface::setSmileyTheme(class HbSmileyTheme const &) ?qt_metacall@HbForegroundWatcher@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 4572 NONAME ; int HbForegroundWatcher::qt_metacall(enum QMetaObject::Call, int, void * *) ?editorRootState@HbInputMethodPrivate@@QBEXAAVHbInputState@@@Z @ 4573 NONAME ; void HbInputMethodPrivate::editorRootState(class HbInputState &) const - ?defaultInputMode@HbInputMethodPrivate@@QBE?AV?$QFlags@W4HbInputModeTypeFlag@@@@ABVHbInputLanguage@@@Z @ 4574 NONAME ; class QFlags HbInputMethodPrivate::defaultInputMode(class HbInputLanguage const &) const + ?defaultInputMode@HbInputMethodPrivate@@QBE?AV?$QFlags@W4HbInputModeTypeFlag@@@@ABVHbInputLanguage@@@Z @ 4574 NONAME ABSENT ; class QFlags HbInputMethodPrivate::defaultInputMode(class HbInputLanguage const &) const ?stateFromMode@HbInputMethodPrivate@@QAEXABVHbInputModeProperties@@AAVHbInputState@@@Z @ 4575 NONAME ABSENT ; void HbInputMethodPrivate::stateFromMode(class HbInputModeProperties const &, class HbInputState &) ??0HbSmileyTheme@@QAE@ABVQString@@@Z @ 4576 NONAME ; HbSmileyTheme::HbSmileyTheme(class QString const &) ?addDefinitionFile@HbIconAnimationManagerPrivate@@QAE_NABVQString@@@Z @ 4577 NONAME ; bool HbIconAnimationManagerPrivate::addDefinitionFile(class QString const &) @@ -5103,7 +5104,7 @@ ?performEffect@HbVgColorizeEffect@@MAEXPAVQPainter@@ABVQPointF@@ABVQVariant@@ABVQSize@@@Z @ 5102 NONAME ; void HbVgColorizeEffect::performEffect(class QPainter *, class QPointF const &, class QVariant const &, class QSize const &) ?metaObject@HbVgEffect@@UBEPBUQMetaObject@@XZ @ 5103 NONAME ; struct QMetaObject const * HbVgEffect::metaObject(void) const ?hasAlreadyInputFrameworkFocus@HbInputContextProxy@@ABE_NPAVHbInputMethod@@PAVQWidget@@@Z @ 5104 NONAME ABSENT ; bool HbInputContextProxy::hasAlreadyInputFrameworkFocus(class HbInputMethod *, class QWidget *) const - ?deletePixmapIfLargerThan@HbIconSource@@QAEXH@Z @ 5105 NONAME ; void HbIconSource::deletePixmapIfLargerThan(int) + ?deletePixmapIfLargerThan@HbIconSource@@QAEXH@Z @ 5105 NONAME ABSENT ; void HbIconSource::deletePixmapIfLargerThan(int) ?hue@HbVgHslEffect@@QBEMXZ @ 5106 NONAME ; float HbVgHslEffect::hue(void) const ?Cancel@CHbDeviceDialogSymbian@@QAEXXZ @ 5107 NONAME ; void CHbDeviceDialogSymbian::Cancel(void) ?boundingRectFor@HbVgOutlineEffect@@UBE?AVQRectF@@ABV2@@Z @ 5108 NONAME ; class QRectF HbVgOutlineEffect::boundingRectFor(class QRectF const &) const @@ -5193,7 +5194,7 @@ ?staticMetaObject@HbVgBlurEffect@@2UQMetaObject@@B @ 5192 NONAME ; struct QMetaObject const HbVgBlurEffect::staticMetaObject ?d_func@HbVgReflectionEffect@@AAEPAVHbVgReflectionEffectPrivate@@XZ @ 5193 NONAME ; class HbVgReflectionEffectPrivate * HbVgReflectionEffect::d_func(void) ?loadPixmapIcon@HbIconLoader@@AAEXAAUHbIconLoadingParams@@ABVQString@@@Z @ 5194 NONAME ; void HbIconLoader::loadPixmapIcon(struct HbIconLoadingParams &, class QString const &) - ?pixmap@HbIconSource@@QAEPAVQPixmap@@XZ @ 5195 NONAME ; class QPixmap * HbIconSource::pixmap(void) + ?pixmap@HbIconSource@@QAEPAVQPixmap@@XZ @ 5195 NONAME ABSENT ; class QPixmap * HbIconSource::pixmap(void) ?tr@HbVgHslEffect@@SA?AVQString@@PBD0@Z @ 5196 NONAME ; class QString HbVgHslEffect::tr(char const *, char const *) ?qt_metacast@HbVgHslEffect@@UAEPAXPBD@Z @ 5197 NONAME ; void * HbVgHslEffect::qt_metacast(char const *) ?tr@HbVgLightEffect@@SA?AVQString@@PBD0H@Z @ 5198 NONAME ABSENT ; class QString HbVgLightEffect::tr(char const *, char const *, int) @@ -6241,7 +6242,7 @@ ?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) - ?unLoadIcon@HbIconLoader@@QAEXPAVHbIconImpl@@_N@Z @ 6243 NONAME ; void HbIconLoader::unLoadIcon(class HbIconImpl *, bool) + ?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 *) ?tr@HbThemeSystemEffect@@SA?AVQString@@PBD0H@Z @ 6246 NONAME ; class QString HbThemeSystemEffect::tr(char const *, char const *, int) @@ -6635,7 +6636,7 @@ ?setGridLayoutRowHeights@HbXmlLoaderBinaryActions@@UAE_NHABUHbXmlLengthValue@@0000@Z @ 6634 NONAME ; bool HbXmlLoaderBinaryActions::setGridLayoutRowHeights(int, struct HbXmlLengthValue const &, struct HbXmlLengthValue const &, struct HbXmlLengthValue const &, struct HbXmlLengthValue const &, struct HbXmlLengthValue const &) ?addGridLayoutCell@HbXmlLoaderBinaryActions@@UAE_NABVQString@@HHPAH1PAV?$QFlags@W4AlignmentFlag@Qt@@@@@Z @ 6635 NONAME ; bool HbXmlLoaderBinaryActions::addGridLayoutCell(class QString const &, int, int, int *, int *, class QFlags *) ?processDocument@HbXmlLoaderBinarySyntax@@AAE_NABVQString@@@Z @ 6636 NONAME ; bool HbXmlLoaderBinarySyntax::processDocument(class QString const &) - ?initStyleOption@HbToolButton@@IAEXPAVHbStyleOptionToolButton@@@Z @ 6637 NONAME ; void HbToolButton::initStyleOption(class HbStyleOptionToolButton *) + ?initStyleOption@HbToolButton@@IAEXPAVHbStyleOptionToolButton@@@Z @ 6637 NONAME ABSENT ; void HbToolButton::initStyleOption(class HbStyleOptionToolButton *) ?parseSetToolTip@HbXmlLoaderBinarySyntax@@AAE_NXZ @ 6638 NONAME ; bool HbXmlLoaderBinarySyntax::parseSetToolTip(void) ?setSizeHint@HbXmlLoaderAbstractActions@@UAE_NW4SizeHint@Qt@@ABUHbXmlLengthValue@@1_N@Z @ 6639 NONAME ; bool HbXmlLoaderAbstractActions::setSizeHint(enum Qt::SizeHint, struct HbXmlLengthValue const &, struct HbXmlLengthValue const &, bool) ??1HbXmlVariable@@QAE@XZ @ 6640 NONAME ; HbXmlVariable::~HbXmlVariable(void) @@ -7626,16 +7627,16 @@ ?unLoadMultiIcon@HbThemeClient@@QAEXABVQStringList@@ABV?$QVector@VQSizeF@@@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_NABVQColor@@W4HbRenderingMode@@@Z @ 7625 NONAME ; void HbThemeClient::unLoadMultiIcon(class QStringList const &, class QVector const &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool, class QColor const &, enum HbRenderingMode) ??0HbNvgIconImpl@@QAE@ABUHbSharedIconInfo@@ABVQString@@ABVQSizeF@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_NW4HbRenderingMode@@@Z @ 7626 NONAME ; HbNvgIconImpl::HbNvgIconImpl(struct HbSharedIconInfo const &, class QString const &, class QSizeF const &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool, enum HbRenderingMode) ?getMultiPartIconInfo@HbThemeClient@@QAE?AUHbSharedIconInfo@@ABVQStringList@@ABUHbMultiPartSizeData@@ABVQSizeF@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_NV?$QFlags@W4IconLoaderOption@HbIconLoader@@@@ABVQColor@@W4HbRenderingMode@@@Z @ 7627 NONAME ; struct HbSharedIconInfo HbThemeClient::getMultiPartIconInfo(class QStringList const &, struct HbMultiPartSizeData const &, class QSizeF const &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool, class QFlags, class QColor const &, enum HbRenderingMode) - ?getSharedIconInfo@HbThemeClientPrivate@@QAE?AUHbSharedIconInfo@@ABVQString@@ABVQSizeF@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_NV?$QFlags@W4IconLoaderOption@HbIconLoader@@@@ABVQColor@@W4HbRenderingMode@@@Z @ 7628 NONAME ; struct HbSharedIconInfo HbThemeClientPrivate::getSharedIconInfo(class QString const &, class QSizeF const &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool, class QFlags, class QColor const &, enum HbRenderingMode) + ?getSharedIconInfo@HbThemeClientPrivate@@QAE?AUHbSharedIconInfo@@ABVQString@@ABVQSizeF@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_NV?$QFlags@W4IconLoaderOption@HbIconLoader@@@@ABVQColor@@W4HbRenderingMode@@@Z @ 7628 NONAME ABSENT ; struct HbSharedIconInfo HbThemeClientPrivate::getSharedIconInfo(class QString const &, class QSizeF const &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool, class QFlags, class QColor const &, enum HbRenderingMode) ?getMultiIconInfo@HbThemeClientPrivate@@QAE?AUHbSharedIconInfoList@@ABVQStringList@@ABV?$QVector@VQSizeF@@@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_NV?$QFlags@W4IconLoaderOption@HbIconLoader@@@@ABVQColor@@W4HbRenderingMode@@@Z @ 7629 NONAME ; struct HbSharedIconInfoList HbThemeClientPrivate::getMultiIconInfo(class QStringList const &, class QVector const &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool, class QFlags, class QColor const &, enum HbRenderingMode) - ?unloadIcon@HbThemeClientPrivate@@QAEXABVQString@@ABVQSizeF@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_NABVQColor@@W4HbRenderingMode@@@Z @ 7630 NONAME ; void HbThemeClientPrivate::unloadIcon(class QString const &, class QSizeF const &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool, class QColor const &, enum HbRenderingMode) + ?unloadIcon@HbThemeClientPrivate@@QAEXABVQString@@ABVQSizeF@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_NABVQColor@@W4HbRenderingMode@@@Z @ 7630 NONAME ABSENT ; void HbThemeClientPrivate::unloadIcon(class QString const &, class QSizeF const &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool, class QColor const &, enum HbRenderingMode) ?unLoadMultiIcon@HbThemeClientPrivate@@QAEXABVQStringList@@ABV?$QVector@VQSizeF@@@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_NABVQColor@@W4HbRenderingMode@@@Z @ 7631 NONAME ; void HbThemeClientPrivate::unLoadMultiIcon(class QStringList const &, class QVector const &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool, class QColor const &, enum HbRenderingMode) ?getMultiIconInfo@HbThemeClient@@QAE?AUHbSharedIconInfoList@@ABVQStringList@@ABV?$QVector@VQSizeF@@@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_NV?$QFlags@W4IconLoaderOption@HbIconLoader@@@@ABVQColor@@W4HbRenderingMode@@@Z @ 7632 NONAME ; struct HbSharedIconInfoList HbThemeClient::getMultiIconInfo(class QStringList const &, class QVector const &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool, class QFlags, class QColor const &, enum HbRenderingMode) - ?getSharedIconInfo@HbThemeClient@@QAE?AUHbSharedIconInfo@@ABVQString@@ABVQSizeF@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_NV?$QFlags@W4IconLoaderOption@HbIconLoader@@@@ABVQColor@@W4HbRenderingMode@@@Z @ 7633 NONAME ; struct HbSharedIconInfo HbThemeClient::getSharedIconInfo(class QString const &, class QSizeF const &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool, class QFlags, class QColor const &, enum HbRenderingMode) + ?getSharedIconInfo@HbThemeClient@@QAE?AUHbSharedIconInfo@@ABVQString@@ABVQSizeF@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_NV?$QFlags@W4IconLoaderOption@HbIconLoader@@@@ABVQColor@@W4HbRenderingMode@@@Z @ 7633 NONAME ABSENT ; struct HbSharedIconInfo HbThemeClient::getSharedIconInfo(class QString const &, class QSizeF const &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool, class QFlags, class QColor const &, enum HbRenderingMode) ??0HbPixmapIconImpl@@QAE@UHbSharedIconInfo@@AAVQString@@ABVQSizeF@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_NW4HbRenderingMode@@@Z @ 7634 NONAME ; HbPixmapIconImpl::HbPixmapIconImpl(struct HbSharedIconInfo, class QString &, class QSizeF const &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool, enum HbRenderingMode) ?switchRenderingMode@HbThemeClient@@QAE_NW4HbRenderingMode@@@Z @ 7635 NONAME ; bool HbThemeClient::switchRenderingMode(enum HbRenderingMode) ?updateRenderingMode@HbIconLoader@@QAEXW4Type@QPaintEngine@@@Z @ 7636 NONAME ; void HbIconLoader::updateRenderingMode(enum QPaintEngine::Type) - ?unloadIcon@HbThemeClient@@QAEXABVQString@@ABVQSizeF@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_NABVQColor@@W4HbRenderingMode@@@Z @ 7637 NONAME ; void HbThemeClient::unloadIcon(class QString const &, class QSizeF const &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool, class QColor const &, enum HbRenderingMode) + ?unloadIcon@HbThemeClient@@QAEXABVQString@@ABVQSizeF@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_NABVQColor@@W4HbRenderingMode@@@Z @ 7637 NONAME ABSENT ; void HbThemeClient::unloadIcon(class QString const &, class QSizeF const &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool, class QColor const &, enum HbRenderingMode) ?switchRenderingMode@HbIconLoader@@QAEXW4HbRenderingMode@@@Z @ 7638 NONAME ; void HbIconLoader::switchRenderingMode(enum HbRenderingMode) ?hash@HbThemeIndex@@SAIABVQString@@@Z @ 7639 NONAME ; unsigned int HbThemeIndex::hash(class QString const &) ?getItemData@HbThemeIndex@@QAEPBUHbThemeIndexItemData@@ABVQString@@@Z @ 7640 NONAME ; struct HbThemeIndexItemData const * HbThemeIndex::getItemData(class QString const &) @@ -7731,7 +7732,7 @@ ?preferredInputMethodCustomData@HbInputSettingProxy@@QBE?AVQByteArray@@W4Orientation@Qt@@@Z @ 7730 NONAME ; class QByteArray HbInputSettingProxy::preferredInputMethodCustomData(enum Qt::Orientation) const ?setPreferredInputMethod@HbInputSettingProxy@@QAEXW4Orientation@Qt@@ABVHbInputMethodDescriptor@@ABVQByteArray@@@Z @ 7731 NONAME ; void HbInputSettingProxy::setPreferredInputMethod(enum Qt::Orientation, class HbInputMethodDescriptor const &, class QByteArray const &) ?descriptor@HbInputMethod@@IBE?AVHbInputMethodDescriptor@@XZ @ 7732 NONAME ; class HbInputMethodDescriptor HbInputMethod::descriptor(void) const - ?preferredInputMethod@HbInputSettingProxy@@QBE?AVHbInputMethodDescriptor@@XZ @ 7733 NONAME ; class HbInputMethodDescriptor HbInputSettingProxy::preferredInputMethod(void) const + ?preferredInputMethod@HbInputSettingProxy@@QBE?AVHbInputMethodDescriptor@@XZ @ 7733 NONAME ABSENT ; class HbInputMethodDescriptor HbInputSettingProxy::preferredInputMethod(void) const ?descriptor@HbInputModeCache@@QBE?AVHbInputMethodDescriptor@@PBVHbInputMethod@@@Z @ 7734 NONAME ; class HbInputMethodDescriptor HbInputModeCache::descriptor(class HbInputMethod const *) const ?acceptsState@HbInputModeCache@@QBE_NPBVHbInputMethod@@ABVHbInputState@@@Z @ 7735 NONAME ; bool HbInputModeCache::acceptsState(class HbInputMethod const *, class HbInputState const &) const ?booleanFromString@HbThemeSystemEffect@@CA_NABVQString@@@Z @ 7736 NONAME ; bool HbThemeSystemEffect::booleanFromString(class QString const &) @@ -8121,9 +8122,9 @@ ?getSharedStyleSheet@HbThemeClientPrivate@@QAEPAUStyleSheet@HbCss@@ABVQString@@W4LayerPriority@HbLayeredStyleLoader@@AA_N@Z @ 8120 NONAME ; struct HbCss::StyleSheet * HbThemeClientPrivate::getSharedStyleSheet(class QString const &, enum HbLayeredStyleLoader::LayerPriority, bool &) ?doAddFileSet@HbWidgetStyleLoader@@AAE_NABVQString@@W4FileSetType@1@W4PatternType@1@W4Concern@HbLayeredStyleLoader@@W4LayerPriority@6@@Z @ 8121 NONAME ; bool HbWidgetStyleLoader::doAddFileSet(class QString const &, enum HbWidgetStyleLoader::FileSetType, enum HbWidgetStyleLoader::PatternType, enum HbLayeredStyleLoader::Concern, enum HbLayeredStyleLoader::LayerPriority) ?getSharedLayoutDefs@HbThemeClientPrivate@@QAEPAULayoutDefinition@HbWidgetLoader@@ABVQString@@00AA_N@Z @ 8122 NONAME ; struct HbWidgetLoader::LayoutDefinition * HbThemeClientPrivate::getSharedLayoutDefs(class QString const &, class QString const &, class QString const &, bool &) - ?activateParentLayout@HbWidgetBasePrivate@@QAEXXZ @ 8123 NONAME ; void HbWidgetBasePrivate::activateParentLayout(void) + ?activateParentLayout@HbWidgetBasePrivate@@QAEXXZ @ 8123 NONAME ABSENT ; void HbWidgetBasePrivate::activateParentLayout(void) ?updateGeometry@HbWidgetBase@@MAEXXZ @ 8124 NONAME ; void HbWidgetBase::updateGeometry(void) - ?ignoreGeometryUpdate@HbWidgetBasePrivate@@QAE_NXZ @ 8125 NONAME ; bool HbWidgetBasePrivate::ignoreGeometryUpdate(void) + ?ignoreGeometryUpdate@HbWidgetBasePrivate@@QAE_NXZ @ 8125 NONAME ABSENT ; bool HbWidgetBasePrivate::ignoreGeometryUpdate(void) ?updateGeometry@HbTextItem@@MAEXXZ @ 8126 NONAME ; void HbTextItem::updateGeometry(void) ?clearPrefSizeCache@HbRichTextItemPrivate@@QAEXXZ @ 8127 NONAME ; void HbRichTextItemPrivate::clearPrefSizeCache(void) ?setDocumentWidth@HbRichTextItemPrivate@@QAEXM@Z @ 8128 NONAME ; void HbRichTextItemPrivate::setDocumentWidth(float) @@ -8145,5 +8146,107 @@ ??0HbKeymapFactoryPrivate@@QAE@XZ @ 8144 NONAME ; HbKeymapFactoryPrivate::HbKeymapFactoryPrivate(void) ?keymap@HbKeymapFactoryPrivate@@QBEPAVHbKeymap@@ABVHbInputLanguage@@@Z @ 8145 NONAME ; class HbKeymap * HbKeymapFactoryPrivate::keymap(class HbInputLanguage const &) const ?setLoopCount@HbIconAnimator@@QAEXH@Z @ 8146 NONAME ; void HbIconAnimator::setLoopCount(int) - ?resizePopup@HbPopupPrivate@@QAEXXZ @ 8147 NONAME ; void HbPopupPrivate::resizePopup(void) + ?resizePopup@HbPopupPrivate@@QAEXXZ @ 8147 NONAME ABSENT ; void HbPopupPrivate::resizePopup(void) ?polish@HbPopup@@MAEXAAVHbStyleParameters@@@Z @ 8148 NONAME ; void HbPopup::polish(class HbStyleParameters &) + ?chineseDefaultKeypadChanged@HbInputSettingProxy@@IAEX_N@Z @ 8149 NONAME ; void HbInputSettingProxy::chineseDefaultKeypadChanged(bool) + ?useWesternDefaultKeypadForChinese@HbInputSettingProxy@@QBE_NXZ @ 8150 NONAME ; bool HbInputSettingProxy::useWesternDefaultKeypadForChinese(void) const + ?setWesternDefaultKeypadForChinese@HbInputSettingProxy@@QAEX_N@Z @ 8151 NONAME ; void HbInputSettingProxy::setWesternDefaultKeypadForChinese(bool) + ??0HbStylePrimitiveData@@QAE@HH@Z @ 8152 NONAME ; HbStylePrimitiveData::HbStylePrimitiveData(int, int) + ??0HbStyleMarqueePrimitiveData@@QAE@XZ @ 8153 NONAME ; HbStyleMarqueePrimitiveData::HbStyleMarqueePrimitiveData(void) + ??0HbStyleTextPrimitiveData@@QAE@XZ @ 8154 NONAME ; HbStyleTextPrimitiveData::HbStyleTextPrimitiveData(void) + ??1HbStyleTextPrimitiveData@@QAE@XZ @ 8155 NONAME ; HbStyleTextPrimitiveData::~HbStyleTextPrimitiveData(void) + ??0HbStyleTouchAreaPrimitiveData@@QAE@XZ @ 8156 NONAME ; HbStyleTouchAreaPrimitiveData::HbStyleTouchAreaPrimitiveData(void) + ?image@HbVgImageIconRenderer@@QBEKXZ @ 8157 NONAME ; unsigned long HbVgImageIconRenderer::image(void) const + ??0HbStyleRichTextPrimitiveData@@QAE@XZ @ 8158 NONAME ; HbStyleRichTextPrimitiveData::HbStyleRichTextPrimitiveData(void) + ?createPrimitive@HbStyle@@UBEPAVQGraphicsObject@@W4PrimitiveType@1@ABVQString@@PAV2@@Z @ 8159 NONAME ; class QGraphicsObject * HbStyle::createPrimitive(enum HbStyle::PrimitiveType, class QString const &, class QGraphicsObject *) const + ?updatePrimitive@HbStyle@@UBE_NPAVQGraphicsObject@@PBVHbStylePrimitiveData@@0@Z @ 8160 NONAME ; bool HbStyle::updatePrimitive(class QGraphicsObject *, class HbStylePrimitiveData const *, class QGraphicsObject *) const + ??0HbStyleFramePrimitiveData@@QAE@XZ @ 8161 NONAME ; HbStyleFramePrimitiveData::HbStyleFramePrimitiveData(void) + ?initPrimitiveData@HbToolButton@@IAEXPAVHbStylePrimitiveData@@PBVQGraphicsObject@@@Z @ 8162 NONAME ; void HbToolButton::initPrimitiveData(class HbStylePrimitiveData *, class QGraphicsObject const *) + ?initPrimitiveData@HbWidgetBase@@IAEXPAVHbStylePrimitiveData@@PBVQGraphicsObject@@@Z @ 8163 NONAME ; void HbWidgetBase::initPrimitiveData(class HbStylePrimitiveData *, class QGraphicsObject const *) + ??0HbStyleIconPrimitiveData@@QAE@XZ @ 8164 NONAME ; HbStyleIconPrimitiveData::HbStyleIconPrimitiveData(void) + ?initPrimitiveData@HbAbstractButton@@IAEXPAVHbStylePrimitiveData@@PBVQGraphicsObject@@@Z @ 8165 NONAME ; void HbAbstractButton::initPrimitiveData(class HbStylePrimitiveData *, class QGraphicsObject const *) + ??1HbStyleFramePrimitiveData@@QAE@XZ @ 8166 NONAME ; HbStyleFramePrimitiveData::~HbStyleFramePrimitiveData(void) + ??1HbStyleIconPrimitiveData@@QAE@XZ @ 8167 NONAME ; HbStyleIconPrimitiveData::~HbStyleIconPrimitiveData(void) + ?cancelGetSharedIconInfo@HbThemeClientPrivate@@QAEXP6A_NABUHbSharedIconInfo@@PAX@Z1@Z @ 8168 NONAME ; void HbThemeClientPrivate::cancelGetSharedIconInfo(bool (*)(struct HbSharedIconInfo const &, void *), void *) + ?getSharedIconInfo@HbThemeClient@@QAEXABVQString@@ABVQSizeF@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_NV?$QFlags@W4IconLoaderOption@HbIconLoader@@@@ABVQColor@@W4HbRenderingMode@@P6A_NABUHbSharedIconInfo@@PAX@Z9@Z @ 8169 NONAME ABSENT ; void HbThemeClient::getSharedIconInfo(class QString const &, class QSizeF const &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool, class QFlags, class QColor const &, enum HbRenderingMode, bool (*)(struct HbSharedIconInfo const &, void *), void *) + ?getSharedIconInfo@HbThemeClientPrivate@@QAEXABVQString@@ABVQSizeF@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_NV?$QFlags@W4IconLoaderOption@HbIconLoader@@@@ABVQColor@@W4HbRenderingMode@@P6A_NABUHbSharedIconInfo@@PAX@Z9@Z @ 8170 NONAME ABSENT ; void HbThemeClientPrivate::getSharedIconInfo(class QString const &, class QSizeF const &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool, class QFlags, class QColor const &, enum HbRenderingMode, bool (*)(struct HbSharedIconInfo const &, void *), void *) + ?deleteImageIfLargerThan@HbIconSource@@QAEXH@Z @ 8171 NONAME ; void HbIconSource::deleteImageIfLargerThan(int) + ?setAsync@HbIconItem@@QAEX_N@Z @ 8172 NONAME ; void HbIconItem::setAsync(bool) + ?unLoadIcon@HbIconLoader@@QAEXPAVHbIconImpl@@_N1@Z @ 8173 NONAME ; void HbIconLoader::unLoadIcon(class HbIconImpl *, bool, bool) + ?loadIcon@HbIconLoader@@QAEPAVHbIconImpl@@ABVQString@@W4IconDataType@1@W4Purpose@1@ABVQSizeF@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@V?$QFlags@W4IconLoaderOption@HbIconLoader@@@@PAVHbIconAnimator@@ABVQColor@@P6AXPAV2@PAX_N@ZPAX@Z @ 8174 NONAME ; class HbIconImpl * HbIconLoader::loadIcon(class QString const &, enum HbIconLoader::IconDataType, enum HbIconLoader::Purpose, class QSizeF const &, enum Qt::AspectRatioMode, enum QIcon::Mode, class QFlags, class HbIconAnimator *, class QColor const &, void (*)(class HbIconImpl *, void *, bool), void *) + ?scheduleQueueCheck@HbThemeClientPrivate@@QAEXXZ @ 8175 NONAME ; void HbThemeClientPrivate::scheduleQueueCheck(void) + ?finishGetIconFromServer@HbIconLoader@@AAEPAVHbIconImpl@@AAUHbSharedIconInfo@@AAUHbIconLoadingParams@@@Z @ 8176 NONAME ; class HbIconImpl * HbIconLoader::finishGetIconFromServer(struct HbSharedIconInfo &, struct HbIconLoadingParams &) + ?lookupInCache@HbIconLoader@@AAEPAVHbIconImpl@@ABUHbIconLoadingParams@@PAVQByteArray@@@Z @ 8177 NONAME ; class HbIconImpl * HbIconLoader::lookupInCache(struct HbIconLoadingParams const &, class QByteArray *) + ?cancelGetSharedIconInfo@HbThemeClient@@QAEXP6A_NABUHbSharedIconInfo@@PAX@Z1@Z @ 8178 NONAME ; void HbThemeClient::cancelGetSharedIconInfo(bool (*)(struct HbSharedIconInfo const &, void *), void *) + ?image@HbIconSource@@QAEPAVQImage@@XZ @ 8179 NONAME ; class QImage * HbIconSource::image(void) + ?cancelLoadIcon@HbIconLoader@@QAEXP6AXPAVHbIconImpl@@PAX_N@Z1@Z @ 8180 NONAME ; void HbIconLoader::cancelLoadIcon(void (*)(class HbIconImpl *, void *, bool), void *) + ?getIconFromServerAsync@HbIconLoader@@AAEXAAUHbIconLoadingParams@@P6AXPAVHbIconImpl@@PAX_N@Z2@Z @ 8181 NONAME ; void HbIconLoader::getIconFromServerAsync(struct HbIconLoadingParams &, void (*)(class HbIconImpl *, void *, bool), void *) + ?loadLocal@HbIconLoader@@AAEXAAUHbIconLoadingParams@@ABVQString@@@Z @ 8182 NONAME ; void HbIconLoader::loadLocal(struct HbIconLoadingParams &, class QString const &) + ?loadLocalAsync@HbIconLoader@@AAEXABUHbIconLoadingParams@@ABVQString@@P6AXPAVHbIconImpl@@PAX_N@Z3@Z @ 8183 NONAME ; void HbIconLoader::loadLocalAsync(struct HbIconLoadingParams const &, class QString const &, void (*)(class HbIconImpl *, void *, bool), void *) + ?asyncCallback@HbIconLoader@@CA_NABUHbSharedIconInfo@@PAX@Z @ 8184 NONAME ; bool HbIconLoader::asyncCallback(struct HbSharedIconInfo const &, void *) + ?localLoadReady@HbIconLoader@@AAEXABUHbIconLoadingParams@@PAX@Z @ 8185 NONAME ; void HbIconLoader::localLoadReady(struct HbIconLoadingParams const &, void *) + ?finishLocal@HbIconLoader@@AAEPAVHbIconImpl@@AAUHbIconLoadingParams@@@Z @ 8186 NONAME ; class HbIconImpl * HbIconLoader::finishLocal(struct HbIconLoadingParams &) + ?async@HbIconItem@@QBE_NXZ @ 8187 NONAME ; bool HbIconItem::async(void) const + ?cacheIcon@HbIconLoader@@AAEXABUHbIconLoadingParams@@PAVHbIconImpl@@PAVQByteArray@@@Z @ 8188 NONAME ; void HbIconLoader::cacheIcon(struct HbIconLoadingParams const &, class HbIconImpl *, class QByteArray *) + ?updateIconItem@HbIconItemPrivate@@QAEXXZ @ 8189 NONAME ; void HbIconItemPrivate::updateIconItem(void) + ?recalculateBoundingRect@HbIconItemPrivate@@QBEXXZ @ 8190 NONAME ; void HbIconItemPrivate::recalculateBoundingRect(void) const + ?clearStoredIconContent@HbIconItemPrivate@@QAEXXZ @ 8191 NONAME ; void HbIconItemPrivate::clearStoredIconContent(void) + ?setAsyncCallbackFilter@HbIconItemPrivate@@QAEXP6A_NPAVHbIconItem@@PAX@Z1@Z @ 8192 NONAME ; void HbIconItemPrivate::setAsyncCallbackFilter(bool (*)(class HbIconItem *, void *), void *) + ??_EHbIconItemPrivate@@UAE@I@Z @ 8193 NONAME ; HbIconItemPrivate::~HbIconItemPrivate(unsigned int) + ??0HbIconItemPrivate@@QAE@ABVHbIcon@@@Z @ 8194 NONAME ; HbIconItemPrivate::HbIconItemPrivate(class HbIcon const &) + ?outlinesEnabled@HbIconItemPrivate@@2_NA @ 8195 NONAME ; bool HbIconItemPrivate::outlinesEnabled + ??1HbIconItemPrivate@@UAE@XZ @ 8196 NONAME ; HbIconItemPrivate::~HbIconItemPrivate(void) + ?updateIconParams@HbIconItemPrivate@@QAEXXZ @ 8197 NONAME ; void HbIconItemPrivate::updateIconParams(void) + ?q_func@HbIconItemPrivate@@AAEPAVHbIconItem@@XZ @ 8198 NONAME ; class HbIconItem * HbIconItemPrivate::q_func(void) + ?d_ptr@HbIconItemPrivate@@SAPAV1@PAVHbIconItem@@@Z @ 8199 NONAME ; class HbIconItemPrivate * HbIconItemPrivate::d_ptr(class HbIconItem *) + ?q_func@HbIconItemPrivate@@ABEPBVHbIconItem@@XZ @ 8200 NONAME ; class HbIconItem const * HbIconItemPrivate::q_func(void) const + ?setThemedColor@HbIconItemPrivate@@QAEXABVQColor@@@Z @ 8201 NONAME ; void HbIconItemPrivate::setThemedColor(class QColor const &) + ?unloadIcon@HbThemeClientPrivate@@QAEXABUIconReqInfo@HbThemeClient@@@Z @ 8202 NONAME ; void HbThemeClientPrivate::unloadIcon(struct HbThemeClient::IconReqInfo const &) + ?batchUnloadIcon@HbThemeClient@@QAEXABV?$QVector@UIconReqInfo@HbThemeClient@@@@@Z @ 8203 NONAME ; void HbThemeClient::batchUnloadIcon(class QVector const &) + ?getSharedIconInfo@HbThemeClient@@QAE?AUHbSharedIconInfo@@ABUIconReqInfo@1@@Z @ 8204 NONAME ; struct HbSharedIconInfo HbThemeClient::getSharedIconInfo(struct HbThemeClient::IconReqInfo const &) + ?getSharedIconInfo@HbThemeClient@@QAEXABUIconReqInfo@1@P6A_NABUHbSharedIconInfo@@PAX@Z2@Z @ 8205 NONAME ; void HbThemeClient::getSharedIconInfo(struct HbThemeClient::IconReqInfo const &, bool (*)(struct HbSharedIconInfo const &, void *), void *) + ?unloadIcon@HbThemeClient@@QAEXABUIconReqInfo@1@@Z @ 8206 NONAME ; void HbThemeClient::unloadIcon(struct HbThemeClient::IconReqInfo const &) + ?getSharedIconInfo@HbThemeClientPrivate@@QAEXABUIconReqInfo@HbThemeClient@@P6A_NABUHbSharedIconInfo@@PAX@Z2@Z @ 8207 NONAME ; void HbThemeClientPrivate::getSharedIconInfo(struct HbThemeClient::IconReqInfo const &, bool (*)(struct HbSharedIconInfo const &, void *), void *) + ?getSharedIconInfo@HbThemeClientPrivate@@QAE?AUHbSharedIconInfo@@ABUIconReqInfo@HbThemeClient@@@Z @ 8208 NONAME ; struct HbSharedIconInfo HbThemeClientPrivate::getSharedIconInfo(struct HbThemeClient::IconReqInfo const &) + ?batchUnloadIcon@HbThemeClientPrivate@@QAEXABV?$QVector@UIconReqInfo@HbThemeClient@@@@@Z @ 8209 NONAME ; void HbThemeClientPrivate::batchUnloadIcon(class QVector const &) + ?advancedGestureActivated@HbFeedbackEngine@@MAEXPBVHbWidget@@@Z @ 8210 NONAME ; void HbFeedbackEngine::advancedGestureActivated(class HbWidget const *) + ?getStaticMetaObject@HbEditorInterfacePrivateCache@@SAABUQMetaObject@@XZ @ 8211 NONAME ; struct QMetaObject const & HbEditorInterfacePrivateCache::getStaticMetaObject(void) + ?destroyed@HbEditorInterfacePrivateCache@@QAEXPAVQObject@@@Z @ 8212 NONAME ; void HbEditorInterfacePrivateCache::destroyed(class QObject *) + ?getStaticMetaObject@HbEditorInterfacePrivate@@SAABUQMetaObject@@XZ @ 8213 NONAME ; struct QMetaObject const & HbEditorInterfacePrivate::getStaticMetaObject(void) + ?setInputMethodHints@HbEditorInterfacePrivate@@QAEXV?$QFlags@W4InputMethodHint@Qt@@@@@Z @ 8214 NONAME ; void HbEditorInterfacePrivate::setInputMethodHints(class QFlags) + ?staticMetaObject@HbEditorInterfacePrivateCache@@2UQMetaObject@@B @ 8215 NONAME ; struct QMetaObject const HbEditorInterfacePrivateCache::staticMetaObject + ?tr@HbEditorInterfacePrivateCache@@SA?AVQString@@PBD0@Z @ 8216 NONAME ; class QString HbEditorInterfacePrivateCache::tr(char const *, char const *) + ?notifyValueChanged@HbEditorInterfacePrivateCache@@QAEXPAVQObject@@@Z @ 8217 NONAME ; void HbEditorInterfacePrivateCache::notifyValueChanged(class QObject *) + ?actionDestroyed@HbEditorInterfacePrivateCache@@QAEXPAVQObject@@@Z @ 8218 NONAME ; void HbEditorInterfacePrivateCache::actionDestroyed(class QObject *) + ??_EHbEditorInterfacePrivateCache@@UAE@I@Z @ 8219 NONAME ; HbEditorInterfacePrivateCache::~HbEditorInterfacePrivateCache(unsigned int) + ?inputMethodHints@HbEditorInterfacePrivate@@QBE?AV?$QFlags@W4InputMethodHint@Qt@@@@XZ @ 8220 NONAME ; class QFlags HbEditorInterfacePrivate::inputMethodHints(void) const + ??1HbEditorInterfacePrivate@@UAE@XZ @ 8221 NONAME ; HbEditorInterfacePrivate::~HbEditorInterfacePrivate(void) + ??1HbEditorInterfacePrivateCache@@EAE@XZ @ 8222 NONAME ; HbEditorInterfacePrivateCache::~HbEditorInterfacePrivateCache(void) + ?qt_metacast@HbEditorInterfacePrivateCache@@UAEPAXPBD@Z @ 8223 NONAME ; void * HbEditorInterfacePrivateCache::qt_metacast(char const *) + ?cursorPositionChanged@HbEditorInterfacePrivate@@QAEXXZ @ 8224 NONAME ; void HbEditorInterfacePrivate::cursorPositionChanged(void) + ?tr@HbEditorInterfacePrivateCache@@SA?AVQString@@PBD0H@Z @ 8225 NONAME ; class QString HbEditorInterfacePrivateCache::tr(char const *, char const *, int) + ?trUtf8@HbEditorInterfacePrivate@@SA?AVQString@@PBD0H@Z @ 8226 NONAME ; class QString HbEditorInterfacePrivate::trUtf8(char const *, char const *, int) + ?tr@HbEditorInterfacePrivate@@SA?AVQString@@PBD0@Z @ 8227 NONAME ; class QString HbEditorInterfacePrivate::tr(char const *, char const *) + ?notifyCursorPositionChange@HbEditorInterfacePrivate@@QAEXHH@Z @ 8228 NONAME ; void HbEditorInterfacePrivate::notifyCursorPositionChange(int, int) + ?tr@HbEditorInterfacePrivate@@SA?AVQString@@PBD0H@Z @ 8229 NONAME ; class QString HbEditorInterfacePrivate::tr(char const *, char const *, int) + ?qt_metacall@HbEditorInterfacePrivate@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 8230 NONAME ; int HbEditorInterfacePrivate::qt_metacall(enum QMetaObject::Call, int, void * *) + ?trUtf8@HbEditorInterfacePrivateCache@@SA?AVQString@@PBD0H@Z @ 8231 NONAME ; class QString HbEditorInterfacePrivateCache::trUtf8(char const *, char const *, int) + ?hasInterface@HbEditorInterfacePrivate@@QBE_NPAVHbEditorInterface@@@Z @ 8232 NONAME ; bool HbEditorInterfacePrivate::hasInterface(class HbEditorInterface *) const + ??_EHbEditorInterfacePrivate@@UAE@I@Z @ 8233 NONAME ; HbEditorInterfacePrivate::~HbEditorInterfacePrivate(unsigned int) + ?interfaceDestroyed@HbEditorInterfacePrivateCache@@QAEXPAVQObject@@@Z @ 8234 NONAME ; void HbEditorInterfacePrivateCache::interfaceDestroyed(class QObject *) + ?trUtf8@HbEditorInterfacePrivateCache@@SA?AVQString@@PBD0@Z @ 8235 NONAME ; class QString HbEditorInterfacePrivateCache::trUtf8(char const *, char const *) + ?metaObject@HbEditorInterfacePrivateCache@@UBEPBUQMetaObject@@XZ @ 8236 NONAME ; struct QMetaObject const * HbEditorInterfacePrivateCache::metaObject(void) const + ?qt_metacast@HbEditorInterfacePrivate@@UAEPAXPBD@Z @ 8237 NONAME ; void * HbEditorInterfacePrivate::qt_metacast(char const *) + ?lock@HbEditorInterfacePrivate@@QAEXXZ @ 8238 NONAME ; void HbEditorInterfacePrivate::lock(void) + ?metaObject@HbEditorInterfacePrivate@@UBEPBUQMetaObject@@XZ @ 8239 NONAME ; struct QMetaObject const * HbEditorInterfacePrivate::metaObject(void) const + ?cursorPositionChanged@HbEditorInterfacePrivate@@IAEXHH@Z @ 8240 NONAME ; void HbEditorInterfacePrivate::cursorPositionChanged(int, int) + ?unlock@HbEditorInterfacePrivate@@QAEXXZ @ 8241 NONAME ; void HbEditorInterfacePrivate::unlock(void) + ?qt_metacall@HbEditorInterfacePrivateCache@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 8242 NONAME ; int HbEditorInterfacePrivateCache::qt_metacall(enum QMetaObject::Call, int, void * *) + ??0HbEditorInterfacePrivateCache@@AAE@XZ @ 8243 NONAME ; HbEditorInterfacePrivateCache::HbEditorInterfacePrivateCache(void) + ?instance@HbEditorInterfacePrivateCache@@SAPAV1@XZ @ 8244 NONAME ; class HbEditorInterfacePrivateCache * HbEditorInterfacePrivateCache::instance(void) + ?isConnected@HbEditorInterfacePrivateCache@@QAE_NPAVQObject@@@Z @ 8245 NONAME ; bool HbEditorInterfacePrivateCache::isConnected(class QObject *) + ?staticMetaObject@HbEditorInterfacePrivate@@2UQMetaObject@@B @ 8246 NONAME ; struct QMetaObject const HbEditorInterfacePrivate::staticMetaObject + ??0HbEditorInterfacePrivate@@QAE@XZ @ 8247 NONAME ; HbEditorInterfacePrivate::HbEditorInterfacePrivate(void) + ?trUtf8@HbEditorInterfacePrivate@@SA?AVQString@@PBD0@Z @ 8248 NONAME ; class QString HbEditorInterfacePrivate::trUtf8(char const *, char const *) + ?attachEditor@HbEditorInterfacePrivateCache@@QAEPAVHbEditorInterfacePrivate@@PAVQObject@@PAVHbEditorInterface@@@Z @ 8249 NONAME ; class HbEditorInterfacePrivate * HbEditorInterfacePrivateCache::attachEditor(class QObject *, class HbEditorInterface *) + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/defs/eabi/HbCoreu.def --- a/src/hbcore/defs/eabi/HbCoreu.def Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/defs/eabi/HbCoreu.def Thu Sep 02 20:44:51 2010 +0300 @@ -1335,33 +1335,33 @@ _ZN19HbInputSettingProxy16staticMetaObjectE @ 1334 NONAME DATA 16 _ZN19HbInputSettingProxy16togglePredictionEv @ 1335 NONAME _ZN19HbInputSettingProxy17keymapPluginPathsEv @ 1336 NONAME - _ZN19HbInputSettingProxy17screenOrientationEv @ 1337 NONAME - _ZN19HbInputSettingProxy18orientationChangedEN2Qt11OrientationE @ 1338 NONAME + _ZN19HbInputSettingProxy17screenOrientationEv @ 1337 NONAME ABSENT + _ZN19HbInputSettingProxy18orientationChangedEN2Qt11OrientationE @ 1338 NONAME ABSENT _ZN19HbInputSettingProxy18setGlobalDigitTypeE16HbInputDigitType @ 1339 NONAME _ZN19HbInputSettingProxy19extraDictionaryPathEv @ 1340 NONAME _ZN19HbInputSettingProxy19getStaticMetaObjectEv @ 1341 NONAME - _ZN19HbInputSettingProxy19setActiveHwKeyboardE6QFlagsI18HbKeyboardTypeFlagE @ 1342 NONAME + _ZN19HbInputSettingProxy19setActiveHwKeyboardE6QFlagsI18HbKeyboardTypeFlagE @ 1342 NONAME ABSENT _ZN19HbInputSettingProxy19setCustomPluginNameERK7QString @ 1343 NONAME ABSENT _ZN19HbInputSettingProxy20languageDatabasePathEv @ 1344 NONAME _ZN19HbInputSettingProxy20setCustomMethodInUseEb @ 1345 NONAME ABSENT - _ZN19HbInputSettingProxy20setScreenOrientationEN2Qt11OrientationE @ 1346 NONAME + _ZN19HbInputSettingProxy20setScreenOrientationEN2Qt11OrientationE @ 1346 NONAME ABSENT _ZN19HbInputSettingProxy20specialCharacterUsedE5QChar @ 1347 NONAME ABSENT _ZN19HbInputSettingProxy21predictionEnginePathsEv @ 1348 NONAME _ZN19HbInputSettingProxy22connectObservingObjectEP7QObject @ 1349 NONAME _ZN19HbInputSettingProxy22inputMethodPluginPathsEv @ 1350 NONAME - _ZN19HbInputSettingProxy22setActiveTouchKeyboardE6QFlagsI18HbKeyboardTypeFlagE @ 1351 NONAME + _ZN19HbInputSettingProxy22setActiveTouchKeyboardE6QFlagsI18HbKeyboardTypeFlagE @ 1351 NONAME ABSENT _ZN19HbInputSettingProxy22setGlobalInputLanguageERK15HbInputLanguage @ 1352 NONAME - _ZN19HbInputSettingProxy23activeHwKeyboardChangedE6QFlagsI18HbKeyboardTypeFlagE @ 1353 NONAME - _ZN19HbInputSettingProxy24orientationAboutToChangeEv @ 1354 NONAME + _ZN19HbInputSettingProxy23activeHwKeyboardChangedE6QFlagsI18HbKeyboardTypeFlagE @ 1353 NONAME ABSENT + _ZN19HbInputSettingProxy24orientationAboutToChangeEv @ 1354 NONAME ABSENT _ZN19HbInputSettingProxy24setPredictiveInputStatusEi @ 1355 NONAME ABSENT _ZN19HbInputSettingProxy25disconnectObservingObjectEP7QObject @ 1356 NONAME _ZN19HbInputSettingProxy25mostUsedSpecialCharactersEiR7QStringP13HbInputFilter @ 1357 NONAME ABSENT - _ZN19HbInputSettingProxy26activeTouchKeyboardChangedE6QFlagsI18HbKeyboardTypeFlagE @ 1358 NONAME + _ZN19HbInputSettingProxy26activeTouchKeyboardChangedE6QFlagsI18HbKeyboardTypeFlagE @ 1358 NONAME ABSENT _ZN19HbInputSettingProxy26globalInputLanguageChangedERK15HbInputLanguage @ 1359 NONAME _ZN19HbInputSettingProxy27predictiveInputStateChangedEi @ 1360 NONAME ABSENT _ZN19HbInputSettingProxy28automaticTextCasingForQwertyEv @ 1361 NONAME _ZN19HbInputSettingProxy28setCharacterPreviewForQwertyEb @ 1362 NONAME - _ZN19HbInputSettingProxy29notifyScreenOrientationChangeEv @ 1363 NONAME + _ZN19HbInputSettingProxy29notifyScreenOrientationChangeEv @ 1363 NONAME ABSENT _ZN19HbInputSettingProxy31setAutomaticTextCasingForQwertyEb @ 1364 NONAME _ZN19HbInputSettingProxy31setGlobalSecondaryInputLanguageERK15HbInputLanguage @ 1365 NONAME _ZN19HbInputSettingProxy34isCharacterPreviewForQwertyEnabledEv @ 1366 NONAME @@ -2439,6 +2439,7 @@ _ZN7HbPopup19getStaticMetaObjectEv @ 2438 NONAME _ZN7HbPopup4execEv @ 2439 NONAME ABSENT _ZN7HbPopup5eventEP6QEvent @ 2440 NONAME + _ZN7HbPopupC1EP13QGraphicsItem @ 2441 NONAME _ZN7HbPopupC1ER14HbPopupPrivateP13QGraphicsItem @ 2442 NONAME _ZN7HbPopupC2EP13QGraphicsItem @ 2443 NONAME @@ -2539,7 +2540,7 @@ _ZN8HbWidget12setAttributeEN2Hb15WidgetAttributeEb @ 2538 NONAME ABSENT _ZN8HbWidget12setAttributeEN2Qt15WidgetAttributeEb @ 2539 NONAME ABSENT _ZN8HbWidget13focusOutEventEP11QFocusEvent @ 2540 NONAME - _ZN8HbWidget15setPluginBaseIdEi @ 2541 NONAME + _ZN8HbWidget15setPluginBaseIdEi @ 2541 NONAME ABSENT _ZN8HbWidget16staticMetaObjectE @ 2542 NONAME DATA 16 _ZN8HbWidget16updatePrimitivesEv @ 2543 NONAME _ZN8HbWidget19getStaticMetaObjectEv @ 2544 NONAME @@ -2812,7 +2813,7 @@ _ZNK12HbToolButton15initStyleOptionEP23HbStyleOptionToolButton @ 2811 NONAME ABSENT _ZNK12HbToolButton15toolButtonStyleEv @ 2812 NONAME ABSENT _ZNK12HbToolButton6actionEv @ 2813 NONAME - _ZNK12HbToolButton9primitiveEN7HbStyle9PrimitiveE @ 2814 NONAME + _ZNK12HbToolButton9primitiveEN7HbStyle9PrimitiveE @ 2814 NONAME ABSENT _ZNK12HbTreeLayout11indentationEv @ 2815 NONAME ABSENT _ZNK12HbTreeLayout17uniformSizedItemsEv @ 2816 NONAME ABSENT _ZNK12HbTreeLayout5countEv @ 2817 NONAME ABSENT @@ -3052,13 +3053,13 @@ _ZNK19HbInputCustomButton8iconFileEv @ 3051 NONAME ABSENT _ZNK19HbInputSettingProxy10metaObjectEv @ 3052 NONAME _ZNK19HbInputSettingProxy15globalDigitTypeEv @ 3053 NONAME - _ZNK19HbInputSettingProxy16activeHwKeyboardEv @ 3054 NONAME + _ZNK19HbInputSettingProxy16activeHwKeyboardEv @ 3054 NONAME ABSENT _ZNK19HbInputSettingProxy17customMethodInUseEv @ 3055 NONAME ABSENT - _ZNK19HbInputSettingProxy19activeTouchKeyboardEv @ 3056 NONAME + _ZNK19HbInputSettingProxy19activeTouchKeyboardEv @ 3056 NONAME ABSENT _ZNK19HbInputSettingProxy19availableHwKeyboardER5QListI6QFlagsI18HbKeyboardTypeFlagEE @ 3057 NONAME _ZNK19HbInputSettingProxy19globalInputLanguageEv @ 3058 NONAME _ZNK19HbInputSettingProxy21predictiveInputStatusEv @ 3059 NONAME ABSENT - _ZNK19HbInputSettingProxy26orientationChangeCompletedEv @ 3060 NONAME + _ZNK19HbInputSettingProxy26orientationChangeCompletedEv @ 3060 NONAME ABSENT _ZNK19HbInputSettingProxy28globalSecondaryInputLanguageEv @ 3061 NONAME _ZNK19HbInteractionPlugin10metaObjectEv @ 3062 NONAME ABSENT _ZNK19HbInteractionPlugin11featureNameEv @ 3063 NONAME ABSENT @@ -3270,8 +3271,8 @@ _ZNK7HbPopup13primaryActionEv @ 3269 NONAME ABSENT _ZNK7HbPopup15secondaryActionEv @ 3270 NONAME ABSENT _ZNK7HbStyle10metaObjectEv @ 3271 NONAME - _ZNK7HbStyle15createPrimitiveENS_9PrimitiveEP13QGraphicsItem @ 3272 NONAME - _ZNK7HbStyle15updatePrimitiveEP13QGraphicsItemNS_9PrimitiveEPK12QStyleOption @ 3273 NONAME + _ZNK7HbStyle15createPrimitiveENS_9PrimitiveEP13QGraphicsItem @ 3272 NONAME ABSENT + _ZNK7HbStyle15updatePrimitiveEP13QGraphicsItemNS_9PrimitiveEPK12QStyleOption @ 3273 NONAME ABSENT _ZNK7HbTheme10metaObjectEv @ 3274 NONAME _ZNK7HbTheme11descriptionEv @ 3275 NONAME _ZNK7HbTheme4nameEv @ 3276 NONAME @@ -3298,7 +3299,7 @@ _ZNK8HbStringneERKS_ @ 3297 NONAME _ZNK8HbWidget10mainWindowEv @ 3298 NONAME _ZNK8HbWidget10metaObjectEv @ 3299 NONAME - _ZNK8HbWidget12pluginBaseIdEv @ 3300 NONAME + _ZNK8HbWidget12pluginBaseIdEv @ 3300 NONAME ABSENT _ZNK8HbWidget13testAttributeEN2Hb15WidgetAttributeE @ 3301 NONAME ABSENT _ZNK8HbWidget13testAttributeEN2Qt15WidgetAttributeE @ 3302 NONAME ABSENT _ZNK8HbWidget15initStyleOptionEP13HbStyleOption @ 3303 NONAME ABSENT @@ -4016,7 +4017,7 @@ _ZN18HbPredictionEngine14disableFeatureE6QFlagsI28HbInputPredictionFeatureFlagE @ 4015 NONAME _ZN18HbPredictionEngine16isFeatureEnabledE6QFlagsI28HbInputPredictionFeatureFlagE @ 4016 NONAME _ZN19HbFocusObjectWidget19setInputMethodHintsE6QFlagsIN2Qt15InputMethodHintEE @ 4017 NONAME ABSENT - _ZN19HbInputSettingProxy21initializeOrientationEN2Qt11OrientationE @ 4018 NONAME + _ZN19HbInputSettingProxy21initializeOrientationEN2Qt11OrientationE @ 4018 NONAME ABSENT _ZN19HbScrollAreaPrivate16_q_groovePressedEfN2Qt11OrientationE @ 4019 NONAME _ZN19HbScrollAreaPrivate16createPrimitivesEv @ 4020 NONAME _ZN19HbScrollAreaPrivate16updateIndicatorsE7QPointF @ 4021 NONAME ABSENT @@ -4540,7 +4541,7 @@ _ZN18HbSystemDeviceInfoD1Ev @ 4539 NONAME ABSENT _ZN18HbSystemDeviceInfoD2Ev @ 4540 NONAME ABSENT _ZN19HbInputSettingProxy17setActiveKeyboardE6QFlagsI18HbKeyboardTypeFlagE @ 4541 NONAME - _ZN19HbInputSettingProxy21activeKeyboardChangedE6QFlagsI18HbKeyboardTypeFlagE @ 4542 NONAME + _ZN19HbInputSettingProxy21activeKeyboardChangedE6QFlagsI18HbKeyboardTypeFlagE @ 4542 NONAME ABSENT _ZN19HbScrollAreaPrivate14startAnimatingEv @ 4543 NONAME _ZN19HbSystemNetworkInfo11qt_metacallEN11QMetaObject4CallEiPPv @ 4544 NONAME ABSENT _ZN19HbSystemNetworkInfo11qt_metacastEPKc @ 4545 NONAME ABSENT @@ -4703,7 +4704,7 @@ _ZNK18HbSystemDeviceInfo4imsiEv @ 4702 NONAME ABSENT _ZNK18HbSystemDeviceInfo5modelEv @ 4703 NONAME ABSENT _ZNK18HbSystemDeviceInfo9simStatusEv @ 4704 NONAME ABSENT - _ZNK19HbInputSettingProxy14activeKeyboardEv @ 4705 NONAME + _ZNK19HbInputSettingProxy14activeKeyboardEv @ 4705 NONAME ABSENT _ZNK19HbSystemNetworkInfo10macAddressENS_11NetworkModeE @ 4706 NONAME ABSENT _ZNK19HbSystemNetworkInfo10metaObjectEv @ 4707 NONAME ABSENT _ZNK19HbSystemNetworkInfo11networkNameENS_11NetworkModeE @ 4708 NONAME ABSENT @@ -4806,7 +4807,7 @@ _ZN10HbTextItem15setMinimumLinesEi @ 4805 NONAME _ZN10HbTitleBar16sceneEventFilterEP13QGraphicsItemP6QEvent @ 4806 NONAME _ZN10HbTitleBar6polishER17HbStyleParameters @ 4807 NONAME - _ZN12HbIconLoader8loadIconERK7QStringNS_12IconDataTypeENS_7PurposeERK6QSizeFN2Qt15AspectRatioModeEN5QIcon4ModeE6QFlagsINS_16IconLoaderOptionEEP14HbIconAnimatorRK6QColor @ 4808 NONAME + _ZN12HbIconLoader8loadIconERK7QStringNS_12IconDataTypeENS_7PurposeERK6QSizeFN2Qt15AspectRatioModeEN5QIcon4ModeE6QFlagsINS_16IconLoaderOptionEEP14HbIconAnimatorRK6QColor @ 4808 NONAME ABSENT _ZN12HbIconLoader8loadIconERK7QStringNS_7PurposeERK6QSizeFN2Qt15AspectRatioModeEN5QIcon4ModeE6QFlagsINS_16IconLoaderOptionEEP14HbIconAnimatorRK6QColor @ 4809 NONAME _ZN13HbInputMethod20activateCustomMethodERK23HbInputMethodDescriptor @ 4810 NONAME ABSENT _ZN13HbInputMethod22listCustomInputMethodsEv @ 4811 NONAME @@ -4870,7 +4871,7 @@ _ZN19HbForegroundWatcher8instanceEv @ 4869 NONAME _ZN19HbForegroundWatcherC1EP7QObject @ 4870 NONAME _ZN19HbForegroundWatcherC2EP7QObject @ 4871 NONAME - _ZN19HbInputSettingProxy26setActiveCustomInputMethodERK23HbInputMethodDescriptor @ 4872 NONAME + _ZN19HbInputSettingProxy26setActiveCustomInputMethodERK23HbInputMethodDescriptor @ 4872 NONAME ABSENT _ZN19HbScrollAreaPrivate18setContentPositionEfN2Qt11OrientationEb @ 4873 NONAME _ZN19HbWidgetStyleLoader11addFilePathERK7QStringN20HbLayeredStyleLoader7ConcernENS3_13LayerPriorityE @ 4874 NONAME _ZN19HbWidgetStyleLoader12doAddFileSetERK7QStringNS_11FileSetTypeEN20HbLayeredStyleLoader7ConcernENS4_13LayerPriorityE @ 4875 NONAME ABSENT @@ -4958,14 +4959,14 @@ _ZNK16HbInputModeCache18listInputLanguagesEv @ 4957 NONAME _ZNK17HbEditorInterface11smileyThemeEv @ 4958 NONAME _ZNK19HbForegroundWatcher10metaObjectEv @ 4959 NONAME - _ZNK19HbInputSettingProxy23activeCustomInputMethodEv @ 4960 NONAME + _ZNK19HbInputSettingProxy23activeCustomInputMethodEv @ 4960 NONAME ABSENT _ZNK20HbInputMethodPrivate12editorFilterEv @ 4961 NONAME _ZNK20HbInputMethodPrivate14activeKeyboardEv @ 4962 NONAME _ZNK20HbInputMethodPrivate14activeLanguageEv @ 4963 NONAME _ZNK20HbInputMethodPrivate15editorRootStateER12HbInputState @ 4964 NONAME _ZNK20HbInputMethodPrivate15initialTextCaseE6QFlagsI19HbInputModeTypeFlagE @ 4965 NONAME _ZNK20HbInputMethodPrivate15textCaseAppliesEv @ 4966 NONAME - _ZNK20HbInputMethodPrivate16defaultInputModeERK15HbInputLanguage @ 4967 NONAME + _ZNK20HbInputMethodPrivate16defaultInputModeERK15HbInputLanguage @ 4967 NONAME ABSENT _ZNK20HbInputMethodPrivate16initialInputModeERK15HbInputLanguage @ 4968 NONAME _ZNK20HbInputMethodPrivate17editorConstraintsEv @ 4969 NONAME _ZNK20HbInputMethodPrivate17findStateLanguageEv @ 4970 NONAME @@ -5303,9 +5304,9 @@ _ZN12HbIconSource11svgRendererEv @ 5302 NONAME _ZN12HbIconSource16clearImageReaderEv @ 5303 NONAME ABSENT _ZN12HbIconSource16clearSvgRendererEv @ 5304 NONAME ABSENT - _ZN12HbIconSource24deletePixmapIfLargerThanEi @ 5305 NONAME + _ZN12HbIconSource24deletePixmapIfLargerThanEi @ 5305 NONAME ABSENT _ZN12HbIconSource4typeEv @ 5306 NONAME - _ZN12HbIconSource6pixmapEv @ 5307 NONAME + _ZN12HbIconSource6pixmapEv @ 5307 NONAME ABSENT _ZN12HbIconSource7pictureEv @ 5308 NONAME _ZN12HbIconSourceC1ERK7QString @ 5309 NONAME _ZN12HbIconSourceC1ERK7QStringS2_ @ 5310 NONAME @@ -6372,7 +6373,7 @@ _ZN11HbIndicator13userActivatedERK7QStringRK4QMapIS0_8QVariantE @ 6371 NONAME _ZN11HbStatusBar19delayedConstructionEv @ 6372 NONAME _ZN11HbTouchArea12gestureEventEP13QGestureEvent @ 6373 NONAME - _ZN12HbIconLoader10unLoadIconEP10HbIconImplb @ 6374 NONAME + _ZN12HbIconLoader10unLoadIconEP10HbIconImplb @ 6374 NONAME ABSENT _ZN12HbIconLoader15freeGpuIconDataEv @ 6375 NONAME _ZN12HbIconLoader17removeItemInCacheEP10HbIconImpl @ 6376 NONAME _ZN12HbIconLoader19storeIconEngineInfoEP12HbIconEngine @ 6377 NONAME @@ -6718,7 +6719,7 @@ _ZN12HbMainWindow17aboutToChangeViewEP6HbViewS1_ @ 6717 NONAME _ZN12HbTlvWrapper17getTlvEncodedDataERK7QStringRK6QSizeFN2Qt15AspectRatioModeE @ 6718 NONAME ABSENT _ZN12HbTlvWrapper24getTlvEncodedDataFromDomERKjR6QSizeFN2Qt15AspectRatioModeE @ 6719 NONAME ABSENT - _ZN12HbToolButton15initStyleOptionEP23HbStyleOptionToolButton @ 6720 NONAME + _ZN12HbToolButton15initStyleOptionEP23HbStyleOptionToolButton @ 6720 NONAME ABSENT _ZN13HbXmlVariableC1Ev @ 6721 NONAME _ZN13HbXmlVariableC2Ev @ 6722 NONAME _ZN13HbXmlVariableD1Ev @ 6723 NONAME @@ -8015,18 +8016,18 @@ _ZN12HbIconLoader26getMultiIconImplFromServerER11QStringListR7QVectorI6QSizeFEN2Qt15AspectRatioModeEN5QIcon4ModeEbb6QFlagsINS_16IconLoaderOptionEERK6QColorNS_12IconDataTypeENS_7PurposeERS2_IP10HbIconImplE15HbRenderingMode @ 8014 NONAME _ZN13HbNvgIconImplC1ERK16HbSharedIconInfoRK7QStringRK6QSizeFN2Qt15AspectRatioModeEN5QIcon4ModeEb15HbRenderingMode @ 8015 NONAME _ZN13HbNvgIconImplC2ERK16HbSharedIconInfoRK7QStringRK6QSizeFN2Qt15AspectRatioModeEN5QIcon4ModeEb15HbRenderingMode @ 8016 NONAME - _ZN13HbThemeClient10unloadIconERK7QStringRK6QSizeFN2Qt15AspectRatioModeEN5QIcon4ModeEbRK6QColor15HbRenderingMode @ 8017 NONAME + _ZN13HbThemeClient10unloadIconERK7QStringRK6QSizeFN2Qt15AspectRatioModeEN5QIcon4ModeEbRK6QColor15HbRenderingMode @ 8017 NONAME ABSENT _ZN13HbThemeClient15unLoadMultiIconERK11QStringListRK7QVectorI6QSizeFEN2Qt15AspectRatioModeEN5QIcon4ModeEbRK6QColor15HbRenderingMode @ 8018 NONAME _ZN13HbThemeClient16getMultiIconInfoERK11QStringListRK7QVectorI6QSizeFEN2Qt15AspectRatioModeEN5QIcon4ModeEb6QFlagsIN12HbIconLoader16IconLoaderOptionEERK6QColor15HbRenderingMode @ 8019 NONAME - _ZN13HbThemeClient17getSharedIconInfoERK7QStringRK6QSizeFN2Qt15AspectRatioModeEN5QIcon4ModeEb6QFlagsIN12HbIconLoader16IconLoaderOptionEERK6QColor15HbRenderingMode @ 8020 NONAME + _ZN13HbThemeClient17getSharedIconInfoERK7QStringRK6QSizeFN2Qt15AspectRatioModeEN5QIcon4ModeEb6QFlagsIN12HbIconLoader16IconLoaderOptionEERK6QColor15HbRenderingMode @ 8020 NONAME ABSENT _ZN13HbThemeClient19switchRenderingModeE15HbRenderingMode @ 8021 NONAME _ZN13HbThemeClient20getMultiPartIconInfoERK11QStringListRK19HbMultiPartSizeDataRK6QSizeFN2Qt15AspectRatioModeEN5QIcon4ModeEb6QFlagsIN12HbIconLoader16IconLoaderOptionEERK6QColor15HbRenderingMode @ 8022 NONAME _ZN16HbPixmapIconImplC1E16HbSharedIconInfoR7QStringRK6QSizeFN2Qt15AspectRatioModeEN5QIcon4ModeEb15HbRenderingMode @ 8023 NONAME _ZN16HbPixmapIconImplC2E16HbSharedIconInfoR7QStringRK6QSizeFN2Qt15AspectRatioModeEN5QIcon4ModeEb15HbRenderingMode @ 8024 NONAME - _ZN20HbThemeClientPrivate10unloadIconERK7QStringRK6QSizeFN2Qt15AspectRatioModeEN5QIcon4ModeEbRK6QColor15HbRenderingMode @ 8025 NONAME + _ZN20HbThemeClientPrivate10unloadIconERK7QStringRK6QSizeFN2Qt15AspectRatioModeEN5QIcon4ModeEbRK6QColor15HbRenderingMode @ 8025 NONAME ABSENT _ZN20HbThemeClientPrivate15unLoadMultiIconERK11QStringListRK7QVectorI6QSizeFEN2Qt15AspectRatioModeEN5QIcon4ModeEbRK6QColor15HbRenderingMode @ 8026 NONAME _ZN20HbThemeClientPrivate16getMultiIconInfoERK11QStringListRK7QVectorI6QSizeFEN2Qt15AspectRatioModeEN5QIcon4ModeEb6QFlagsIN12HbIconLoader16IconLoaderOptionEERK6QColor15HbRenderingMode @ 8027 NONAME - _ZN20HbThemeClientPrivate17getSharedIconInfoERK7QStringRK6QSizeFN2Qt15AspectRatioModeEN5QIcon4ModeEb6QFlagsIN12HbIconLoader16IconLoaderOptionEERK6QColor15HbRenderingMode @ 8028 NONAME + _ZN20HbThemeClientPrivate17getSharedIconInfoERK7QStringRK6QSizeFN2Qt15AspectRatioModeEN5QIcon4ModeEb6QFlagsIN12HbIconLoader16IconLoaderOptionEERK6QColor15HbRenderingMode @ 8028 NONAME ABSENT _ZN20HbThemeClientPrivate19switchRenderingModeE15HbRenderingMode @ 8029 NONAME _ZN20HbThemeClientPrivate20getMultiPartIconInfoERK11QStringListRK19HbMultiPartSizeDataRK6QSizeFN2Qt15AspectRatioModeEN5QIcon4ModeEb6QFlagsIN12HbIconLoader16IconLoaderOptionEERK6QColor15HbRenderingMode @ 8030 NONAME _ZN12HbThemeIndex11getItemDataERK7QString @ 8031 NONAME @@ -8126,7 +8127,7 @@ _ZNK16HbInputModeCache10descriptorEPK13HbInputMethod @ 8125 NONAME _ZNK16HbInputModeCache12acceptsStateEPK13HbInputMethodRK12HbInputState @ 8126 NONAME _ZNK19HbInputSettingProxy20preferredInputMethodEN2Qt11OrientationE @ 8127 NONAME - _ZNK19HbInputSettingProxy20preferredInputMethodEv @ 8128 NONAME + _ZNK19HbInputSettingProxy20preferredInputMethodEv @ 8128 NONAME ABSENT _ZNK19HbInputSettingProxy30preferredInputMethodCustomDataEN2Qt11OrientationE @ 8129 NONAME _ZN19HbInputSettingProxy23setPreferredInputMethodEN2Qt11OrientationERK23HbInputMethodDescriptorRK10QByteArray @ 8130 NONAME _ZTI18HbShrinkingVkbHost @ 8131 NONAME @@ -8516,8 +8517,8 @@ _ZN20HbThemeClientPrivate19getSharedStyleSheetERK7QStringN20HbLayeredStyleLoader13LayerPriorityERb @ 8515 NONAME _ZN20HbThemeClientPrivate20getSharedMissedHbCssEv @ 8516 NONAME _ZN12HbWidgetBase14updateGeometryEv @ 8517 NONAME - _ZN19HbWidgetBasePrivate20activateParentLayoutEv @ 8518 NONAME - _ZN19HbWidgetBasePrivate20ignoreGeometryUpdateEv @ 8519 NONAME + _ZN19HbWidgetBasePrivate20activateParentLayoutEv @ 8518 NONAME ABSENT + _ZN19HbWidgetBasePrivate20ignoreGeometryUpdateEv @ 8519 NONAME ABSENT _ZThn16_N12HbWidgetBase14updateGeometryEv @ 8520 NONAME _ZN10HbTextItem14updateGeometryEv @ 8521 NONAME _ZThn16_N10HbTextItem14updateGeometryEv @ 8522 NONAME @@ -8544,5 +8545,105 @@ _ZNK22HbKeymapFactoryPrivate7isValidEPK8HbKeymap @ 8543 NONAME _ZN14HbIconAnimator12setLoopCountEi @ 8544 NONAME _ZN7HbPopup6polishER17HbStyleParameters @ 8545 NONAME - _ZN14HbPopupPrivate11resizePopupEv @ 8546 NONAME + _ZN14HbPopupPrivate11resizePopupEv @ 8546 NONAME ABSENT + _ZN19HbInputSettingProxy27chineseDefaultKeypadChangedEb @ 8547 NONAME + _ZN19HbInputSettingProxy33setWesternDefaultKeypadForChineseEb @ 8548 NONAME + _ZNK19HbInputSettingProxy33useWesternDefaultKeypadForChineseEv @ 8549 NONAME + _ZN12HbToolButton17initPrimitiveDataEP20HbStylePrimitiveDataPK15QGraphicsObject @ 8550 NONAME + _ZN12HbWidgetBase17initPrimitiveDataEP20HbStylePrimitiveDataPK15QGraphicsObject @ 8551 NONAME + _ZN16HbAbstractButton17initPrimitiveDataEP20HbStylePrimitiveDataPK15QGraphicsObject @ 8552 NONAME + _ZN20HbStylePrimitiveDataC1Eii @ 8553 NONAME + _ZN20HbStylePrimitiveDataC2Eii @ 8554 NONAME + _ZN24HbStyleIconPrimitiveDataC1Ev @ 8555 NONAME + _ZN24HbStyleIconPrimitiveDataC2Ev @ 8556 NONAME + _ZN24HbStyleTextPrimitiveDataC1Ev @ 8557 NONAME + _ZN24HbStyleTextPrimitiveDataC2Ev @ 8558 NONAME + _ZN25HbStyleFramePrimitiveDataC1Ev @ 8559 NONAME + _ZN25HbStyleFramePrimitiveDataC2Ev @ 8560 NONAME + _ZN27HbStyleMarqueePrimitiveDataC1Ev @ 8561 NONAME + _ZN27HbStyleMarqueePrimitiveDataC2Ev @ 8562 NONAME + _ZN28HbStyleRichTextPrimitiveDataC1Ev @ 8563 NONAME + _ZN28HbStyleRichTextPrimitiveDataC2Ev @ 8564 NONAME + _ZN29HbStyleTouchAreaPrimitiveDataC1Ev @ 8565 NONAME + _ZN29HbStyleTouchAreaPrimitiveDataC2Ev @ 8566 NONAME + _ZNK7HbStyle15createPrimitiveENS_13PrimitiveTypeERK7QStringP15QGraphicsObject @ 8567 NONAME + _ZNK7HbStyle15updatePrimitiveEP15QGraphicsObjectPK20HbStylePrimitiveDataS1_ @ 8568 NONAME + _ZN10HbIconItem8setAsyncEb @ 8569 NONAME + _ZN12HbIconLoader10unLoadIconEP10HbIconImplbb @ 8570 NONAME + _ZN12HbIconLoader11finishLocalER19HbIconLoadingParams @ 8571 NONAME + _ZN12HbIconLoader13asyncCallbackERK16HbSharedIconInfoPv @ 8572 NONAME + _ZN12HbIconLoader13lookupInCacheERK19HbIconLoadingParamsP10QByteArray @ 8573 NONAME + _ZN12HbIconLoader14cancelLoadIconEPFvP10HbIconImplPvbES2_ @ 8574 NONAME + _ZN12HbIconLoader14loadLocalAsyncERK19HbIconLoadingParamsRK7QStringPFvP10HbIconImplPvbES8_ @ 8575 NONAME + _ZN12HbIconLoader14localLoadReadyERK19HbIconLoadingParamsPv @ 8576 NONAME + _ZN12HbIconLoader22getIconFromServerAsyncER19HbIconLoadingParamsPFvP10HbIconImplPvbES4_ @ 8577 NONAME + _ZN12HbIconLoader23finishGetIconFromServerER16HbSharedIconInfoR19HbIconLoadingParams @ 8578 NONAME + _ZN12HbIconLoader8loadIconERK7QStringNS_12IconDataTypeENS_7PurposeERK6QSizeFN2Qt15AspectRatioModeEN5QIcon4ModeE6QFlagsINS_16IconLoaderOptionEEP14HbIconAnimatorRK6QColorPFvP10HbIconImplPvbESM_ @ 8579 NONAME + _ZN12HbIconLoader9cacheIconERK19HbIconLoadingParamsP10HbIconImplP10QByteArray @ 8580 NONAME + _ZN12HbIconLoader9loadLocalER19HbIconLoadingParamsRK7QString @ 8581 NONAME + _ZN12HbIconSource23deleteImageIfLargerThanEi @ 8582 NONAME + _ZN12HbIconSource5imageEv @ 8583 NONAME + _ZN13HbThemeClient17getSharedIconInfoERK7QStringRK6QSizeFN2Qt15AspectRatioModeEN5QIcon4ModeEb6QFlagsIN12HbIconLoader16IconLoaderOptionEERK6QColor15HbRenderingModePFbRK16HbSharedIconInfoPvESL_ @ 8584 NONAME ABSENT + _ZN13HbThemeClient23cancelGetSharedIconInfoEPFbRK16HbSharedIconInfoPvES3_ @ 8585 NONAME + _ZN20HbThemeClientPrivate17getSharedIconInfoERK7QStringRK6QSizeFN2Qt15AspectRatioModeEN5QIcon4ModeEb6QFlagsIN12HbIconLoader16IconLoaderOptionEERK6QColor15HbRenderingModePFbRK16HbSharedIconInfoPvESL_ @ 8586 NONAME ABSENT + _ZN20HbThemeClientPrivate18scheduleQueueCheckEv @ 8587 NONAME + _ZN20HbThemeClientPrivate23cancelGetSharedIconInfoEPFbRK16HbSharedIconInfoPvES3_ @ 8588 NONAME + _ZNK10HbIconItem5asyncEv @ 8589 NONAME + _ZN17HbIconItemPrivate14setThemedColorERK6QColor @ 8590 NONAME + _ZN17HbIconItemPrivate14updateIconItemEv @ 8591 NONAME + _ZN17HbIconItemPrivate15outlinesEnabledE @ 8592 NONAME DATA 1 + _ZN17HbIconItemPrivate16updateIconParamsEv @ 8593 NONAME + _ZN17HbIconItemPrivate22clearStoredIconContentEv @ 8594 NONAME + _ZN17HbIconItemPrivate22setAsyncCallbackFilterEPFbP10HbIconItemPvES2_ @ 8595 NONAME + _ZN17HbIconItemPrivateC1ERK6HbIcon @ 8596 NONAME + _ZN17HbIconItemPrivateC2ERK6HbIcon @ 8597 NONAME + _ZN17HbIconItemPrivateD0Ev @ 8598 NONAME + _ZN17HbIconItemPrivateD1Ev @ 8599 NONAME + _ZN17HbIconItemPrivateD2Ev @ 8600 NONAME + _ZNK17HbIconItemPrivate23recalculateBoundingRectEv @ 8601 NONAME + _ZTI17HbIconItemPrivate @ 8602 NONAME + _ZTV17HbIconItemPrivate @ 8603 NONAME + _ZN13HbThemeClient10unloadIconERKNS_11IconReqInfoE @ 8604 NONAME + _ZN13HbThemeClient15batchUnloadIconERK7QVectorINS_11IconReqInfoEE @ 8605 NONAME + _ZN13HbThemeClient17getSharedIconInfoERKNS_11IconReqInfoE @ 8606 NONAME + _ZN13HbThemeClient17getSharedIconInfoERKNS_11IconReqInfoEPFbRK16HbSharedIconInfoPvES6_ @ 8607 NONAME + _ZN20HbThemeClientPrivate10unloadIconERKN13HbThemeClient11IconReqInfoE @ 8608 NONAME + _ZN20HbThemeClientPrivate15batchUnloadIconERK7QVectorIN13HbThemeClient11IconReqInfoEE @ 8609 NONAME + _ZN20HbThemeClientPrivate17getSharedIconInfoERKN13HbThemeClient11IconReqInfoE @ 8610 NONAME + _ZN20HbThemeClientPrivate17getSharedIconInfoERKN13HbThemeClient11IconReqInfoEPFbRK16HbSharedIconInfoPvES7_ @ 8611 NONAME + _ZN16HbFeedbackEngine24advancedGestureActivatedEPK8HbWidget @ 8612 NONAME + _ZN24HbEditorInterfacePrivate11qt_metacallEN11QMetaObject4CallEiPPv @ 8613 NONAME + _ZN24HbEditorInterfacePrivate11qt_metacastEPKc @ 8614 NONAME + _ZN24HbEditorInterfacePrivate16staticMetaObjectE @ 8615 NONAME DATA 16 + _ZN24HbEditorInterfacePrivate19getStaticMetaObjectEv @ 8616 NONAME + _ZN24HbEditorInterfacePrivate19setInputMethodHintsE6QFlagsIN2Qt15InputMethodHintEE @ 8617 NONAME + _ZN24HbEditorInterfacePrivate21cursorPositionChangedEii @ 8618 NONAME + _ZN24HbEditorInterfacePrivate21cursorPositionChangedEv @ 8619 NONAME + _ZN24HbEditorInterfacePrivate26notifyCursorPositionChangeEii @ 8620 NONAME + _ZN24HbEditorInterfacePrivate4lockEv @ 8621 NONAME + _ZN24HbEditorInterfacePrivate6unlockEv @ 8622 NONAME + _ZN29HbEditorInterfacePrivateCache11isConnectedEP7QObject @ 8623 NONAME + _ZN29HbEditorInterfacePrivateCache11qt_metacallEN11QMetaObject4CallEiPPv @ 8624 NONAME + _ZN29HbEditorInterfacePrivateCache11qt_metacastEPKc @ 8625 NONAME + _ZN29HbEditorInterfacePrivateCache12attachEditorEP7QObjectP17HbEditorInterface @ 8626 NONAME + _ZN29HbEditorInterfacePrivateCache15actionDestroyedEP7QObject @ 8627 NONAME + _ZN29HbEditorInterfacePrivateCache16staticMetaObjectE @ 8628 NONAME DATA 16 + _ZN29HbEditorInterfacePrivateCache18interfaceDestroyedEP7QObject @ 8629 NONAME + _ZN29HbEditorInterfacePrivateCache18notifyValueChangedEP7QObject @ 8630 NONAME + _ZN29HbEditorInterfacePrivateCache19getStaticMetaObjectEv @ 8631 NONAME + _ZN29HbEditorInterfacePrivateCache8instanceEv @ 8632 NONAME + _ZN29HbEditorInterfacePrivateCache9destroyedEP7QObject @ 8633 NONAME + _ZN29HbEditorInterfacePrivateCacheC1Ev @ 8634 NONAME + _ZN29HbEditorInterfacePrivateCacheC2Ev @ 8635 NONAME + _ZN29HbEditorInterfacePrivateCacheD0Ev @ 8636 NONAME + _ZN29HbEditorInterfacePrivateCacheD1Ev @ 8637 NONAME + _ZN29HbEditorInterfacePrivateCacheD2Ev @ 8638 NONAME + _ZNK24HbEditorInterfacePrivate10metaObjectEv @ 8639 NONAME + _ZNK24HbEditorInterfacePrivate12hasInterfaceEP17HbEditorInterface @ 8640 NONAME + _ZNK24HbEditorInterfacePrivate16inputMethodHintsEv @ 8641 NONAME + _ZNK29HbEditorInterfacePrivateCache10metaObjectEv @ 8642 NONAME + _ZTI24HbEditorInterfacePrivate @ 8643 NONAME + _ZTI29HbEditorInterfacePrivateCache @ 8644 NONAME + _ZTV24HbEditorInterfacePrivate @ 8645 NONAME + _ZTV29HbEditorInterfacePrivateCache @ 8646 NONAME diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p.cpp --- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -40,7 +40,6 @@ #include #include #include - #if defined(Q_OS_SYMBIAN) #include #include @@ -112,18 +111,18 @@ } bool RegionUpdateFilter::eventFilter(QObject* obj, QEvent *event) - { - if (event->type() == QEvent::QEvent::GraphicsSceneResize) { - HbPopup *popup = qobject_cast(obj); - if (popup) { - QRectF rect = popup->rect(); - rect.moveTo(popup->pos()); - HbDeviceDialogsContainer::Dialog & dialog = mDeviceDialogManger->mDialogs.find(popup); - mDeviceDialogManger->addRegionRect(dialog.id(), rect); - } - } - return false; - } + { + if (event->type() == QEvent::QEvent::GraphicsSceneResize) { + HbPopup *popup = qobject_cast(obj); + if (popup) { + QRectF rect = popup->rect(); + rect.moveTo(popup->pos()); + HbDeviceDialogsContainer::Dialog & dialog = mDeviceDialogManger->mDialogs.find(popup); + mDeviceDialogManger->addRegionRect(dialog.id(), rect); + } + } + return false; + } #endif /*! @@ -143,6 +142,7 @@ ,mMousePressCatcher(this) ,mRegionUpdateFilter(this) ,mWindowRegion() + ,mWgOrdinalPriority(ECoeWinPriorityNormal) #endif { TRACE_ENTRY @@ -155,13 +155,13 @@ connect(mIndicatorPluginManager, SIGNAL( indicatorUpdated(const IndicatorClientInfo) ), this, SLOT(indicatorUpdated(const IndicatorClientInfo))); connect(mIndicatorPluginManager, SIGNAL(indicatorUserActivated(QVariantMap)), - q, SIGNAL(indicatorUserActivated(QVariantMap))); + q, SIGNAL(indicatorUserActivated(QVariantMap))); // Server publishes it's status. Applications use it to delay showing of notification // dialogs when server is showing. mServerStatus.setStatus(HbDeviceDialogServerStatus::NoFlags); qApp->installEventFilter(this); init(); -#if defined(Q_OS_SYMBIAN) +#if defined(Q_OS_SYMBIAN) _LIT_SECURITY_POLICY_PASS(KRdPolicy); // all pass _LIT_SECURITY_POLICY_S0(KWrPolicy, KHbPsForegroundAppOrientationCategoryUid.iUid); // pass device dialog server @@ -264,14 +264,18 @@ } id = dialog.id(); - if (info.group == HbDeviceDialogPlugin::DeviceNotificationDialogGroup) { + // Set popup priority + HbDeviceDialogsContainer::Dialog::Flags flags = dialog.flags(); + setDialogPriority(popup, flags); + + if (flags & HbDeviceDialogsContainer::Dialog::NotificationGroup) { // Disable HbNotificationDialog sequential show feature. Server takes care of // showing sequentially. popup->setProperty("sequentialShow", false); } showDialogs(); - + controlForeground(); updateStatus(); TRACE_EXIT @@ -379,30 +383,68 @@ } #if defined(Q_OS_SYMBIAN) -// Move application to fore/background -void HbDeviceDialogManagerPrivate::moveToForeground(bool foreground) -{ - TRACE_ENTRY_ARGS(foreground) - - if (foreground) { - if(!mMainWindow->isVisible() || !mMainWindow->isActiveWindow()) { - mMainWindow->showFullScreen(); - doMoveToForeground(foreground, ECoeWinPriorityAlwaysAtFront); - } - } else { - if(mMainWindow->isVisible()) { - mMainWindow->hide(); - doMoveToForeground(foreground, ECoeWinPriorityNormal); - } - } - TRACE_EXIT -} void HbDeviceDialogManagerPrivate::doMoveToForeground(bool foreground, int priority) { - const int positionForeground = foreground ? 0 : -1; + if (priority == ECoeWinPriorityNormal) { + if (mMainWindow->isVisible()) { + mMainWindow->hide(); + } + } else { + if (!mMainWindow->isVisible() || !mMainWindow->isActiveWindow()) { + mMainWindow->showFullScreen(); + } + } + const int position = foreground ? 0 : -1; RWindowGroup &rootWindowGroup = CCoeEnv::Static()->RootWin(); - rootWindowGroup.SetOrdinalPosition(positionForeground, priority); + rootWindowGroup.SetOrdinalPosition(position, priority); + mWgOrdinalPriority = priority; +} + +// Move application fore/background and adjust window group priorities +void HbDeviceDialogManagerPrivate::controlForeground(ForegroundControl control) +{ + const HbDeviceDialogsContainer::Dialog::Flags showing( + HbDeviceDialogsContainer::Dialog::Showing); + const HbDeviceDialogsContainer::Dialog start; + + int numShowing = 0; + int numSecurity = 0; + int numCritical = 0; + + // Loop over showing dialogs + const HbDeviceDialogsContainer::Dialog *current = &mDialogs.next(start, showing, showing); + while(current->isValid()) { + HbDeviceDialogsContainer::Dialog::Flags flags = current->flags(); + numShowing++; + numSecurity += (flags & HbDeviceDialogsContainer::Dialog::SecurityLevel) ? 1 : 0; + numCritical += (flags & HbDeviceDialogsContainer::Dialog::CriticalLevel) ? 1 : 0; + current = &mDialogs.next(*current, showing, showing); + } + + const int wgBackground = ECoeWinPriorityNormal; + const int wgForeground = ECoeWinPriorityAlwaysAtFront; + const int wgForegroundCritical = ECoeWinPriorityAlwaysAtFront + 50; + + if (numShowing == 0) { + doMoveToForeground(false, wgBackground); + return; + } + + switch(control) { + case FgControlNone: + doMoveToForeground(true, numCritical ? wgForegroundCritical : wgForeground); + break; + case FgControlSecurityCriticalClosed: + // Security or critical dialog closed. If there is only one security dialog active, + // Give change to other apps at alwaysAtFront priority to come foreground. + if (numCritical == 0 && numSecurity == 1) { + doMoveToForeground(false, wgForeground); + } else { + doMoveToForeground(true, numCritical ? wgForegroundCritical : wgForeground); + } + break; + } } void HbDeviceDialogManagerPrivate::updateWindowRegion() const @@ -425,18 +467,17 @@ } #else -// Move application to fore/background -void HbDeviceDialogManagerPrivate::moveToForeground(bool foreground) -{ - Q_UNUSED(foreground) -} - void HbDeviceDialogManagerPrivate::doMoveToForeground(bool foreground, int priority) { Q_UNUSED(foreground) Q_UNUSED(priority) } +void HbDeviceDialogManagerPrivate::controlForeground(ForegroundControl control) +{ + Q_UNUSED(control) +} + void HbDeviceDialogManagerPrivate::updateWindowRegion() const { } @@ -513,12 +554,9 @@ showing | closeCalled); while(current->isValid()) { if (current->flags() & notificationGroup) { - if (!showingNotification) { + if (!showingNotification) { // notification dialogs are shown serially showingNotification = true; current->setFlags(showing); - // HACK - mScene->addItem(current->widget()->deviceDialogWidget()); - // HACK END HbPopup *popup = current->widget()->deviceDialogWidget(); popup->show(); newDialogs |= current->flags(); @@ -529,9 +567,6 @@ } } else { // generic dialog current->setFlags(showing); - // HACK - mScene->addItem(current->widget()->deviceDialogWidget()); - // HACK END current->widget()->deviceDialogWidget()->show(); newDialogs |= current->flags(); setupWindowRegion(); @@ -541,14 +576,12 @@ } current = 0; - // Lights control. If security layer is active, only security group or critical group turn lights on. + // Lights control. If security layer is active, only security or critical level turn lights on. // Otherwise lights turned on every time a dialog is shown. - int lightsMask = HbDeviceDialogsContainer::Dialog::SecurityGroup | - HbDeviceDialogsContainer::Dialog::CriticalGroup; + int lightsMask = HbDeviceDialogsContainer::Dialog::SecurityLevel | + HbDeviceDialogsContainer::Dialog::CriticalLevel; if (!showingSecurity) { - lightsMask |= HbDeviceDialogsContainer::Dialog::GenericGroup | - HbDeviceDialogsContainer::Dialog::NotificationGroup | - HbDeviceDialogsContainer::Dialog::IndicatorGroup; + lightsMask |= HbDeviceDialogsContainer::Dialog::NormalLevel; } if (newDialogs & lightsMask) { @@ -593,7 +626,6 @@ resetWindowRegion(); enableReceiptOfFocus(true); } - moveToForeground(dialogsShowing); } /*! @@ -695,9 +727,6 @@ connectIndicatorStatus(deviceDialogIf); } - // Set popup priority - setDialogPriority(popup, deviceDialogInfo.group); - return deviceDialogIf; } @@ -708,7 +737,7 @@ const HbDeviceDialogsContainer::Dialog start; const HbDeviceDialogsContainer::Dialog::Flags showingFlag( HbDeviceDialogsContainer::Dialog::Showing); - HbDeviceDialogsContainer::Dialog *current = &mDialogs.next(start, showingFlag, showingFlag); + const HbDeviceDialogsContainer::Dialog *current = &mDialogs.next(start, showingFlag, showingFlag); if (current->isValid()) { status |= HbDeviceDialogServerStatus::ShowingDialog; } @@ -752,27 +781,25 @@ } // Set dialog (popup) priority -void HbDeviceDialogManagerPrivate::setDialogPriority(HbPopup *popup, HbDeviceDialogPlugin::DeviceDialogGroup group) +void HbDeviceDialogManagerPrivate::setDialogPriority(HbPopup *popup, + HbDeviceDialogsContainer::Dialog::Flags flags) { // For notification, security and critical layer popups, set popup priority. Others use default. - const quint8 CriticalPopupPriority = HbPopupPrivate::VirtualKeyboard - 1; - const quint8 SecurityPopupPriority = HbPopupPrivate::VirtualKeyboard - 2; - const quint8 NotificationPopupPriority = HbPopupPrivate::VirtualKeyboard - 3; + const quint8 CriticalPopupPriority = HbPopupPrivate::VirtualKeyboard - 2; + const quint8 SecurityPopupPriority = HbPopupPrivate::VirtualKeyboard - 4; + const quint8 NotificationPopupPriority = HbPopupPrivate::VirtualKeyboard - 6; quint8 priority = HbPopupPrivate::Default; - switch(group) { - case HbDeviceDialogPlugin::DeviceNotificationDialogGroup: - priority = NotificationPopupPriority; break; - case HbDeviceDialogPlugin::SecurityGroup: - priority = SecurityPopupPriority; break; - case HbDeviceDialogPlugin::CriticalGroup: - priority = CriticalPopupPriority; break; - case HbDeviceDialogPlugin::GenericDeviceDialogGroup: - // fall through - case HbDeviceDialogPlugin::IndicatorGroup: - // fall through - default: - ; // fall through + if (flags & HbDeviceDialogsContainer::Dialog::NormalLevel) { + if (flags & HbDeviceDialogsContainer::Dialog::NotificationGroup) { + priority = NotificationPopupPriority; + } + } else { + if (flags & HbDeviceDialogsContainer::Dialog::SecurityLevel) { + priority = SecurityPopupPriority; + } else { + priority = CriticalPopupPriority; + } } HbPopupPrivate::d_ptr(popup)->setPriority(priority); } @@ -781,8 +808,15 @@ bool HbDeviceDialogManagerPrivate::checkDialogInfo( const HbDeviceDialogPlugin::DeviceDialogInfo &deviceDialogInfo) { - return deviceDialogInfo.group >= HbDeviceDialogPlugin::GenericDeviceDialogGroup && - deviceDialogInfo.group <= HbDeviceDialogPlugin::CriticalGroup; + unsigned int tmp = deviceDialogInfo.group; + if (tmp > HbDeviceDialogPlugin::CriticalGroup) { + return false; + } + tmp = deviceDialogInfo.showLevel; + if (tmp > HbDeviceDialogPlugin::CriticalLevel) { + return false; + } + return true; } // Called by device dialog widget to send some data to client. @@ -801,90 +835,48 @@ void HbDeviceDialogManagerPrivate::deleteDeviceDialog(int id) { TRACE_ENTRY - HbDeviceDialogsContainer::Dialog ¤t = mDialogs.find(id); + HbDeviceDialogsContainer::Dialog &dialog = mDialogs.find(id); - bool securityDialog = current.flags() & (HbDeviceDialogsContainer::Dialog::SecurityGroup|HbDeviceDialogsContainer::Dialog::CriticalGroup); + bool securityDialog = dialog.flags() & + (HbDeviceDialogsContainer::Dialog::SecurityLevel|HbDeviceDialogsContainer::Dialog::CriticalLevel); - if (current.isValid()) { + if (dialog.isValid()) { // If device dialog was cancelled by client or server, give reason int closeReason = HbDeviceDialogNoError; - if ((current.flags() & HbDeviceDialogsContainer::Dialog::CloseCalled)) { - if ((current.flags() & HbDeviceDialogsContainer::Dialog::ClosedByServer)) { + if ((dialog.flags() & HbDeviceDialogsContainer::Dialog::CloseCalled)) { + if ((dialog.flags() & HbDeviceDialogsContainer::Dialog::ClosedByServer)) { closeReason = static_cast(HbDeviceDialog::SystemCancelledError); } else { closeReason = static_cast(HbDeviceDialog::CancelledError); } } emit q->deviceDialogClosed(id, closeReason); - disconnectDialogSignals(current.widget()); - mDialogs.remove(current); + disconnectDialogSignals(dialog.widget()); + mDialogs.remove(dialog); removeRegionRect(id); } showDialogs(); setupWindowRegion(); updateStatus(); - //make sure there is no fixed orientation + // Make sure there is no fixed orientation if (mDialogs.isEmpty()) { mMainWindow->unsetOrientation(false); mWsOriListener.stop(); } - if (!securityDialog) { - return; - } - - // security or critical level active - const HbDeviceDialogsContainer::Dialog begin; - const HbDeviceDialogsContainer::Dialog::Flags securityGroup( - HbDeviceDialogsContainer::Dialog::SecurityGroup); - const HbDeviceDialogsContainer::Dialog::Flags criticalGroup( - HbDeviceDialogsContainer::Dialog::CriticalGroup); - const HbDeviceDialogsContainer::Dialog::Flags showing( - HbDeviceDialogsContainer::Dialog::Showing); - - HbDeviceDialogsContainer::Dialog &dialog = mDialogs.next(begin, securityGroup|showing, - securityGroup|showing); - bool showingSecurity = dialog.isValid(); - if (!showingSecurity) { - dialog = mDialogs.next(begin, criticalGroup|showing, criticalGroup|showing); - showingSecurity = dialog.isValid(); - } + controlForeground(securityDialog ? FgControlSecurityCriticalClosed : FgControlNone); - if (!showingSecurity) { - return; - } - // check are there more security|critical dialogs showing. If there is, do not - // goto background. - bool moreDialogs = mDialogs.next(dialog, securityGroup|showing, - securityGroup|showing).isValid(); - - if (!moreDialogs) { - moreDialogs = mDialogs.next(dialog, criticalGroup|showing, - criticalGroup|showing).isValid(); - } - - if (showingSecurity && !moreDialogs) { -#if defined(Q_OS_SYMBIAN) - doMoveToForeground(false, ECoeWinPriorityAlwaysAtFront); -#endif - } TRACE_EXIT } - bool HbDeviceDialogManagerPrivate::eventFilter(QObject *obj, QEvent *event) { Q_UNUSED(obj) -// activate to correct priority. e.g. Telephone application has gone to background and -// we are in security level. + // Activate to correct ordinal position. e.g. Telephone application has gone to background and + // we are in security level. if (event->type() == QEvent::ApplicationActivate) { -#if defined(Q_OS_SYMBIAN) - RWindowGroup &rootWindowGroup = CCoeEnv::Static()->RootWin(); - if (rootWindowGroup.OrdinalPriority() == ECoeWinPriorityAlwaysAtFront) { - moveToForeground(true); - } -#endif // Q_OS_SYMBIAN + controlForeground(); } return QObject::eventFilter(obj, event); } @@ -893,7 +885,7 @@ void HbDeviceDialogManagerPrivate::deviceDialogClosed() { TRACE_ENTRY - HbDeviceDialogsContainer::Dialog ¤t = mDialogs.find(sender()); + const HbDeviceDialogsContainer::Dialog ¤t = mDialogs.find(sender()); deleteDeviceDialog(current.isValid() ? current.id() : HbDeviceDialogsContainer::Dialog::InvalidId); TRACE_EXIT @@ -1036,7 +1028,7 @@ // Delete closed dialogs that haven't given deviceDialogClosed() signal within a time limit for(;;) { - HbDeviceDialogsContainer::Dialog &dialog = mDialogs.next(start, + const HbDeviceDialogsContainer::Dialog &dialog = mDialogs.next(start, closedCount, MaxDialogClosingPeriod); if (dialog.isValid()) { deleteDeviceDialog(dialog.id()); @@ -1062,7 +1054,7 @@ const HbDeviceDialogsContainer::Dialog::Variable dialogType = HbDeviceDialogsContainer::Dialog::DialogType; - HbDeviceDialogsContainer::Dialog *current = &mDialogs.next(start, dialogType, type); + const HbDeviceDialogsContainer::Dialog *current = &mDialogs.next(start, dialogType, type); while(current->isValid()){ if ((current->flags() & (closeCalled|showing)) == showing) { return true; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p_p.h --- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -73,7 +73,7 @@ mDeviceDialogManger(deviceDialogManger) {} protected: bool eventFilter(QObject* obj, QEvent *event); -private: +private: HbDeviceDialogManagerPrivate *mDeviceDialogManger; }; @@ -105,6 +105,10 @@ MaxDialogClosingPeriod = 2 // 2 * HousekeeperTimerPeriod }; + enum ForegroundControl { + FgControlNone, + FgControlSecurityCriticalClosed + }; // Constructor and destructor explicit HbDeviceDialogManagerPrivate(HbDeviceDialogManager *manager); virtual ~HbDeviceDialogManagerPrivate(); @@ -123,8 +127,8 @@ QList indicatorClientInfoList() const; // Device dialog control related API - void moveToForeground(bool foreground); void doMoveToForeground(bool foreground, int priority); + void controlForeground(ForegroundControl control = FgControlNone); void updateWindowRegion() const; void resetWindowRegion() const; bool showDialogs(); @@ -137,7 +141,7 @@ static int checkpluginerror(int errorCode); static void addSecurityCredentials(const HbDeviceDialogServer::Parameters ¶meters, QVariantMap &credentials); - static void setDialogPriority(HbPopup *popup, HbDeviceDialogPlugin::DeviceDialogGroup group); + static void setDialogPriority(HbPopup *popup, HbDeviceDialogsContainer::Dialog::Flags flags); static bool checkDialogInfo(const HbDeviceDialogPlugin::DeviceDialogInfo &deviceDialogInfo); void deleteDeviceDialog(int id); bool eventFilter(QObject *obj, QEvent *event); @@ -196,6 +200,7 @@ QList mRegionList; RRegion mWindowRegion; RProperty mHbOriProperty; + int mWgOrdinalPriority; #endif HbOrientationStatus::HbWsOrientationListener mWsOriListener; }; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogscontainer.cpp --- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogscontainer.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogscontainer.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -41,14 +41,41 @@ mIndex = InvalidIndex; #ifndef QT_NO_DEBUG mContainer = 0; + mReadOnly = false; #endif // QT_NO_DEBUG } +// Set class read only +void HbDeviceDialogsContainer::Dialog::setReadOnly() +{ +#ifndef QT_NO_DEBUG + mReadOnly = true; +#endif +} + +// Comparison bool HbDeviceDialogsContainer::Dialog::operator ==(const Dialog &other) const { return mId == other.mId; } +// Assignment +void HbDeviceDialogsContainer::Dialog::operator =(const Dialog &other) +{ + Q_ASSERT(!readOnly()); + mId = other.mId; + mPtr = other.mPtr; + mFlags = other.mFlags; + for(int i = 0; i < NumVariables; i++) { + mVariables[i] = other.mVariables[i]; + } + mIndex = other.mIndex; +#ifndef QT_NO_DEBUG + mContainer = other.mContainer; + mReadOnly = other.mReadOnly; +#endif // QT_NO_DEBUG +} + // Verify that Dialog reference is valid bool HbDeviceDialogsContainer::Dialog::verify() const { @@ -60,10 +87,21 @@ #endif // QT_NO_DEBUG } +// Return class read only +bool HbDeviceDialogsContainer::Dialog::readOnly() const +{ +#ifndef QT_NO_DEBUG + return mReadOnly == true; +#else // QT_NO_DEBUG + return true; +#endif // QT_NO_DEBUG +} + // Constructor HbDeviceDialogsContainer::HbDeviceDialogsContainer(HbDeviceDialogPluginManager &pluginManager) : mPluginManager(pluginManager), mNextId(1) { + mInvalidDialog.setReadOnly(); } // Destructor @@ -84,6 +122,7 @@ Dialog dialog; dialog.mId = mNextId++; dialog.mPtr = widget; + switch(deviceDialogInfo.group) { case HbDeviceDialogPlugin::DeviceNotificationDialogGroup: dialog.mFlags |= Dialog::NotificationGroup; @@ -93,13 +132,29 @@ break; case HbDeviceDialogPlugin::SecurityGroup: dialog.mFlags |= Dialog::SecurityGroup; + dialog.mFlags |= Dialog::SecurityLevel; break; case HbDeviceDialogPlugin::CriticalGroup: - dialog.mFlags |= Dialog::CriticalGroup; + dialog.mFlags |= Dialog::GenericGroup; + dialog.mFlags |= Dialog::CriticalLevel; break; default: dialog.mFlags |= Dialog::GenericGroup; } + + if ((dialog.mFlags & (Dialog::CriticalLevel|Dialog::SecurityLevel|Dialog::NormalLevel)) == 0) { + switch(deviceDialogInfo.showLevel) { + case HbDeviceDialogPlugin::SecurityLevel: + dialog.mFlags |= Dialog::SecurityLevel; + break; + case HbDeviceDialogPlugin::CriticalLevel: + dialog.mFlags |= Dialog::CriticalLevel; + break; + default: + dialog.mFlags |= Dialog::NormalLevel; + } + } + #ifndef QT_NO_DEBUG dialog.mContainer = this; #endif // QT_NO_DEBUG @@ -160,8 +215,8 @@ } // Get next dialog with matching flag pattern -HbDeviceDialogsContainer::Dialog &HbDeviceDialogsContainer::next( - const Dialog &from, Dialog::Flags flags, Dialog::Flags mask) +const HbDeviceDialogsContainer::Dialog &HbDeviceDialogsContainer::next( + const Dialog &from, Dialog::Flags flags, Dialog::Flags mask) const { // With invalid from start from beginning, otherwise start from next int i = from.isValid() ? from.mIndex + 1 : 0; @@ -178,11 +233,19 @@ if (i >= count) { // at the end return mInvalidDialog; } - Dialog &dialog = mDialogs[i]; - dialog.mIndex = i; + const Dialog &dialog = mDialogs[i]; + const_cast(dialog).mIndex = i; return dialog; } +// Get next dialog with matching flag pattern +HbDeviceDialogsContainer::Dialog &HbDeviceDialogsContainer::next( + const Dialog &from, Dialog::Flags flags, Dialog::Flags mask) +{ + const HbDeviceDialogsContainer *container = this; + return const_cast(container->next(from, flags, mask)); +} + // Get next dialog with matching variable value HbDeviceDialogsContainer::Dialog &HbDeviceDialogsContainer::next( const Dialog &from, Dialog::Variable variable, const QVariant &value) @@ -207,6 +270,19 @@ return dialog; } +// Count dialogs with matching flag pattern +int HbDeviceDialogsContainer::count(Dialog::Flags flags, Dialog::Flags mask) const +{ + int count = 0; + const Dialog *current = &next(Dialog(), flags, mask); + while(current->isValid()) { + count++; + // Find next one + current = &next(*current, flags, mask); + } + return count; +} + // check is the dialog list empty bool HbDeviceDialogsContainer::isEmpty() const { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogscontainer_p.h --- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogscontainer_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogscontainer_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -48,12 +48,14 @@ NotificationGroup = 0x02, IndicatorGroup = 0x04, SecurityGroup = 0x08, // screen saver / alarm - CriticalGroup = 0x10, // topmost dialogs + NormalLevel = 0x10, + SecurityLevel = 0x20, // showing on security level + CriticalLevel = 0x40, // showing on critical level // Dialog status - Showing = 0x20, // show() has been called - CloseCalled = 0x40, // HbDeviceDialogInterface::closeDeviceDialog() has been called - NoClient = 0x80, // dialog has no client (session closed or a client launched a new dialog) - ClosedByServer = 0x100 // closed by server for some reason, not client + Showing = 0x80, // show() has been called + CloseCalled = 0x100, // HbDeviceDialogInterface::closeDeviceDialog() has been called + NoClient = 0x200, // dialog has no client (session closed or a client launched a new dialog) + ClosedByServer = 0x400 // closed by server for some reason, not client }; Q_DECLARE_FLAGS(Flags, Flag) enum Variable { @@ -83,9 +85,12 @@ QString stringVariable(Variable selector) const {return mVariables[selector].toString();} void setVariable(Variable selector, qulonglong value){mVariables[selector].setValue(value);} void setVariable(Variable selector, const QString &value){mVariables[selector].setValue(value);} + void setReadOnly(); bool operator ==(const Dialog &other) const; + void operator =(const Dialog &other); private: bool verify() const; + bool readOnly() const; int mId; HbDeviceDialogInterface *mPtr; @@ -94,6 +99,7 @@ int mIndex; #ifndef QT_NO_DEBUG HbDeviceDialogsContainer *mContainer; // used by verify() + bool mReadOnly; // used by readOnly() #endif // QT_NO_DEBUG friend class HbDeviceDialogsContainer; }; @@ -107,13 +113,15 @@ Dialog &find(int id); Dialog &find(const QObject *widget); void remove(Dialog &dialog); + const Dialog &next(const Dialog &from, Dialog::Flags flags, Dialog::Flags mask) const; Dialog &next(const Dialog &from, Dialog::Flags flags, Dialog::Flags mask); Dialog &next(const Dialog &from, Dialog::Variable variable, quintptr value) {return next(from, variable, QVariant(static_cast(value)));} Dialog &next(const Dialog &from, Dialog::Variable variable, const QString &value) {return next(from, variable, QVariant(value));} Dialog &next(const Dialog &from, Dialog::Variable variable, const QVariant &value); - bool isEmpty() const; + int count(Dialog::Flags flags, Dialog::Flags mask) const; + bool isEmpty() const; private: HbDeviceDialogPluginManager &mPluginManager; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserver.cpp --- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserver.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserver.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -218,5 +218,5 @@ void HbDeviceDialogServer::indicatorUserActivated(const QVariantMap &data) { - d_func()->IndicatorUserActivated(data); + d_func()->IndicatorUserActivated(data); } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/devicedialogbase/devicedialogserver/hbindicatorsessionhandler.cpp --- a/src/hbcore/devicedialogbase/devicedialogserver/hbindicatorsessionhandler.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/devicedialogbase/devicedialogserver/hbindicatorsessionhandler.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -125,8 +125,8 @@ break; } case EHbSrvActivatedIndicatorData: { - WriteIndicatorDataL(aMessage); - break; + WriteIndicatorDataL(aMessage); + break; } default: { break; @@ -173,12 +173,12 @@ void HbIndicatorSessionHandler::IndicatorUserActivated(const QVariantMap& data) { - QString type = data.value("type").toString(); - - if (indicatorTypes.contains(type) && iIndicatorChannelOpen) { - indicatorDataMap = data; - TRAP_IGNORE(WriteIndicatorDataL(iIndicatorChannel)); - } + QString type = data.value("type").toString(); + + if (indicatorTypes.contains(type) && iIndicatorChannelOpen) { + indicatorDataMap = data; + TRAP_IGNORE(WriteIndicatorDataL(iIndicatorChannel)); + } } HbDeviceDialogServerPrivate& HbIndicatorSessionHandler::Server() @@ -216,9 +216,9 @@ indicatorTypes.removeAll(type); if (indicatorTypes.isEmpty() && iIndicatorChannelOpen) { - indicatorDataMap.clear(); - iIndicatorChannelOpen = false; - iIndicatorChannel.Complete(KErrCancel); + indicatorDataMap.clear(); + iIndicatorChannelOpen = false; + iIndicatorChannel.Complete(KErrCancel); } HbDeviceDialogServer::IndicatorParameters indicatorParameters(type, aMessage, parameter); @@ -364,8 +364,8 @@ void HbIndicatorSessionHandler::WriteIndicatorDataL(const RMessage2& aMessage) { - iIndicatorChannelOpen = EFalse; - QByteArray array; + iIndicatorChannelOpen = EFalse; + QByteArray array; QDataStream stream( &array, QIODevice::WriteOnly ); QVariant var(indicatorDataMap); @@ -374,17 +374,17 @@ // Get client data buffer size TInt size = aMessage.GetDesMaxLength( KSlot0 ); - TPckgBuf buf( EHbIndicatorUserActivated ); - User::LeaveIfError(aMessage.Write(KSlot1, buf)); + TPckgBuf buf( EHbIndicatorUserActivated ); + User::LeaveIfError(aMessage.Write(KSlot1, buf)); if (size >= array.size()) { - // Buffer ok. Write data. - TPtr8 ptr( reinterpret_cast(array.data()), array.size(), array.size()); - TInt error = aMessage.Write( KSlot0, ptr ); - aMessage.Complete(error); - indicatorDataMap.clear(); + // Buffer ok. Write data. + TPtr8 ptr( reinterpret_cast(array.data()), array.size(), array.size()); + TInt error = aMessage.Write( KSlot0, ptr ); + aMessage.Complete(error); + indicatorDataMap.clear(); } else { - aMessage.Complete(array.size()); + aMessage.Complete(array.size()); } } /*! @@ -392,7 +392,7 @@ get the indicator type and parameter from the message. */ QString HbIndicatorSessionHandler::indicatorTypeFromMessageL(const RMessage2 &aMessage, - QVariant ¶meter) const + QVariant ¶meter) const { TRACE_ENTRY TInt dataSize = aMessage.GetDesLength( KSlot0 ); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/devicedialogbase/devicedialogserver/hbsysteminfosym_p_p.cpp --- a/src/hbcore/devicedialogbase/devicedialogserver/hbsysteminfosym_p_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/devicedialogbase/devicedialogserver/hbsysteminfosym_p_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -26,6 +26,7 @@ #include "hbsysteminfosym_p_p.h" #include #include +#include const TUint32 secureId = 0x20022FC5; const TUint32 splashGenServerSecureId = 0x2002E68B; @@ -144,6 +145,7 @@ void HbSystemInfoPrivate::writeDeviceInfo() { + QMutexLocker locker(&mutex); QByteArray array; QDataStream stream(&array, QIODevice::WriteOnly); stream << mDeviceSystemInfo; @@ -253,6 +255,8 @@ { if (mode != mDeviceSystemInfo.networkMode) { mDeviceSystemInfo.networkMode = mode; + mDeviceSystemInfo.networkStatus = mSystemNetworkInfo->networkStatus(mode); + mDeviceSystemInfo.signalStrength = QSystemNetworkInfo::networkSignalStrength(mode); writeDeviceInfo(); } } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/devicedialogbase/devicedialogserver/hbsysteminfosym_p_p.h --- a/src/hbcore/devicedialogbase/devicedialogserver/hbsysteminfosym_p_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/devicedialogbase/devicedialogserver/hbsysteminfosym_p_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -28,6 +28,7 @@ #include #include +#include #include "hbsysteminfo_p.h" struct DeviceSystemInfo @@ -123,5 +124,6 @@ bool mWriter; bool mListening; HbForegroundWatcher *mWatcher; + QMutex mutex; }; #endif // HBSYSTEMINFOSYM_P_P_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/devicedialogbase/hbdevicedialogplugin.cpp --- a/src/hbcore/devicedialogbase/hbdevicedialogplugin.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/devicedialogbase/hbdevicedialogplugin.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -48,9 +48,9 @@ numbers in type strings. It performs string comparison of the whole string when searching for a plugin. - Device dialogs are divided into five groups: generic, notification, indicator-menu, security - and critical groups. The group dictates how and when a dialog is shown. Generic and - notification dialogs are intended for application use. Indicator, security and critical dialogs are + Device dialogs are divided into four groups: generic, notification, indicator-menu and security + groups. The group dictates how and when a dialog is shown. Generic and + notification dialogs are intended for application use. Indicator and security dialogs are for platform. Each dialog indicates which group it belongs to. The group need not be fixed. It may change depending on create parameters. @@ -316,7 +316,7 @@ Defines device dialog groups. Each of these groups have different rules for showing device dialogs. - \sa deviceDialogInfo DeviceDialogInfo + \sa deviceDialogInfo() DeviceDialogInfo */ /*! \var HbDeviceDialogPlugin::DeviceDialogGroup HbDeviceDialogPlugin::GenericDeviceDialogGroup @@ -338,6 +338,29 @@ \var HbDeviceDialogPlugin::DeviceDialogGroup HbDeviceDialogPlugin::CriticalGroup High priority dialogs shown on top other dialogs. Only platform device dialogs may belong to this group. + + \deprecated HbDeviceDialogPlugin::CriticalGroup + is deprecated. Instead use HbDeviceDialogPlugin::GenericDeviceDialogGroup and set + HbDeviceDialogPlugin::CriticalLayer. +*/ + +/*! + \enum HbDeviceDialogPlugin::ShowLevel + Defines a level (z-value) a device dialog is shown. + + \sa deviceDialogInfo() DeviceDialogInfo +*/ +/*! + \var HbDeviceDialogPlugin::ShowLevel HbDeviceDialogPlugin::NormalLevel + A default value to be used by applications. +*/ +/*! + \var HbDeviceDialogPlugin::ShowLevel HbDeviceDialogPlugin::SecurityLevel + Reserved for platform use. Dialog is shown on top of normal dialogs. +*/ +/*! + \var HbDeviceDialogPlugin::ShowLevel HbDeviceDialogPlugin::CriticalLevel + Reserved for platform use. Dialog is shown on top of security level dialogs. */ /*! @@ -380,6 +403,9 @@ /*! \var HbDeviceDialogPlugin::DefaultPriority Default priority value to return in DeviceDialogInfo. + + \deprecated HbDeviceDialogPlugin::DefaultPriority + is deprecated. Will be removed. */ /*! @@ -403,6 +429,13 @@ For future needs. Not used. Device dialog display priority. Determines queuing order of dialogs. Fill with HbDeviceDialogPlugin::DefaultPriority. + + \deprecated HbDeviceDialogPlugin::DeviceDialogInfo::priority + is deprecated. Will be removed. +*/ +/*! + \var HbDeviceDialogPlugin::DeviceDialogInfo::showLevel + Level (z-value) the device dialog widget is shown. HbDeviceDialogPlugin::ShowLevel. */ /*! \var HbDeviceDialogPlugin::DeviceDialogInfo::spare diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/devicedialogbase/hbdevicedialogplugin.h --- a/src/hbcore/devicedialogbase/hbdevicedialogplugin.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/devicedialogbase/hbdevicedialogplugin.h Thu Sep 02 20:44:51 2010 +0300 @@ -64,7 +64,13 @@ DeviceNotificationDialogGroup, IndicatorGroup, SecurityGroup, - CriticalGroup + CriticalGroup // deprecated + }; + + enum ShowLevel{ + NormalLevel, + SecurityLevel, + CriticalLevel }; enum DeviceDialogFlag{ @@ -77,14 +83,16 @@ Q_DECLARE_FLAGS(DeviceDialogFlags, DeviceDialogFlag) enum { - DefaultPriority = 0 + DefaultPriority = 0 // deprecated }; struct DeviceDialogInfo { DeviceDialogGroup group; int flags; - int priority; - quint32 spare[8]; + + int priority; // deprecated + ShowLevel showLevel; + quint32 spare[7]; }; virtual bool accessAllowed(const QString &deviceDialogType, diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/devicedialogbase/hbdevicedialogsymbian.cpp --- a/src/hbcore/devicedialogbase/hbdevicedialogsymbian.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/devicedialogbase/hbdevicedialogsymbian.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -92,7 +92,7 @@ \a aData contains data from the dialog plugin. The structure and meaning of the data is a contract between the dialog and a client. Structure should be aligned with the data types supported by - CHbSymbianVariantMap. + CHbSymbianVariantMap. \sa CHbSymbianVariantMap. */ diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/devicedialogbase/hbindicator.h --- a/src/hbcore/devicedialogbase/hbindicator.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/devicedialogbase/hbindicator.h Thu Sep 02 20:44:51 2010 +0300 @@ -51,7 +51,7 @@ bool deactivate(const QString &indicatorType, const QVariant ¶meter = QVariant()); int error() const; - + signals: void userActivated(const QString &type, const QVariantMap &data); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/devicedialogbase/hbindicatorsym_p.cpp --- a/src/hbcore/devicedialogbase/hbindicatorsym_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/devicedialogbase/hbindicatorsym_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -407,7 +407,7 @@ TBool listening = (activate && q_ptr->receivers(SIGNAL(userActivated(QString, QVariantMap))) > 0); if (!iInitialized) { - + TRAPD( error, initializeL(listening) ); if ( error != KErrNone ){ @@ -416,7 +416,7 @@ return false; } } else if (listening) { - Start(); + Start(); } QByteArray array; QDataStream stream( &array, QIODevice::WriteOnly ); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/devicedialogbase/hbindicatorsymbian.cpp --- a/src/hbcore/devicedialogbase/hbindicatorsymbian.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/devicedialogbase/hbindicatorsymbian.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -97,10 +97,10 @@ class CHbIndicatorSymbianPrivate : public CActive { public: CHbIndicatorSymbianPrivate() : CActive(EPriorityStandard), iInitialized(EFalse), iLastError(HbDeviceDialogNoError), iMsgTypePtr(NULL,0,0), - iBuffer(NULL), - iDataPtr(NULL,0,0) { CActiveScheduler::Add(this); } + iBuffer(NULL), + iDataPtr(NULL,0,0) { CActiveScheduler::Add(this); } ~CHbIndicatorSymbianPrivate() { - Cancel(); + Cancel(); if (iInitialized) { iHbSession.Close(); iInitialized = EFalse; @@ -115,8 +115,8 @@ TBool activate, const CHbSymbianVariant* aParameter); void Start(); - -protected: + +protected: // CActive void RunL(); void DoCancel(); @@ -183,87 +183,87 @@ } if (activate && result && iObserver) { - Start(); + Start(); } return result; } void CHbIndicatorSymbianPrivate::Start() - { - if (!IsActive() && !iRequesting) { - SetActive(); - if (!iBuffer) { - iBuffer = HBufC8::NewL( 256 ); - iDataPtr.Set( iBuffer->Des() ); - } - iDataPtr.Zero(); + { + if (!IsActive() && !iRequesting) { + SetActive(); + if (!iBuffer) { + iBuffer = HBufC8::NewL( 256 ); + iDataPtr.Set( iBuffer->Des() ); + } + iDataPtr.Zero(); TPckg pckg( iMsgType ); iMsgTypePtr.Set( pckg ); iRequesting = ETrue; - iHbSession.SendASyncRequest(EHbSrvGetActivatedIndicatorsStart, iDataPtr, iMsgTypePtr, iStatus); + iHbSession.SendASyncRequest(EHbSrvGetActivatedIndicatorsStart, iDataPtr, iMsgTypePtr, iStatus); } } void CHbIndicatorSymbianPrivate::RunL() { - TInt result = iStatus.Int(); - - if (result < KErrNone) { - SetError(result); - iRequesting = EFalse; - } else if (iMsgType == EHbIndicatorUserActivated && result >= 0) { - iMsgType = -1; - if (result > 0) { - delete iBuffer; - iBuffer = NULL; - iBuffer = HBufC8::NewL(result); - iDataPtr.Set(iBuffer->Des()); - TInt error = iHbSession.SendSyncRequest(EHbSrvActivatedIndicatorData, iDataPtr, &iMsgTypePtr); - } - - QByteArray resArray((const char*)iDataPtr.Ptr(), iDataPtr.Size()); - QDataStream stream(&resArray, QIODevice::ReadOnly); - - QVariant var; - stream >> var; - QVariantMap varMap = var.toMap(); - - if (iObserver) { - QString type = varMap.value("type").toString(); - TPtrC descriptor(static_cast(type.utf16()), - type.length()); - QVariantMap data = varMap.value("data").toMap(); - - CHbSymbianVariantMap* symbianMap = - HbSymbianVariantConverter::fromQVariantMapL(data); - - iObserver->IndicatorUserActivated(descriptor, *symbianMap); - delete symbianMap; - symbianMap = 0; - } - } + TInt result = iStatus.Int(); + + if (result < KErrNone) { + SetError(result); + iRequesting = EFalse; + } else if (iMsgType == EHbIndicatorUserActivated && result >= 0) { + iMsgType = -1; + if (result > 0) { + delete iBuffer; + iBuffer = NULL; + iBuffer = HBufC8::NewL(result); + iDataPtr.Set(iBuffer->Des()); + TInt error = iHbSession.SendSyncRequest(EHbSrvActivatedIndicatorData, iDataPtr, &iMsgTypePtr); + } + + QByteArray resArray((const char*)iDataPtr.Ptr(), iDataPtr.Size()); + QDataStream stream(&resArray, QIODevice::ReadOnly); + + QVariant var; + stream >> var; + QVariantMap varMap = var.toMap(); + + if (iObserver) { + QString type = varMap.value("type").toString(); + TPtrC descriptor(static_cast(type.utf16()), + type.length()); + QVariantMap data = varMap.value("data").toMap(); + + CHbSymbianVariantMap* symbianMap = + HbSymbianVariantConverter::fromQVariantMapL(data); + + iObserver->IndicatorUserActivated(descriptor, *symbianMap); + delete symbianMap; + symbianMap = 0; + } + } // Make a new request if there were no errors. if ( result != KErrServerTerminated && result != KErrCancel && iRequesting) { - SetActive(); - iHbSession.SendASyncRequest(EHbSrvGetActivatedIndicatorContinue, iDataPtr, iMsgTypePtr, iStatus); + SetActive(); + iHbSession.SendASyncRequest(EHbSrvGetActivatedIndicatorContinue, iDataPtr, iMsgTypePtr, iStatus); } } void CHbIndicatorSymbianPrivate::DoCancel() { - if (iRequesting) { - iHbSession.SendSyncRequest(EhbSrvGetActivatedIndicatorsClose); - iRequesting = EFalse; - } + if (iRequesting) { + iHbSession.SendSyncRequest(EhbSrvGetActivatedIndicatorsClose); + iRequesting = EFalse; + } } TInt CHbIndicatorSymbianPrivate::RunError( TInt aError ) - { - SetError(aError); - return KErrNone; - } + { + SetError(aError); + return KErrNone; + } EXPORT_C CHbIndicatorSymbian* CHbIndicatorSymbian::NewL() { @@ -314,7 +314,7 @@ EXPORT_C void CHbIndicatorSymbian::SetObserver(MHbIndicatorSymbianObserver* aObserver) { - d->iObserver = aObserver; + d->iObserver = aObserver; } CHbIndicatorSymbian::CHbIndicatorSymbian() diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/devicedialogbase/hbindicatorwin32_p.cpp --- a/src/hbcore/devicedialogbase/hbindicatorwin32_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/devicedialogbase/hbindicatorwin32_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -66,7 +66,7 @@ if (q_ptr && q_ptr->receivers(SIGNAL(userActivated(QString, QVariantMap))) > 0) { connect(mDeviceDialogManager, SIGNAL(indicatorUserActivated(QVariantMap)), - this, SLOT(indicatorUserActivated(QVariantMap))); + this, SLOT(indicatorUserActivated(QVariantMap))); } if (result != 0) { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/devicedialogbase/hbtextresolversymbian.cpp --- a/src/hbcore/devicedialogbase/hbtextresolversymbian.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/devicedialogbase/hbtextresolversymbian.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -52,7 +52,7 @@ QByteArray iByteArray; TBool iLoaded; QString fileName; - QString path; + QString path; }; Q_GLOBAL_STATIC(HbTextResolverSymbianPrivate, hbTextResolverSymbianPrivate) diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/feedback/hbfeedbackengine.cpp --- a/src/hbcore/feedback/hbfeedbackengine.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/feedback/hbfeedbackengine.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -28,6 +28,7 @@ #include "hbinstantinteractionevent_p.h" #include "hbcontinuousinteractionevent_p.h" +#include // remove with HB_DEPRECATED #include /*! @@ -43,7 +44,7 @@ Instant interaction information is received by methods pressed(), released(), clicked(), keyRepeated(), longPressed(), draggedOver(), flicked(), popupOpened(), popupClosed(), boundaryReached(), rotated90Degrees(), - selectionChanged() and multitouchActivated(). + selectionChanged() and advancedGestureActivated(). Continuous interaction information is received by methods continuousTriggered() and continuousStopped(). @@ -277,15 +278,20 @@ rotated90Degrees(widget); } - break; + break; case Hb::InstantSelectionChanged: { selectionChanged(widget); } break; - case Hb::InstantMultitouchActivated: { - multitouchActivated(widget); + case Hb::InstantMultitouchActivated: { + HB_DEPRECATED("Hb::InstantMultitouchActivated is deprecated."); + multitouchActivated(widget); + } + break; + case Hb::InstantAdvancedGestureActivated: { + advancedGestureActivated(widget); } break; @@ -420,6 +426,9 @@ } /*! + \deprecated HbFeedbackEngine::multitouchActivated(const HbWidget*) + is deprecated. Use HbFeedbackEngine::advancedGestureActivated(const HbWidget*) instead. + Called when the engine receives a touch gesture event with more than one finger from the feedback manager. \param widget the widget being interacted with @@ -430,6 +439,16 @@ } /*! + Called when the engine receives a touch gesture event with more than one finger from the feedback manager. + + \param widget the widget being interacted with +*/ +void HbFeedbackEngine::advancedGestureActivated(const HbWidget *widget) +{ + Q_UNUSED(widget); +} + +/*! Called when the engine receives a continuous interaction event from the feedback manager. \param widget the widget being interacted with diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/feedback/hbfeedbackengine.h --- a/src/hbcore/feedback/hbfeedbackengine.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/feedback/hbfeedbackengine.h Thu Sep 02 20:44:51 2010 +0300 @@ -72,7 +72,8 @@ virtual void boundaryReached(const HbWidget *widget); virtual void rotated90Degrees(const HbWidget *widget); virtual void selectionChanged(const HbWidget *widget); - virtual void multitouchActivated(const HbWidget *widget); + virtual void multitouchActivated(const HbWidget *widget); // deprecated + virtual void advancedGestureActivated(const HbWidget *widget); virtual void continuousTriggered(const HbWidget *widget, Hb::ContinuousInteraction interaction, QPointF delta); virtual void continuousStopped(const HbWidget *widget, Hb::ContinuousInteraction interaction); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/feedback/hbfeedbacknamespace.cpp --- a/src/hbcore/feedback/hbfeedbacknamespace.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/feedback/hbfeedbacknamespace.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -221,7 +221,12 @@ */ /*! - \var HbFeedback::InstantEffect HbFeedback::MultitouchActivate + \deprecated HbFeedback::MultitouchActivate + is deprecated. Use HbFeedback::AdvancedGestureActivate instead. +*/ + +/*! + \var HbFeedback::InstantEffect HbFeedback::AdvancedGestureActivate Instant feedback when a touch gesture with more than one finger is activated: a second touch point is detected and a pinch gesture (for example zooming) is likely to follow. diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/feedback/hbfeedbacknamespace.h --- a/src/hbcore/feedback/hbfeedbacknamespace.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/feedback/hbfeedbacknamespace.h Thu Sep 02 20:44:51 2010 +0300 @@ -79,7 +79,8 @@ PopupClose, Flick, StopFlick, - MultitouchActivate, + MultitouchActivate, // deprecated + AdvancedGestureActivate, RotateStep, LongPress, PositiveTacticon, diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gestures/hbpangesturelogic_p.cpp --- a/src/hbcore/gestures/hbpangesturelogic_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gestures/hbpangesturelogic_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -162,6 +162,19 @@ } QPointF offset = me->globalPos() - gesture->startPos().toPoint(); + gesture->setLastOffset( gesture->offset().toPoint() ); + gesture->setOffset( offset ); + 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; + + 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 ); + QGraphicsView* view = qobject_cast(watched->parent()); if (view) { @@ -182,18 +195,6 @@ gesture->setHotSpot( me->globalPos() ); } - gesture->setLastOffset( gesture->offset().toPoint() ); - gesture->setOffset( offset ); - 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; - - 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 ); return QGestureRecognizer::TriggerGesture; } @@ -213,15 +214,29 @@ Q_UNUSED(me->globalPos()); Q_UNUSED(gesture); Q_UNUSED(watched); - + gesture->d_ptr->mLastTimeStamp = mCurrentTime; - + if ( gestureState == Qt::GestureStarted || gestureState == Qt::GestureUpdated ) { return QGestureRecognizer::FinishGesture; } else { + QPointF offset(gesture->offset()); + bool thresholdExceeded = (offset.x() * offset.x() + offset.y() * offset.y()) > gesture->d_ptr->mThresholdSquare; + if( thresholdExceeded ) { + QGraphicsView* view = qobject_cast(watched->parent()); + if (view) { + QGraphicsScene* scene = view->scene(); + if (scene && scene->property(HbPrivate::OverridingGesture.latin1()).isValid() && + scene->property(HbPrivate::OverridingGesture.latin1()).toInt() != Qt::PanGesture) { + return QGestureRecognizer::CancelGesture; + } + } + return QGestureRecognizer::FinishGesture; + } + return QGestureRecognizer::CancelGesture; } } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gestures/hbswipegesturelogic_p.cpp --- a/src/hbcore/gestures/hbswipegesturelogic_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gestures/hbswipegesturelogic_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -23,6 +23,7 @@ ** ****************************************************************************/ +#include "hbgestures_p.h" #include "hbswipegesture.h" #include "hbswipegesture_p.h" #include "hbswipegesturelogic_p.h" @@ -110,8 +111,11 @@ gesture->d_func()->mSceneStartPos = HbGestureUtils::mapToScene(watched, me->globalPos()); gesture->setHotSpot(me->globalPos()); - gesture->d_ptr->mAxisX.clear(); - gesture->d_ptr->mAxisY.clear(); + + qreal velocityThreshold = HbPanVelocityUpdateThreshold * HbDeviceProfile::current().ppmValue(); + + 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); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gestures/hbswipegesturelogic_p.h --- a/src/hbcore/gestures/hbswipegesturelogic_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gestures/hbswipegesturelogic_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -26,7 +26,6 @@ #ifndef HBSWIPEGESTURELOGIC_P_H #define HBSWIPEGESTURELOGIC_P_H -#include "hbgestures_p.h" #include "hbglobal.h" #include diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gestures/hbtapandholdgesturelogic_p.cpp --- a/src/hbcore/gestures/hbtapandholdgesturelogic_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gestures/hbtapandholdgesturelogic_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -126,7 +126,7 @@ QObject *watched, QMouseEvent *me ) { - Q_UNUSED(gestureState); + Q_UNUSED(gestureState); // Accept only press events from left mouse button. if ( me->button() != Qt::LeftButton ) { DEBUG() << gesture << QGestureRecognizer::Ignore; @@ -191,7 +191,7 @@ // moving within threshold return QGestureRecognizer::Ignore; } - + /*! \internal \brief Handles mouse release event. @@ -209,7 +209,7 @@ { Q_UNUSED(me); Q_UNUSED(watched); - Q_UNUSED(gestureState); + Q_UNUSED(gestureState); // Before anything, check if left button was released. if (!(me->button() == Qt::LeftButton) ){ @@ -233,8 +233,8 @@ DEBUG() << gesture << QGestureRecognizer::Ignore; return QGestureRecognizer::Ignore; -} - +} + /*! \internal \brief Handle timer event. @@ -254,7 +254,7 @@ QTimerEvent *te ) { Q_UNUSED(watched); - Q_UNUSED(te); + Q_UNUSED(te); // React only to own timer event Q_ASSERT(gesture->priv->mTimerID == te->timerId()); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbabstractbutton.cpp --- a/src/hbcore/gui/hbabstractbutton.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbabstractbutton.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -36,6 +36,7 @@ #include #include +#include #ifdef HB_GESTURE_FW #include @@ -293,7 +294,7 @@ { Q_Q( HbAbstractButton ); - q->setFocusPolicy(Qt::FocusPolicy(qApp->style()->styleHint(QStyle::SH_Button_FocusPolicy))); + q->setFocusPolicy(Qt::FocusPolicy(qApp->style()->styleHint(QStyle::SH_Button_FocusPolicy))); #ifdef HB_GESTURE_FW q->grabGesture(Qt::TapGesture); @@ -519,6 +520,7 @@ return d->down; } + /*! @beta Sets whether the button is pressed down. @@ -795,13 +797,21 @@ option->state |= (isChecked() | isDown() ? QStyle::State_On : QStyle::State_Off); } +void HbAbstractButton::initPrimitiveData(HbStylePrimitiveData *primitiveData, const QGraphicsObject *primitive) +{ + HbWidgetBase::initPrimitiveData(primitiveData, primitive); + Q_ASSERT(primitiveData); + primitiveData->state |= (isChecked() | isDown() ? QStyle::State_On : QStyle::State_Off); + +} + /*! \reimp */ bool HbAbstractButton::event(QEvent *event) { // as opposed to other widgets, disabled buttons accept mouse - // events. This avoids surprising click-through scenarios + // events. This avoids surprising click-through scenarios Q_D( HbAbstractButton ); if (!isEnabled()) { switch(event->type()) { @@ -954,7 +964,7 @@ if (HbTapGesture *tap = qobject_cast(event->gesture(Qt::TapGesture))) { switch(tap->state()) { - case Qt::GestureStarted: + case Qt::GestureStarted: scene()->setProperty(HbPrivate::OverridingGesture.latin1(),Qt::TapGesture); if (!tap->property(HbPrivate::ThresholdRect.latin1()).toRect().isValid()) { tap->setProperty(HbPrivate::ThresholdRect.latin1(), mapRectToScene(boundingRect()).toRect()); @@ -1076,7 +1086,7 @@ } d->click(); } - break; + break; } default: event->ignore(); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbabstractbutton.h --- a/src/hbcore/gui/hbabstractbutton.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbabstractbutton.h Thu Sep 02 20:44:51 2010 +0300 @@ -48,7 +48,7 @@ Q_PROPERTY( int autoRepeatDelay READ autoRepeatDelay WRITE setAutoRepeatDelay ) Q_PROPERTY( int autoRepeatInterval READ autoRepeatInterval WRITE setAutoRepeatInterval ) Q_PROPERTY( bool down READ isDown WRITE setDown DESIGNABLE false ) - + public: explicit HbAbstractButton( QGraphicsItem *parent = 0 ); virtual ~HbAbstractButton(); @@ -95,6 +95,8 @@ protected: HbAbstractButton( HbAbstractButtonPrivate &dd, QGraphicsItem *parent ); void initStyleOption(HbStyleOption *option) const; + void initPrimitiveData(HbStylePrimitiveData *primitiveData, const QGraphicsObject *primitive); + virtual bool hitButton( const QPointF &pos ) const; virtual void checkStateSet(); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbcssinspector_p.cpp --- a/src/hbcore/gui/hbcssinspector_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbcssinspector_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -449,8 +449,8 @@ mPrefHintRect(0,0,0,0), mMaxHintRect(0,0,0,0) { - updateColors(); - setVisible(false); + updateColors(); + setVisible(false); } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbmainwindow.cpp --- a/src/hbcore/gui/hbmainwindow.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbmainwindow.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -1187,13 +1187,20 @@ // it directly and optimize it by setting a proper clipping rectangle. Q_D(HbMainWindow); if (d->mBgItem) { - // No need to save/restore the painter state here. + bool restoreState = false; if (d->mBgItem->imageMode() != Hb::DoNotDrawBackground && (!qFuzzyCompare(rect.height(), d->mBgItem->boundingRect().height()) || !qFuzzyCompare(rect.width(), d->mBgItem->boundingRect().width()))) { - painter->setClipRect(rect, Qt::ReplaceClip); + //Need to save the state since some widget in scene could apply a smaller + //clip than this + restoreState = true; + painter->save(); + painter->setClipRect(rect); } d->mBgItem->paint(painter, 0, 0); + if (restoreState) { + painter->restore(); + } } } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbmenu.cpp --- a/src/hbcore/gui/hbmenu.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbmenu.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -127,11 +127,11 @@ //This optimises case of options menu which otherwise updates its primitives twice. if (menuType == HbMenu::OptionsMenu) q->setFrameType(HbPopup::Strong); - else + else q->setFrameType(HbPopup::Weak); if (polished)//This check can be removed once base class repolish is fixed. q->repolish(); - } + } } void HbMenuPrivate::delayedLayout() diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbpopup.cpp --- a/src/hbcore/gui/hbpopup.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbpopup.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -424,8 +424,9 @@ itemFlags |= QGraphicsItem::ItemClipsToShape; itemFlags |= QGraphicsItem::ItemClipsChildrenToShape; itemFlags |= QGraphicsItem::ItemSendsGeometryChanges; - itemFlags |= QGraphicsItem::ItemIsPanel; - q->setFlags(itemFlags); + //itemFlags |= QGraphicsItem::ItemIsPanel; + q->setFlags(itemFlags); + //q->setActive(false); } void HbPopupPrivate::_q_appearEffectEnded(HbEffect::EffectStatus status) @@ -435,7 +436,7 @@ CSystemToneService* HbPopupPrivate::systemToneService() { - return HbInstancePrivate::d_ptr()->systemTone(); + return HbInstancePrivate::d_ptr()->systemTone(); } /* Sets the priority for a popup. @@ -727,10 +728,7 @@ mVgMaskEffect->setMask(image); } -void HbPopupPrivate::resizePopup() -{ -} /*! Constructs a popup with the given \a parent graphics item. For true popup @@ -1124,9 +1122,9 @@ if(d->addPopupToScene()) { d->duplicateShowEvent = true; } - if (d->mActivePopup) { + /*if (d->mActivePopup) { setActive(true); - } + }*/ // Popup clears closed state d->closed = false; if (d->backgroundItem) { @@ -1179,9 +1177,9 @@ } d->doSetModal( d->modal ); - if (d->mActivePopup) { + /*if (d->mActivePopup) { setActive(false); - } + }*/ } /*! diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbpopup.h --- a/src/hbcore/gui/hbpopup.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbpopup.h Thu Sep 02 20:44:51 2010 +0300 @@ -144,7 +144,7 @@ Q_PRIVATE_SLOT(d_func(), void _q_delayedHide(HbEffect::EffectStatus status)) 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_appearEffectEnded(HbEffect::EffectStatus status)) #endif // HB_EFFECTS Q_PRIVATE_SLOT(d_func(), void _q_timeoutFinished()) }; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbpopup_p.h --- a/src/hbcore/gui/hbpopup_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbpopup_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -63,7 +63,7 @@ AlwaysOnTop = 255 }; - CSystemToneService *systemToneService(); + CSystemToneService *systemToneService(); // Private features public: @@ -119,7 +119,7 @@ public: #ifdef HB_EFFECTS void _q_delayedHide(HbEffect::EffectStatus status); - virtual void _q_appearEffectEnded(HbEffect::EffectStatus status); + virtual void _q_appearEffectEnded(HbEffect::EffectStatus status); void _q_orientationAboutToChange(Qt::Orientation orient, bool animate); #endif // HB_EFFECTS void _q_timeoutFinished(); @@ -129,7 +129,6 @@ void handleBackgroundMousePressEvent(); void handleBackgroundMouseReleaseEvent(QGraphicsSceneMouseEvent *event); void calculateShape(); - void resizePopup(); static int timeoutValue(HbPopup::DefaultTimeout timeout); void setTimeout(int msec); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbpopupmanager.cpp --- a/src/hbcore/gui/hbpopupmanager.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbpopupmanager.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -385,7 +385,7 @@ popup->metaObject()->className() != QLatin1String("HbExactWordPopup") && popup->metaObject()->className() != QLatin1String("HbInputSmileyPicker") && popup->metaObject()->className() != QLatin1String("Hb12KeyCustomKeypad") && - !popup->inherits("HbInputVkbWidget")) { + !popup->inherits("HbInputVkbWidget")) { setGeometryForPopup( popup ); } } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbscrollarea.cpp --- a/src/hbcore/gui/hbscrollarea.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbscrollarea.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -363,11 +363,11 @@ Possible values for the clamping style include: - StrictClamping - scrolling is limited to the bounding rectangle of the content item - BounceBackClamping - scrolling can go beyond the bounding rectangle of the content item, but bounces back to the - limits of the bounding rectangle when released or when inertia scrolling stops - NoClamping - scrolling is completely unclamped (this is usually used when the subclass implements its own - custom clamping behavior) + StrictClamping - scrolling is limited to the bounding rectangle of the content item + BounceBackClamping - scrolling can go beyond the bounding rectangle of the content item, but bounces back to the + limits of the bounding rectangle when released or when inertia scrolling stops + NoClamping - scrolling is completely unclamped (this is usually used when the subclass implements its own + custom clamping behavior) The default value is BounceBackClamping. @@ -398,10 +398,10 @@ Possible values for the clamping style include: - Pan - dragging motion pans the view with no follow-on scrolling animation + Pan - dragging motion pans the view with no follow-on scrolling animation \deprecated PanOrFlick is deprecated. - PanWithFollowOn - dragging motion pans the view, velocity at end of drag motion triggers follow-on animated scrolling + PanWithFollowOn - dragging motion pans the view, velocity at end of drag motion triggers follow-on animated scrolling The default value is PanWithFollowOn. diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbscrollarea_p.cpp --- a/src/hbcore/gui/hbscrollarea_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbscrollarea_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -69,7 +69,7 @@ static const int PAGE_CHANGE_DURATION = 170; //keep this half of swapbuffer time so that we dont end up doing too many updates -static const int ANIMATION_INTERVAL = 8.0; +static const int ANIMATION_INTERVAL = 8; static const int FRAMEUPDATE_THRESHOLD = 32; } @@ -449,7 +449,7 @@ mOverFramCount = FRAMEUPDATE_THRESHOLD; //To have smooth velocity during scrolling avg the ideal time with the //actual frame time. - return qCeil((difference+MAX_TIMEDIF_FOR_SIMULATION)/2); + return qCeil((qreal(difference)+MAX_TIMEDIF_FOR_SIMULATION)/2); } else { return MAX_TIMEDIF_FOR_SIMULATION; @@ -459,7 +459,6 @@ mOverFramCount = 0; return MAX_TIMEDIF_FOR_SIMULATION; } - /* * animateScrollTimeout() is a private slot function called during * follow-on scroll animation @@ -637,7 +636,7 @@ HbPanGesture *hbPanGesture = qobject_cast(panGesture); if (hbPanGesture) { - if(hbPanGesture->state() == Qt::GestureUpdated) { + if(hbPanGesture->state() == Qt::GestureUpdated || hbPanGesture->state() == Qt::GestureFinished) { if (mIsAnimating) stopAnimating(); @@ -658,11 +657,13 @@ } QPointF oldPos = mContents->pos(); q->scrollByAmount(-delta); - if (mContents->pos() == oldPos) { + if (mContents->pos() == oldPos && hbPanGesture->state() != Qt::GestureFinished) { return false; } - } else if (panGesture->state() == Qt::GestureFinished) { + } + + if (panGesture->state() == Qt::GestureFinished) { if ((!mAbleToScrollX && !mAbleToScrollY) || mBoundaryReached) return false; @@ -800,13 +801,13 @@ mAbleToScrollX = false; if ((mScrollDirections & Qt::Horizontal) && (contentsWidth - > scrollAreaWidth)) { + > scrollAreaWidth + 1)) { mAbleToScrollX = true; } mAbleToScrollY = false; if ((mScrollDirections & Qt::Vertical) && (contentsHeight - > scrollAreaHeight)) { + > scrollAreaHeight + 1)) { mAbleToScrollY = true; } prepareScrollBars(); @@ -1053,10 +1054,10 @@ if (animate) { q->scrollContentsTo(-newPosition, PAGE_CHANGE_DURATION); } else { - setContentPosition(newPosition); + setContentPosition(newPosition); } } - + void HbScrollAreaPrivate::createPrimitives() { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbscrollarea_p.h --- a/src/hbcore/gui/hbscrollarea_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbscrollarea_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -185,8 +185,8 @@ bool mFrictionEnabled; bool mResetAlignment; - int mUnderFramCount; - int mOverFramCount; + qreal mUnderFramCount; + qreal mOverFramCount; HbScrollArea::ClampingStyle mClampingStyle; HbScrollArea::ScrollingStyle mScrollingStyle; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbsplash.cpp --- a/src/hbcore/gui/hbsplash.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbsplash.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -25,6 +25,7 @@ #include "hbsplash_p.h" #include "hbsplash_direct_symbian_p.h" +#include "hbsplashdefs_p.h" #include #include #include @@ -35,7 +36,6 @@ #include #include #include "hborientationstatus_p.h" -#include "hbsplashdefs_p.h" #endif /*! @@ -211,12 +211,12 @@ bool ok = false; while (maxTries--) { TInt err = CreateSession(hbsplash_server_name, ver); - qDebug("[hbsplash] CreateSession result: %d", err); + splDebug("[hbsplash] CreateSession result: %d", err); if (err == KErrNone) { ok = true; break; } else if (err == KErrNotFound || err == KErrServerTerminated) { - qDebug("[hbsplash] server not running"); + splDebug("[hbsplash] server not running"); TFindServer findServer(hbsplash_server_name); TFullName name; if (findServer.Next(name) != KErrNone) { @@ -240,7 +240,7 @@ qWarning("[hbsplash] Rendezvous failed (%d)", status.Int()); break; } - qDebug("[hbsplash] server started"); + splDebug("[hbsplash] server started"); } } else { break; @@ -309,7 +309,7 @@ *params.h = size.iHeight; *params.bpl = bpl; *params.fmt = fmt; - qDebug("[hbsplash] bitmap data received"); + splDebug("[hbsplash] bitmap data received"); return data; } } catch (const std::bad_alloc &) { @@ -349,7 +349,7 @@ File f; f.mFullName = "[unavailable]"; if (client.getSplashFileHandle(f.mFile, oriStr, appIdStr, params.screenId)) { - qDebug("[hbsplash] got handle from server"); + splDebug("[hbsplash] got handle from server"); data = readSpl(f, params); f.mFile.Close(); } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbsplashdefs_p.h --- a/src/hbcore/gui/hbsplashdefs_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbsplashdefs_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -26,6 +26,9 @@ #ifndef HBSPLASHDEFS_P_H #define HBSPLASHDEFS_P_H +#include +#include + #ifdef Q_OS_SYMBIAN #include @@ -54,4 +57,18 @@ HbSplashNonStandardStatusBar = 1 }; +/* + Enable the following to get more extensive debug prints from HbSplash and HbSplashScreen. + Applies also to the server (hbsplashgenerator). +*/ +//#define HB_SPLASH_VERBOSE_LOGGING + +#ifdef HB_SPLASH_VERBOSE_LOGGING +inline QDebug splDeb() { return qDebug(); } +#define splDebug qDebug +#else +inline QNoDebug splDeb() { return QNoDebug(); } +#define splDebug QT_NO_QDEBUG_MACRO +#endif + #endif // HBSPLASHDEFS_P_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbsplashscreen.cpp --- a/src/hbcore/gui/hbsplashscreen.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbsplashscreen.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -26,6 +26,7 @@ #include "hbsplashscreen.h" #include "hbsplashscreen_generic_p.h" #include "hbsplash_p.h" +#include "hbsplashdefs_p.h" #include #include @@ -47,7 +48,6 @@ #ifdef HB_SPLASH_DIRECT_WS #include "hbsplashscreen_symbian_vg_p.h" -//#define HB_SPLASH_DIRECT_WS_LOGGING #endif /*! @@ -82,6 +82,8 @@ Indicates that the application will force its orientation to vertical. As a result the splash screen will also be forced to vertical orientation. + + \sa Hb::SplashFixedVertical */ /*! @@ -89,6 +91,22 @@ Indicates that the application will force its orientation to horizontal. As a result the splash screen will also be forced to horizontal orientation. + + \sa Hb::SplashFixedHorizontal +*/ + +/*! + \var HbSplashScreen::Flag HbSplashScreen::ForceQt + + Forces the usage of the QWidget-based implementation even on platforms where a + non-Qt based implementation would be available. The Qt-based version requires + QApplication to be constructed, while non-Qt based ones do not need this and + therefore they can be launched before instantiating QApplication or + HbApplication, providing a better startup experience. However some special + applications may want to stick to the Qt-based version, e.g. because they + force the usage of the raster graphics system. + + \sa Hb::ForceQtSplash */ static HbSplashScreenInterface *splashScreen = 0; @@ -145,14 +163,19 @@ */ void HbSplashScreen::start(Flags flags) { + Flags realFlags = flags | requestProps()->mSplashFlags; if (!splashScreen) { #ifdef HB_SPLASH_DIRECT_WS - splashScreen = new HbSplashScreenSymbianVg; + if (realFlags.testFlag(HbSplashScreen::ForceQt)) { + splashScreen = new HbSplashScreenGeneric; + } else { + splashScreen = new HbSplashScreenSymbianVg; + } #else splashScreen = new HbSplashScreenGeneric; #endif } - splashScreen->start(flags | requestProps()->mSplashFlags); + splashScreen->start(realFlags); } /*! @@ -245,7 +268,7 @@ HbSplashScreenGeneric::~HbSplashScreenGeneric() { if (mImageData) { - qDebug("[hbsplash] destroying splash screen"); + splDebug("[hbsplash] destroying splash screen"); delete mImageData; } } @@ -270,19 +293,23 @@ } } if (!mContents.isNull()) { - qDebug("[hbsplash] splash screen initialized"); + splDebug("[hbsplash] splash screen initialized"); + #ifdef Q_OS_SYMBIAN showFullScreen(); // krazy:exclude=qmethods #else show(); #endif + QApplication::processEvents(); QApplication::flush(); + // The splash screen must be destroyed automatically when // loosing foreground. if (QApplication::instance()) { QApplication::instance()->installEventFilter(this); } + // The splash screen must be destroyed automatically after // a certain amount of time. mTimerId = startTimer(auto_stop_interval); @@ -307,7 +334,7 @@ void HbSplashScreenGeneric::timerEvent(QTimerEvent *event) { if (event->timerId() == mTimerId) { - qDebug("[hbsplash] timeout while splash screen is active"); + qWarning("[hbsplash] timeout while splash screen is active"); deleteLater(); splashScreen = 0; } else { @@ -318,7 +345,7 @@ bool HbSplashScreenGeneric::eventFilter(QObject *obj, QEvent *event) { if (event->type() == QEvent::ApplicationDeactivate) { - qDebug("[hbsplash] foreground lost while splash screen is active"); + qWarning("[hbsplash] foreground lost while splash screen is active"); deleteLater(); splashScreen = 0; } @@ -394,7 +421,7 @@ delete mTimer; delete mListener; if (mInited) { -#ifdef HB_SPLASH_DIRECT_WS_LOGGING +#ifdef HB_SPLASH_VERBOSE_LOGGING RDebug::Printf("[hbsplash] destroying splash screen"); #endif if (eglGetCurrentContext() == mContext @@ -421,7 +448,7 @@ // This is typically called before initializing anything, meaning // there is no active scheduler, cleanup stack, cone, etc. -#ifdef HB_SPLASH_DIRECT_WS_LOGGING +#ifdef HB_SPLASH_VERBOSE_LOGGING ELAPSED_TIMER t; t.start(); #endif @@ -443,7 +470,7 @@ mWin.SetExtent(TPoint(0, 0), mScr->SizeInPixels()); mWin.EnableVisibilityChangeEvents(); -#ifdef HB_SPLASH_DIRECT_WS_LOGGING +#ifdef HB_SPLASH_VERBOSE_LOGGING RDebug::Printf("[hbsplash] wserv init took %d ms", (int) t.restart()); #endif @@ -478,7 +505,7 @@ RDebug::Printf("[hbsplash] eglCreateWindowSurface failed (%d)", eglGetError()); } -#ifdef HB_SPLASH_DIRECT_WS_LOGGING +#ifdef HB_SPLASH_VERBOSE_LOGGING RDebug::Printf("[hbsplash] egl+openvg init took %d ms", (int) t.elapsed()); #endif @@ -500,13 +527,13 @@ int w, h, bpl; QImage::Format fmt; RequestProps *props = requestProps(); -#ifdef HB_SPLASH_DIRECT_WS_LOGGING +#ifdef HB_SPLASH_VERBOSE_LOGGING ELAPSED_TIMER t; t.start(); #endif mImageData = HbSplash::load(w, h, bpl, fmt, flags, props->mAppId, props->mScreenId); -#ifdef HB_SPLASH_DIRECT_WS_LOGGING +#ifdef HB_SPLASH_VERBOSE_LOGGING RDebug::Printf("[hbsplash] load() took %d ms", (int) t.restart()); #endif @@ -519,7 +546,7 @@ RDebug::Printf("[hbsplash] vgCreateImage failed (%d)", vgGetError()); } -#ifdef HB_SPLASH_DIRECT_WS_LOGGING +#ifdef HB_SPLASH_VERBOSE_LOGGING RDebug::Printf("[hbsplash] image init took %d ms", (int) t.restart()); #endif @@ -527,7 +554,7 @@ mWin.Invalidate(); mWin.BeginRedraw(); -#ifdef HB_SPLASH_DIRECT_WS_LOGGING +#ifdef HB_SPLASH_VERBOSE_LOGGING RDebug::Printf("[hbsplash] redraw init took %d ms", (int) t.restart()); #endif @@ -550,7 +577,7 @@ mWin.EndRedraw(); mWs.Flush(); -#ifdef HB_SPLASH_DIRECT_WS_LOGGING +#ifdef HB_SPLASH_VERBOSE_LOGGING RDebug::Printf("[hbsplash] drawing took %d ms", (int) t.elapsed()); #endif @@ -571,7 +598,7 @@ void HbSplashScreenSymbianVg::doQtPhase() { -#ifdef HB_SPLASH_DIRECT_WS_LOGGING +#ifdef HB_SPLASH_VERBOSE_LOGGING RDebug::Printf("[hbsplash] starting timer & visibility listener"); #endif // Now there is an active scheduler. diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbsplashscreen.h --- a/src/hbcore/gui/hbsplashscreen.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbsplashscreen.h Thu Sep 02 20:44:51 2010 +0300 @@ -34,7 +34,8 @@ enum Flag { Default = 0x00, FixedVertical = 0x01, - FixedHorizontal = 0x02 + FixedHorizontal = 0x02, + ForceQt = 0x04 }; Q_DECLARE_FLAGS(Flags, Flag) diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbtoolbar.cpp --- a/src/hbcore/gui/hbtoolbar.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbtoolbar.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -58,8 +58,6 @@ \brief The HbToolBar class provides a widget that gives quick access to commands associated with the view. - organizing a set of commands. - A toolbar provides similar functions to an options menu (HbMenu class). Like an options menu, a toolbar represents commands that apply to the entire view and not to individual items in the view. However, there are some important differences. A toolbar shows the @@ -380,6 +378,7 @@ d->setOrientation ( orientation ); d->minimumToolButtonSize = QSizeF(); + } /*! diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbtoolbar_p.cpp --- a/src/hbcore/gui/hbtoolbar_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbtoolbar_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -163,8 +163,8 @@ if ( mOrientation != orientation ) { mOrientation = orientation; emit core.orientationChanged(); + updateButtonsLayoutDirection(); } - } void HbToolBarPrivate::calculateMaximumButtons() { @@ -438,7 +438,7 @@ moreExtension->extensionAction()->setIcon(extensionIcon); initToolBarExtension(moreExtension); HbToolButtonPrivate::d_ptr(moreExtensionButton)->setToolBarPosition( - HbStyleOptionToolButton::TB_End); + HbToolButtonPrivate::TB_End); moreExtensionButton->setProperty(BUTTONSTYLE, HbToolButtonPrivate::ToolButtonIcon); } } @@ -712,20 +712,20 @@ if (totalVisibleItems == 1 && !moreButtonNeeded) { HbToolButtonPrivate *first = HbToolButtonPrivate::d_ptr(mVisibleToolButtons.first()); - first->setToolBarPosition(HbStyleOptionToolButton::TB_OnlyOne); + first->setToolBarPosition(HbToolButtonPrivate::TB_OnlyOne); } else if (maxToolbarButtons > 1 && mVisibleToolButtons.count() > 1) { HbToolButtonPrivate *first = HbToolButtonPrivate::d_ptr(mVisibleToolButtons.first()); - first->setToolBarPosition(HbStyleOptionToolButton::TB_Beginning); + first->setToolBarPosition(HbToolButtonPrivate::TB_Beginning); int lastMiddleButton = (moreButtonNeeded) ? maxToolbarButtons - 2 : mVisibleToolButtons.count() - 2; if (!moreButtonNeeded) { HbToolButtonPrivate *last = HbToolButtonPrivate::d_ptr(mVisibleToolButtons.last()); - last->setToolBarPosition(HbStyleOptionToolButton::TB_End); + last->setToolBarPosition(HbToolButtonPrivate::TB_End); } for (int i = 1; i <= lastMiddleButton; ++i) { HbToolButtonPrivate *middle = HbToolButtonPrivate::d_ptr(mVisibleToolButtons.at(i)); - middle->setToolBarPosition(HbStyleOptionToolButton::TB_Middle); + middle->setToolBarPosition(HbToolButtonPrivate::TB_Middle); } } } @@ -769,9 +769,17 @@ void HbToolBarPrivate::setButtonLayoutDirection( HbToolButton& button ) { Q_Q(HbToolBar); - if (q->layoutDirection() != button.layoutDirection()) { + if (q->layoutDirection() != button.layoutDirection() && q->orientation() == Qt::Horizontal) { button.setLayoutDirection(q->layoutDirection()); } + if (q->layoutDirection() == button.layoutDirection() && q->orientation() == Qt::Vertical) { + if (q->layoutDirection() == Qt::RightToLeft) { + button.setLayoutDirection(Qt::LeftToRight); + } + else { + button.setLayoutDirection(Qt::RightToLeft); + } + } } void HbToolBarPrivate::updateButtonsLayoutDirection() { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbtoolbarextension.cpp --- a/src/hbcore/gui/hbtoolbarextension.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbtoolbarextension.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -43,32 +43,32 @@ #include #include #include - + /*! @stable @hbcore \class HbToolBarExtension \brief The HbToolBarExtension class provides a popup extension to a toolbar. - + You can use a toolbar extension to extend the main toolbar (HbToolBar class) in a view with additional actions that are placed in a subsidiary toolbar. Alternatively, a toolbar extension can contain a widget, such as a list or grid. This is useful, for example, for providing navigation between views when there are more views than can fit as actions on the toolbar itself. - + A toolbar can contain more than one toolbar extension. A toolbar extension opens when the user triggers the toolbar action that is associated with the extension, usually by tapping it. The user dismisses the toolbar extension by selecting an option (which runs a command) or by tapping outside the extension. - + The following image shows a toolbar that has two extensions: the leftmost one contains a list widget and the rightmost one contains three standard actions. - + \image html toolbarextension.png A toolbar that has two extensions - + Use addAction() to create an action and add it to the toolbar extension. There are several overloads of this function, which allow you to specify both a text and image or just a text and also to @@ -78,73 +78,73 @@ QGraphicsWidget) to add existing actions to the toolbar extension. Use clearActions() to clear all of the actions and removeAction() to remove individual actions. - + The order of the actions within the toolbar extension controls the order of the buttons that the user sees. addAction() and addActions() append the actions to the end of the toolbar and insertAction() and insertActions() enable you to specify the required position. - + You can use the HbDialog API to fill the toolbar extension popup with widgets (such as a list, grid or line edit). If you do this, any actions that you add to the toolbar extension will not be visible. - + \section _usecases_hbtoolbarextension Using the HbToolBarExtension class - + \subsection _uc_001_hbtoolbarextension Creating a toolbar extension containing actions The following example demonstrates how to add a toolbar extension button to the toolbar and how to add actions to the toolbar extension. \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,27} - + \subsection _uc_002_hbtoolbarextension Creating a toolbar extension containing a widget - + The following example demonstrates creating a toolbar extension containing a single-selection list widget. - + \code // Create the toolbar. HbToolBar *toolBar = new HbToolBar(); - + // Add the action that will open the toolbar extension. HbAction *radioAction = toolBar->addAction("Channel"); - + // Create the toolbar extension. HbToolBarExtension *radioExtension = new HbToolBarExtension(); - + // Set the heading. HbLabel* heading = new HbLabel(QString("Channel")); radioExtension->setHeadingWidget(heading); - + // Create a list widget. HbListWidget *list = new HbListWidget(); list->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); - + // Make the list single selection. list->setSelectionMode(HbAbstractItemView::SingleSelection); - + // Add list items. list->addItem("574.7"); list->addItem("976.5"); list->addItem("108.67"); - + // Add the list widget to the toolbar extension object. radioExtension->setContentWidget(list); - + // Add the toolbar extension to the toolbar action that will open it. radioAction->setToolBarExtension(radioExtension); \endcode */ - + /*! \fn int HbToolBarExtension::type() const */ - + /* \primitives \primitive{background} HbFrameItem representing the extension background. */ - + HbToolBarExtensionPrivate::HbToolBarExtensionPrivate() : HbDialogPrivate(), mToolButtons(), @@ -412,8 +412,8 @@ HbToolBarExtension::~HbToolBarExtension() { } - - + + /*! Creates a new action with the given \a text and adds the action to the end of the toolbar extension, provided space is @@ -421,7 +421,7 @@ screen size and orientation. When there is no free space, this function does nothing. There is currently no notification when there is no free space. - + \overload \return The new action. */ @@ -431,8 +431,8 @@ addAction(action); return action; } - - + + /*! Creates a new action with the given \a icon and \a text and adds the action to the end of the toolbar extension, provided space is @@ -440,7 +440,7 @@ screen size and orientation. When there is no free space, this function does nothing. There is currently no notification when there is no free space. - + \overload \return The new action. */ @@ -451,19 +451,19 @@ addAction(action); return action; } - - + + /*! Creates a new action with the given \a text, adds the action to the end of the toolbar extension (provided space is available), and connects the action's \link HbAction::triggered() triggered()\endlink signal to a receiver object's slot. - + The space available in a toolbar extension depends on the screen size and orientation. When there is no free space, this function does not add the action to the toolbar extension. There is currently no notification when there is no free space. - + \overload \param text The text for the new action. \param receiver The object that is to receive the new action's signal. @@ -479,18 +479,18 @@ addAction(action); return action; } - + /*! Creates a new action with the given \a icon and \a text, adds the action to the end of the toolbar extension (provided space is available), and connects the action's \link HbAction::triggered() triggered()\endlink signal to a receiver object's slot. - + The space available in a toolbar extension depends on the screen size and orientation. When there is no free space, this function does not add the action to the toolbar extension. There is currently no notification when there is no free space. - + \overload \param icon The image for the new action. \param text The text for the new action. @@ -508,7 +508,7 @@ addAction(action); return action; } - + /*! Returns the action associated with this toolbar extension. This is the action in the toolbar to which this toolbar extension belongs @@ -529,7 +529,7 @@ } /*! - + */ bool HbToolBarExtension::event( QEvent *event ) { @@ -551,7 +551,7 @@ } /*! - + */ void HbToolBarExtension::polish( HbStyleParameters ¶ms ) { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbtoolbutton.cpp --- a/src/hbcore/gui/hbtoolbutton.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbtoolbutton.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -26,13 +26,10 @@ #include "hbtoolbutton.h" #include "hbtoolbutton_p.h" #include "hbtooltip.h" -#include "hbstyleoptiontoolbutton_p.h" #include "hbtoolbarextension.h" #include "hbtoolbarextension_p.h" #include "hbaction.h" #include "hbaction_p.h" -#include "hbstyle_p.h" -#include #include "hbcolorscheme.h" #include "hbtextitem.h" #include "hbiconitem.h" @@ -41,6 +38,12 @@ #include "hbglobal_p.h" // remove when removing HB_DEPRECATED +#include "hbstyle_p.h" // for iconmodes... + +#include +#include +#include + #include #include #include @@ -103,7 +106,7 @@ frameItem(0), customBackground(), backgroundVisible(true), - toolBarPosition(HbStyleOptionToolButton::TB_None), + toolBarPosition(TB_None), orientation(Qt::Vertical), mDialogToolBar(false), toolbarExtensionFrame(false), @@ -120,19 +123,23 @@ Q_Q(HbToolButton); if (backgroundVisible) { if (!frameItem){ - frameItem = HbStylePrivate::createPrimitive(HbStylePrivate::P_ToolButton_frame, q); + frameItem = q->style()->createPrimitive(HbStyle::PT_FrameItem, "background", q); } } else if (frameItem) { delete frameItem; frameItem = 0; } if (!textItem) { - textItem = static_cast(HbStylePrivate::createPrimitive(HbStylePrivate::P_ToolButton_text, q)); - textItem->setTextWrapping(Hb::TextWordWrap); - } // I dare you to optimize this + textItem = q->style()->createPrimitive(HbStyle::PT_TextItem, "text", q); + } + HbStyleTextPrimitiveData textData; + textData.textWrapping = Hb::TextWordWrap; + q->style()->updatePrimitive(textItem, &textData, q); + if (!iconItem) { - iconItem = HbStylePrivate::createPrimitive(HbStylePrivate::P_ToolButton_icon, q); + iconItem = q->style()->createPrimitive(HbStyle::PT_IconItem, "icon", q); } + } void HbToolButtonPrivate::setOrientation(Qt::Orientation orientation) @@ -144,7 +151,7 @@ } } -void HbToolButtonPrivate::setToolBarPosition(HbStyleOptionToolButton::ToolBarPosition position) +void HbToolButtonPrivate::setToolBarPosition(ToolButtonPosition position) { Q_Q(HbToolButton); if (toolBarPosition != position) { @@ -185,7 +192,174 @@ { Q_Q(HbToolButton); q->setProperty(name, value); - q->repolish(); + q->repolish(); +} + + +bool HbToolButtonPrivate::useTransparentGraphics() const +{ + Q_Q(const HbToolButton); + if (q->mainWindow() && q->mainWindow()->currentView()) { + if (q->mainWindow()->currentView()->viewFlags() & HbView::ViewTitleBarTransparent) { + return true; + } + } + return false; +} + +bool HbToolButtonPrivate::isToolBarExtension() const +{ + return (action != 0 && toolbarExtensionFrame); +} + + + + +void HbToolButtonPrivate::framePrimitiveData(HbStyleFramePrimitiveData *data) +{ + + Q_Q(HbToolButton); + + data->fillWholeRect = true; + + if (orientation == Qt::Vertical) { + data->frameType = HbFrameDrawer::ThreePiecesHorizontal; + } else { + data->frameType = HbFrameDrawer::ThreePiecesVertical; + } + + QStringList list; + QString frameGraphicsFooter; + // 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); + return; + } + + // in toolbar extension + if(isToolBarExtension()) { + 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"); + } + } + data->frameType = HbFrameDrawer::NinePieces; + return; + } + + if (!toolBarPosition) { + if (mode == QIcon::Disabled && state == QIcon::Off) { + data->frameGraphicsName = QLatin1String("qtg_fr_btn_disabled"); + } else if (mode == QIcon::Normal && state == QIcon::On) { + if(!q->isCheckable()){ + data->frameGraphicsName = QLatin1String("qtg_fr_btn_pressed"); + } else { + data->frameGraphicsName = QLatin1String("qtg_fr_btn_latched"); + } + } else if (mode == QIcon::Selected && state == QIcon::Off) { + data->frameGraphicsName = QLatin1String("qtg_fr_btn_highlight"); + } else { + data->frameGraphicsName = QLatin1String("qtg_fr_btn_normal"); + } + data->frameType = HbFrameDrawer::NinePieces; + return; + } +// 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; + } + + 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 + + + + 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; + +} +void HbToolButtonPrivate::iconPrimitiveData(HbStyleIconPrimitiveData *data) +{ + Q_Q(HbToolButton); + if (q->action()) + data->icon = q->action()->icon(); + + data->iconMode = HbStylePrivate::iconMode(data->state); + data->iconState = HbStylePrivate::iconState(data->state); + return; +} +void HbToolButtonPrivate::textPrimitiveData(HbStyleTextPrimitiveData *data) +{ + Q_Q(HbToolButton); + if (q->action()) + data->text = q->action()->text(); + return; } QSizeF HbToolButtonPrivate::getMinimumSize() @@ -341,29 +515,6 @@ } } - -/*! - - \deprecated HbToolButton::primitive(HbStyle::Primitive) - is deprecated. - - \reimp - */ -QGraphicsItem *HbToolButton::primitive(HbStyle::Primitive primitive) const -{ - Q_D(const HbToolButton); - switch (primitive) { - case HbStylePrivate::P_ToolButton_frame: - return d->frameItem; - case HbStylePrivate::P_ToolButton_icon: - return d->iconItem; - case HbStylePrivate::P_ToolButton_text: - return d->textItem; - default: - return 0; - } -} - /*! \reimp */ @@ -371,7 +522,7 @@ { Q_D(HbToolButton); - HbStyleOptionToolButton option; + if (d->action) { setCheckable(d->action->isCheckable()); setChecked(d->action->isChecked()); @@ -393,74 +544,48 @@ setToolTip(QString()); } - initStyleOption(&option); setProperty("dialogtoolbar", d->mDialogToolBar); if (d->frameItem) { - HbStylePrivate::updatePrimitive(d->frameItem, HbStylePrivate::P_ToolButton_frame, &option); + HbStyleFramePrimitiveData data; + initPrimitiveData(&data, d->frameItem); + style()->updatePrimitive(d->frameItem, &data, this); + d->frameItem->update(); } if (d->textItem) { + HbStyleTextPrimitiveData data; + initPrimitiveData(&data, d->textItem); bool itemHasNoContents = false; - if (option.text.isEmpty() || option.text.isNull() || - (property(BUTTONSTYLE).toInt() == HbToolButtonPrivate::ToolButtonIcon)) { - itemHasNoContents = true; + if (data.text.isSet()) { + if ( data.text.value().isEmpty() || data.text.value().isNull() || + (property(BUTTONSTYLE).toInt() == HbToolButtonPrivate::ToolButtonIcon)) { + itemHasNoContents = true; + } } d->textItem->setFlag(QGraphicsItem::ItemHasNoContents, itemHasNoContents); - if(!itemHasNoContents) - HbStylePrivate::updatePrimitive(d->textItem, HbStylePrivate::P_ToolButton_text, &option); + if(!itemHasNoContents) { + + style()->updatePrimitive(d->textItem, &data, this); + d->textItem->update(); + } } if (d->iconItem) { + HbStyleIconPrimitiveData data; + initPrimitiveData(&data, d->iconItem); + bool itemHasNoContents = false; - if (option.icon.isNull() || (property(BUTTONSTYLE).toInt() == HbToolButtonPrivate::ToolButtonText)) { - itemHasNoContents = true; - } else { - HbStylePrivate::updatePrimitive(d->iconItem, HbStylePrivate::P_ToolButton_icon, &option); - if (option.icon.flags() & HbIcon::Colorized) { - static_cast(d->iconItem)->setFlags(HbIcon::Colorized); - } - if (option.icon.mirroringMode() != HbIcon::Default) { - HbIconItem *iconItem = static_cast(d->iconItem); - iconItem->setMirroringMode( option.icon.mirroringMode() ); + if (data.icon.isSet()) { + if (data.icon.value().isNull() || (property(BUTTONSTYLE).toInt() == HbToolButtonPrivate::ToolButtonText)) { + itemHasNoContents = true; + } else { + style()->updatePrimitive(d->iconItem, &data, this); + d->iconItem->update(); } } d->iconItem->setFlag(QGraphicsItem::ItemHasNoContents, itemHasNoContents); } + } -/*! - Initializes \a option with the values from this HbToolButton. This method is useful for - subclasses when they need a HbStyleOptionToolButton, but don't want to fill in all the - information themselves. - */ -void HbToolButton::initStyleOption(HbStyleOptionToolButton *option) -{ - Q_D(HbToolButton); - HbAbstractButton::initStyleOption(option); - - Q_ASSERT(option); - option->customBackground = d->customBackground; - option->backgroundVisible = d->backgroundVisible; - option->toolBarPosition = d->toolBarPosition; - option->orientation = d->orientation; - option->isCheckable = d->checkable; - option->useSecondaryGraphics = d->mDialogToolBar; - option->useTransparentGraphics = false; - if (mainWindow() && mainWindow()->currentView()) { - if (mainWindow()->currentView()->viewFlags() & HbView::ViewTitleBarTransparent) { - option->useTransparentGraphics = true; - } - } - - if (d->action) { - option->text = d->action->text(); - HbAction *hbAction = qobject_cast(d->action); - if (hbAction) - option->icon = hbAction->icon(); - else - option->icon = d->action->icon(); - - option->isToolBarExtension = d->toolbarExtensionFrame; - } -} /*! \internal @@ -513,7 +638,7 @@ if (event->type() == QEvent::GraphicsSceneHelp) { Q_D(HbToolButton); // Check whether toolbutton is inside a toolbar. - if (d->toolBarPosition != HbStyleOptionToolButton::TB_None) { + if (d->toolBarPosition != HbToolButtonPrivate::TB_None) { d->showToolTip(); event->accept(); return true; @@ -522,6 +647,20 @@ return HbAbstractButton::sceneEvent(event); } +void HbToolButton::initPrimitiveData(HbStylePrimitiveData *primitiveData, const QGraphicsObject *primitive) +{ + Q_D(HbToolButton); + HbAbstractButton::initPrimitiveData(primitiveData, primitive); + QString itemName = HbStyle::itemName(primitive); + if (itemName == QLatin1String("background")) { + d->framePrimitiveData(hbstyleprimitivedata_cast(primitiveData)); + } else if (itemName == QLatin1String("text")) { + d->textPrimitiveData(hbstyleprimitivedata_cast(primitiveData)); + } else if (itemName == QLatin1String("icon")) { + d->iconPrimitiveData(hbstyleprimitivedata_cast(primitiveData)); + } +} + /*! \reimp */ diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbtoolbutton.h --- a/src/hbcore/gui/hbtoolbutton.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbtoolbutton.h Thu Sep 02 20:44:51 2010 +0300 @@ -32,6 +32,7 @@ class HbAction; class HbToolButtonPrivate; + class HbStyleOptionToolButton; class HB_CORE_EXPORT HbToolButton : public HbAbstractButton @@ -50,7 +51,6 @@ HbIcon background() const; void setBackground( const HbIcon &background ); - QGraphicsItem *primitive( HbStyle::Primitive primitive ) const; enum { Type = Hb::ItemType_ToolButton }; int type() const { return Type; } @@ -63,13 +63,13 @@ protected: HbToolButton( HbToolButtonPrivate &dd, QGraphicsItem *parent ); - - void initStyleOption( HbStyleOptionToolButton *option ); void resizeEvent( QGraphicsSceneResizeEvent *event ); void nextCheckState(); bool event( QEvent *event ); void polish(HbStyleParameters ¶ms); bool sceneEvent(QEvent *event); + void initPrimitiveData(HbStylePrimitiveData *primitiveData, const QGraphicsObject *primitive); + private: Q_DECLARE_PRIVATE_D( d_ptr, HbToolButton ) diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbtoolbutton_p.h --- a/src/hbcore/gui/hbtoolbutton_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbtoolbutton_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -38,15 +38,16 @@ // #include -#include #include #include +#include +#include +#include class HbToolButton; class HbStyle; class HbTextItem; - class HbToolButtonPrivate : public HbAbstractButtonPrivate { Q_DECLARE_PUBLIC(HbToolButton) @@ -64,25 +65,43 @@ HbToolButtonPrivate(); virtual ~HbToolButtonPrivate(); + enum ToolButtonPosition + { + TB_None, + TB_OnlyOne, + TB_Beginning, + TB_Middle, + TB_End + }; + void createPrimitives(); void setOrientation( Qt::Orientation orientation ); - void setToolBarPosition( HbStyleOptionToolButton::ToolBarPosition position ); + void setToolBarPosition( ToolButtonPosition position ); void setBackgroundVisible( bool visible ); void setExtensionBackgroundVisible( bool visible ); void setLayoutProperty(const char *name, bool value); + + bool useTransparentGraphics() const; + bool isToolBarExtension() const; + + void framePrimitiveData(HbStyleFramePrimitiveData *data); + void iconPrimitiveData(HbStyleIconPrimitiveData *data); + void textPrimitiveData(HbStyleTextPrimitiveData *data); + QSizeF getMinimumSize(); QPointer action; - HbTextItem *textItem; //Workaround should be QGraphicsItem - QGraphicsItem *iconItem; - QGraphicsItem *frameItem; + QGraphicsObject *textItem; + QGraphicsObject *iconItem; + QGraphicsObject *frameItem; HbIcon customBackground; bool backgroundVisible; - HbStyleOptionToolButton::ToolBarPosition toolBarPosition; + ToolButtonPosition toolBarPosition; Qt::Orientation orientation; + bool mDialogToolBar; bool toolbarExtensionFrame; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbtooltip.cpp --- a/src/hbcore/gui/hbtooltip.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbtooltip.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -36,41 +36,52 @@ @hbcore \class HbToolTip - \brief The HbToolTip class provides tool tips (balloon help) for any graphics item. - - \mainclass - - The tip is a short piece of text reminding the user of the - graphics item's function. - - The simplest and most common way to set a graphics item's tool tip is by - calling its QGraphicsItem::setToolTip() function. + \brief The HbToolTip class provides a set of static functions that augment the + standard features provided by the tooltip framework. + + A tooltip is a short piece of text that opens in a balloon, usually in response to + the user tapping and holding on a widget or action button. The text provides a brief + explanation of the purpose of the item. + + The easiest way to set a tooltip on a widget or action is to call the \c setToolTip() + function provided by QGraphicsItem and QAction, respectively. Both QGraphicsItem and + QAction also provide a \c toolTip() getter function. After setting the tooltip, you + can generally simply let the tooltip framework handle showing the tooltip when the + user taps and holds on the item and hiding the tooltip afterwards. The framework + shows the tooltip with the \c Qt::AlignTop alignment flag, which means that the tooltip + appears above the top edge of the widget. + + When the tooltip framework detects a tap and hold event, it sends a + QGraphicsSceneHelpEvent to the QGraphicsItem that is topmost in the scene under the + press point and has a non-empty tooltip text. If the QGraphicsItem accepts + the event, the framework does not show the tooltip. This means that when necessary + classes that are derived from QGraphicsItem can implement their own logic to show + the tooltip; for example, if you want the tooltip to appear to the right of the widget + rather than in the default position above it. To do this, the implementation calls + one of the HbToolTip::showText() static function overloads to display the + tooltip. - When a tooltip is currently on - display, isVisible() returns true and text() the currently visible - text. + The %HbToolTip class has other static functions that provide additional features. + For example, you can call HbToolTip::isVisible() to find out whether a tooltip is + currently displayed and HbToolTip::text() to get the text that is currently visible. - By default the tool tip framework is responsible for showing and hiding the tool tips - on the scene. When the framework detects a long mouse press event it checks what is the - top most QGraphicsItem on the scene having non empty tooltip text under the press point and - sends an QGraphicsSceneHelpEvent to it. This makes it possible that QGraphicsItem derived - objects can implement their own tool tip showing logic. If the sent QGraphicsSceneHelpEvent - event is accepted by the QGraphicsItem object then framework does nothing. Otherwise it shows - the tool tip text with Qt::AlignTop alignment. + \section _usecases_hbtooltip Using the HbToolTip class - In rare cases QGraphicsItem derived classes can handle QGraphicsSceneHelpEvent to provide - custom tool tip showing logic. An example on how to get custom tooltip alignment - on a QGraphicsItem derived class. + This example shows how a custom widget class that is derived fromQGraphicsItem can + handle the QGraphicsSceneHelpEvent event to provide custom logic for showing a tooltip. + \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,25} - \sa QGraphicsItem::toolTip, QAction::toolTip + \sa QGraphicsItem, QAction */ /*! - \overload + This is analogous to calling + HbToolTip::showText(const QString&,QGraphicsItem*,const QRectF&,Qt::Alignment) + with the \a rect argument set to the widget's bounding rectangle + (QGraphicsItem::boundingRect()). - This is analogous to calling HbToolTip::showText(\a text, \a item, - item->boundingRect(), \a preferredAlignment) + \overload */ void HbToolTip::showText( const QString &text, QGraphicsItem *item, Qt::Alignment preferredAlignment ) @@ -79,36 +90,47 @@ } /*! - Shows \a text as a tool tip, with the prefererred alignment \a preferredAlignment in relation - to \a item. - - If you specify a non-empty rect the tip will be hidden as soon - as you move your cursor out of this area. - - The \a rect is in the coordinates of the graphics item you specify with - \a item. - - If \a text is empty or the item 0 the tool tip is hidden. + Shows a given text as a tooltip for a widget using a prefererred alignment. There + is an additional option to specify a region within the widget that accepts the + events that trigger the appearance of the tooltip. If this argument is specified, + the tooltip disappears when the user's finger moves out of the defined region. + + Specify the preferred alignment of the tooltip relative to the side of the widget + using one of the following flags or flag combinations: + + - \c Qt::AlignTop + - \c Qt::AlignRight + - \c Qt::AlignLeft + - \c Qt::AlignTop | \c Qt::AlignRight + - \c Qt::AlignTop | \c Qt::AlignLeft + + For example, \c Qt::AlignTop aligns the lower edge of the tool tip with the top edge + of the widget; \c Qt::AlignTop | \c Qt::AlignLeft aligns the lower-right corner of the + tooltip with the top-left corner of the widget; and \c Qt::AlignTop | \c Qt::AlignRight + aligns the lower-left corner of the tooltip with the top-right corner of the widget. - The supported alignment flags are Qt::AlignTop, Qt::AlignRight, Qt::AlignLeft, - Qt::AlignTop|Qt::AlignRight, Qt::AlignTop|Qt::AlignLeft. Any other alignment flags are ignored. - Alignment flags are referring to the side of \a item i.e. when \a preferredAlignment - equals Qt::AlignTop the tool tip is aligned to the top of \a item and so on. - When Qt::AlignTop|Qt::AlignLeft combination is used the bottom-right corner of the tool tip is - aligned to the top-left corner of \a item. When Qt::AlignTop|Qt::AlignRight combination is used - the bottom-left corner of the tool tip is aligned to the top-right corner of \a item. + If the layout is right-to-left, the horizontal alignments are effectively reversed + (for example, \c Qt::AlignRight becomes \c Qt::AlignLeft), using the rules described + in \c QStyle::visualAlignment(). - HbToolTip uses QStyle::visualAlignment() to transforms \a preferredAlignment according to the - current layout direction. Qt::AlignAbsolute is supported the way is described - in QStyle::visualAlignment(). - - If the tool tip could not be aligned properly i.e. without intersecting \a item's bounding - rectangle by using the provided \a preferredAlignment then it will be aligned by another - supported alignment option. - - If none of the supported alignment options results proper alignment then Qt::AlignTop will - be used. - + If the tooltip cannot be aligned properly using the specified alignment without the + tooltip intersecting the widget's bounding rectangle, this function uses another of the + supported alignment options. + + You can use this function to hide a tooltip by setting \a text to empty or the \a item + parameter to 0. + + \overload + + \param text The text to be displayed. If this is empty, the function hides the + tooltip. + \param item The widget the tooltip applies to. If this is 0, the function + hides the tooltip. + \param rect The region within the widget that the user can tap to display the tooltip. + This is expressed in the coordinates of \a item. + \param preferredAlignment The alignment of the tooltip relative to the side of \a item. + This must be one of the supported alignment flags or flag combinations + specified above. Any other alignment flags are ignored. */ void HbToolTip::showText( const QString &text, QGraphicsItem *item, const QRectF &rect, Qt::Alignment preferredAlignment ) @@ -128,10 +150,8 @@ } /*! - \fn void HbToolTip::hideText() - - Hides the visible tooltip in the \a scene. This is the same as calling showText() with an - empty string or item parameter as 0. + Hides the visible tooltip in \a scene. This is equivalent to calling showText() + with an empty string or with the \a item parameter set to 0. \sa showText() */ @@ -148,9 +168,9 @@ } /*! - Returns true if this tooltip is currently shown. + Returns true if this tooltip is currently visible. - \sa showText() + \sa showText() */ bool HbToolTip::isVisible( const HbGraphicsScene *scene ) { @@ -162,8 +182,8 @@ } /*! - Returns the tooltip text, if a tooltip is visible, or an - empty string if a tooltip is not visible. + If the tooltip is visible, this returns the tooltip text; otherwise this function + returns an empty string. */ QString HbToolTip::text( const HbGraphicsScene *scene ) { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbview.cpp --- a/src/hbcore/gui/hbview.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbview.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -830,7 +830,7 @@ { Q_D(HbView); - if (visible) { + if (visible) { setViewFlags(d->mViewFlags &~ HbView::ViewTitleBarHidden); } else { setViewFlags(d->mViewFlags | HbView::ViewTitleBarHidden); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbwidget.cpp --- a/src/hbcore/gui/hbwidget.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbwidget.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -63,6 +63,7 @@ : HbWidgetBasePrivate(), style(0), backgroundPrimitiveType(HbStylePrivate::P_None), + polished(0), polishPending(false), themingPending(true), repolishOutstanding(false), @@ -77,7 +78,7 @@ focusResidualItem(0) { q_ptr = 0; - testabilitySignal = new HbTestabilitySignal_p(); + testabilitySignal = new HbTestabilitySignal_p(); } void HbWidgetPrivate::init() @@ -493,18 +494,19 @@ /*! Sets a custom style for the widget. - When a new style is set for the widget the widget's primitives need to recreated and primitives and layout updated. - In order for the style change to work each widget needs to override recreatePrimitives() method and recreate the - primitives. + When a new style is set for the widget the widget's primitives need to recreated and primitives and layout updated. + In order for the style change to work each widget needs to override recreatePrimitives() method and recreate the + primitives. \param style Custom style for the widget, note that the ownership is not transferred */ void HbWidget::setStyle( HbStyle *style ) { Q_D( HbWidget ); d->style = style; - recreatePrimitives(); - updatePrimitives(); - repolish(); + recreatePrimitives(); + repolish(); + updatePrimitives(); + } /*! @@ -537,24 +539,6 @@ } /*! - \deprecated HbWidget::pluginBaseId() - is deprecated. Style plugins are deprecated. -*/ -int HbWidget::pluginBaseId() const -{ - return 0; // deprecated -} - -/*! - \deprecated HbWidget::setPluginBaseId(int) - is deprecated. Style plugins are deprecated. -*/ -void HbWidget::setPluginBaseId( int baseId ) -{ - Q_UNUSED(baseId); // deprecated -} - -/*! This function returns the HbMainWindow of the widget or \c 0 if it doesn't exist. Note that if the widget is not added to the scene then this function returns the first mainwindow (if there is one) @@ -748,10 +732,10 @@ Q_D(HbWidget); if (d->testabilitySignal && d->testabilitySignal->signalEnabled()) { - emit d->testabilitySignal->propertyChanges(change, value); + emit d->testabilitySignal->propertyChanges(change, value); } - if (change == QGraphicsItem::ItemVisibleHasChanged) { + if (change == QGraphicsItem::ItemVisibleHasChanged) { if (!d->polished && !value.toBool()) { // temporary solution starts -->> @@ -759,7 +743,7 @@ // when the defect is fixed, this needs to be removed to prevent calling the polish // twice. #if (QT_VERSION < QT_VERSION_CHECK(4, 6, 1)) - if ( !scene() ) { + if ( !scene() ) { d->polishPending = true; } #endif @@ -900,9 +884,9 @@ // "d->polished" check removed because there's a bug in QGraphicsScene (Qt bug id 251309): // "polishEvent" is never sent to items that were invisible when added to scene. #if (QT_VERSION < QT_VERSION_CHECK(4, 6, 1)) - if (!d->repolishOutstanding) { + if (!d->repolishOutstanding) { #else - if (d->polished && !d->repolishOutstanding) { + if (d->polished && !d->repolishOutstanding) { #endif d->repolishOutstanding = true; QEvent* polishEvent = new QEvent( QEvent::Polish ); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbwidget.h --- a/src/hbcore/gui/hbwidget.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbwidget.h Thu Sep 02 20:44:51 2010 +0300 @@ -75,6 +75,7 @@ FocusHighlightResidual }; + explicit HbWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0); virtual ~HbWidget(); virtual bool event(QEvent *e); @@ -85,8 +86,6 @@ enum { Type = Hb::ItemType_Widget }; int type() const { return Type; } - int pluginBaseId() const; - HbMainWindow *mainWindow() const; virtual QGraphicsItem *primitive(HbStyle::Primitive primitive) const; @@ -135,9 +134,6 @@ virtual void polishEvent(); virtual void polish(HbStyleParameters ¶ms); void repolish(); - - void setPluginBaseId(int baseId); - bool sceneEventFilter (QGraphicsItem *watched, QEvent *event); protected: diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbwidget_p.h --- a/src/hbcore/gui/hbwidget_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbwidget_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -59,7 +59,7 @@ class HB_CORE_PRIVATE_EXPORT HbWidgetPrivate: public HbWidgetBasePrivate { - Q_DECLARE_PUBLIC(HbWidget) + Q_DECLARE_PUBLIC(HbWidget) public: HbWidgetPrivate(); @@ -78,8 +78,9 @@ HbWidget *q_ptr; HbStyle *style; - HbTestabilitySignal_p *testabilitySignal; + HbTestabilitySignal_p *testabilitySignal; HbStylePrivate::Primitive backgroundPrimitiveType; + quint32 polished :1; bool polishPending; bool themingPending; bool repolishOutstanding; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbwidgetbase.cpp --- a/src/hbcore/gui/hbwidgetbase.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbwidgetbase.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -26,6 +26,7 @@ #include #include #include +#include #ifdef HB_EFFECTS #include #include @@ -62,8 +63,7 @@ HbWidgetBasePrivate::HbWidgetBasePrivate() : mApiProtectionFlags(0), - attributes(0), - polished(0) + attributes(0) { q_ptr = 0; @@ -102,19 +102,6 @@ } } -//Optimizes updateGeometry calls for hbwidget and its descendents. -bool HbWidgetBasePrivate::ignoreGeometryUpdate() -{ - - return false; -} - - -void HbWidgetBasePrivate::activateParentLayout() -{ - -} - void HbWidgetBasePrivate::setInsidePopup(bool insidePopup) { Q_Q( HbWidgetBase ); @@ -224,7 +211,7 @@ if (change == QGraphicsItem::ItemVisibleChange) { if (value.toBool()) { //For HbWidget/Primitives size is not set as they will be layouted - //after being polished.This is done to avoid flickering as primitives tend + //after being polished. This is done to avoid flickering as primitives tend //to paint themselves before layouting, if they are added to existing layout. // If HbWidgets/primitives are used as standalone widgets, //their size and position must be set explicitly. @@ -422,6 +409,36 @@ option->boundingRect = boundingRect(); } + +/*! + Initializes the common primitive data. This method sets the common \a state parameter. + + The state style option consists of flags. If this widget is enabled the flag QStyle::State_Enabled is set. + If this widget is active the flag QStyle::State_Active will be set. + 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) + +*/ +void HbWidgetBase::initPrimitiveData(HbStylePrimitiveData *primitiveData, const QGraphicsObject *primitive) +{ + + Q_ASSERT(primitiveData); + Q_UNUSED(primitive); + + primitiveData->state = QStyle::State_None; + if (isEnabled()) + primitiveData->state |= QStyle::State_Enabled; + + if (QGraphicsWidget *w = window()) { + if (w->isActiveWindow()) + primitiveData->state |= QStyle::State_Active; + } +} + + /*! This event handler, for \a event, receives gesture events. Its base implementation ignores all gestures delivered in the \a event. diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbwidgetbase.h --- a/src/hbcore/gui/hbwidgetbase.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbwidgetbase.h Thu Sep 02 20:44:51 2010 +0300 @@ -32,10 +32,12 @@ #include #include +#include class HbStyleOption; class HbWidgetBasePrivate; class QGestureEvent; +class HbStylePrimitiveData; class HB_CORE_EXPORT HbWidgetBase: public QGraphicsWidget { @@ -71,7 +73,8 @@ void updateGeometry(); void initStyleOption(HbStyleOption *option) const; - + void initPrimitiveData(HbStylePrimitiveData *primitiveData, const QGraphicsObject *primitive); + private: Q_DECLARE_PRIVATE_D(d_ptr, HbWidgetBase) Q_DISABLE_COPY(HbWidgetBase) diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/gui/hbwidgetbase_p.h --- a/src/hbcore/gui/hbwidgetbase_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/gui/hbwidgetbase_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -46,7 +46,7 @@ class HB_CORE_PRIVATE_EXPORT HbWidgetBasePrivate { - Q_DECLARE_PUBLIC(HbWidgetBase) + Q_DECLARE_PUBLIC(HbWidgetBase) public: HbWidgetBasePrivate(); @@ -56,34 +56,32 @@ void fontChangeEvent(); void handleInsidePopup(const QGraphicsItem *parent); bool keyNavigation() const; - bool ignoreGeometryUpdate(); - void activateParentLayout(); virtual void setInsidePopup(bool insidePopup); - enum ApiCssProtectionFlags { - AC_TextColor = 0x01, - AC_TextAlign = 0x02, - AC_IconBrush = 0x04, - AC_IconAspectRatioMode = 0x08, + enum ApiCssProtectionFlags { + AC_TextColor = 0x01, + AC_TextAlign = 0x02, + AC_IconBrush = 0x04, + AC_IconAspectRatioMode = 0x08, AC_IconAlign = 0x10, AC_TextWrapMode = 0x20, AC_TextLinesMin = 0x40, AC_TextLinesMax = 0x80 - }; + }; - inline void setApiProtectionFlag(HbWidgetBasePrivate::ApiCssProtectionFlags att, bool value) - { - if(value) - mApiProtectionFlags |= att; - else - mApiProtectionFlags &= ~att; - } + inline void setApiProtectionFlag(HbWidgetBasePrivate::ApiCssProtectionFlags att, bool value) + { + if(value) + mApiProtectionFlags |= att; + else + mApiProtectionFlags &= ~att; + } - inline bool testApiProtectionFlag(HbWidgetBasePrivate::ApiCssProtectionFlags att) const - { - return mApiProtectionFlags & att; - } + inline bool testApiProtectionFlag(HbWidgetBasePrivate::ApiCssProtectionFlags att) const + { + return mApiProtectionFlags & att; + } inline int attributeToBitIndex(Hb::WidgetAttribute att) const { @@ -103,10 +101,6 @@ quint32 attributes : 5; HbFontSpec fontSpec; HbWidgetBase *q_ptr; - quint32 ignoreParentInvalidation :1; - quint32 polished :1; - quint32 reSized :1; - HbWidget *mParentHbWidget; private: static HbWidgetBasePrivate *d_ptr(HbWidgetBase *base) { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/hbcore.pro --- a/src/hbcore/hbcore.pro Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/hbcore.pro Thu Sep 02 20:44:51 2010 +0300 @@ -161,11 +161,11 @@ for(file, exportqm.sources) { file2 = $$replace(file, .ts, .qm) file3 = $${PWD}/$$file2 - BLD_INF_RULES.prj_exports += "$$section(file3, ":", 1) $$exportqm.path/$$basename(file2)" + hbPrjExport("$$file3", "$$exportqm.path/$$basename(file2)") } # i18n's other files export - BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/i18n/translations/language_list.txt $${EPOCROOT}epoc32/winscw/c/resource/hbi18n/translations/language_list.txt" - BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/i18n/translations/locale_mappings.txt $${EPOCROOT}epoc32/winscw/c/resource/hbi18n/translations/locale_mappings.txt" + 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") LIBS += -lapparc LIBS += -lavkon @@ -182,19 +182,18 @@ LIBS += -lsystemtoneservice # central repository - BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C304.txt $${EPOCROOT}epoc32/data/z/private/10202BE9/2002C304.txt" - BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C304.txt $${EPOCROOT}epoc32/release/winscw/udeb/z/private/10202BE9/2002C304.txt" - BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C304.txt $${EPOCROOT}epoc32/release/winscw/urel/z/private/10202BE9/2002C304.txt" - - BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C384.txt $${EPOCROOT}epoc32/data/z/private/10202BE9/2002C384.txt" - BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C384.txt $${EPOCROOT}epoc32/release/winscw/udeb/z/private/10202BE9/2002C384.txt" - BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C384.txt $${EPOCROOT}epoc32/release/winscw/urel/z/private/10202BE9/2002C384.txt" - BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C3AE.txt $${EPOCROOT}epoc32/data/z/private/10202BE9/2002C3AE.txt" - BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C3AE.txt $${EPOCROOT}epoc32/release/winscw/udeb/z/private/10202BE9/2002C3AE.txt" - BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C3AE.txt $${EPOCROOT}epoc32/release/winscw/urel/z/private/10202BE9/2002C3AE.txt" - BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/20022E82.txt $${EPOCROOT}epoc32/data/z/private/10202BE9/20022E82.txt" - BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/20022E82.txt $${EPOCROOT}epoc32/release/winscw/udeb/z/private/10202BE9/20022E82.txt" - BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/20022E82.txt $${EPOCROOT}epoc32/release/winscw/urel/z/private/10202BE9/20022E82.txt" + hbPrjExport("$${PWD}/resources/centralrepository/2002C304.txt", "$${EPOCROOT}epoc32/data/z/private/10202BE9/2002C304.txt") + hbPrjExport("$${PWD}/resources/centralrepository/2002C304.txt", "$${EPOCROOT}epoc32/release/winscw/udeb/z/private/10202BE9/2002C304.txt") + hbPrjExport("$${PWD}/resources/centralrepository/2002C304.txt", "$${EPOCROOT}epoc32/release/winscw/urel/z/private/10202BE9/2002C304.txt") + hbPrjExport("$${PWD}/resources/centralrepository/2002C384.txt", "$${EPOCROOT}epoc32/data/z/private/10202BE9/2002C384.txt") + hbPrjExport("$${PWD}/resources/centralrepository/2002C384.txt", "$${EPOCROOT}epoc32/release/winscw/udeb/z/private/10202BE9/2002C384.txt") + hbPrjExport("$${PWD}/resources/centralrepository/2002C384.txt", "$${EPOCROOT}epoc32/release/winscw/urel/z/private/10202BE9/2002C384.txt") + hbPrjExport("$${PWD}/resources/centralrepository/2002C3AE.txt", "$${EPOCROOT}epoc32/data/z/private/10202BE9/2002C3AE.txt") + hbPrjExport("$${PWD}/resources/centralrepository/2002C3AE.txt", "$${EPOCROOT}epoc32/release/winscw/udeb/z/private/10202BE9/2002C3AE.txt") + hbPrjExport("$${PWD}/resources/centralrepository/2002C3AE.txt", "$${EPOCROOT}epoc32/release/winscw/urel/z/private/10202BE9/2002C3AE.txt") + hbPrjExport("$${PWD}/resources/centralrepository/20022E82.txt", "$${EPOCROOT}epoc32/data/z/private/10202BE9/20022E82.txt") + hbPrjExport("$${PWD}/resources/centralrepository/20022E82.txt", "$${EPOCROOT}epoc32/release/winscw/udeb/z/private/10202BE9/20022E82.txt") + hbPrjExport("$${PWD}/resources/centralrepository/20022E82.txt", "$${EPOCROOT}epoc32/release/winscw/urel/z/private/10202BE9/20022E82.txt") } hb_maemo_dui { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/i18n/hbdirectorynamelocalizer.cpp --- a/src/hbcore/i18n/hbdirectorynamelocalizer.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/i18n/hbdirectorynamelocalizer.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -92,9 +92,9 @@ } QString result; - + if ( d->localizedNames.count() > 0 ) { - QString searchKey = sourceText; + QString searchKey = sourceText; searchKey = searchKey.replace("\\","/"); searchKey = searchKey.replace("\\\\","/"); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/i18n/hbdirectorynamelocalizer.h --- a/src/hbcore/i18n/hbdirectorynamelocalizer.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/i18n/hbdirectorynamelocalizer.h Thu Sep 02 20:44:51 2010 +0300 @@ -38,10 +38,10 @@ ~HbDirectoryNameLocalizer(); QString translate( QString& sourceText ) const; -private: +private: Q_DISABLE_COPY( HbDirectoryNameLocalizer ) - HbDirectoryNameLocalizerPrivate* d; + HbDirectoryNameLocalizerPrivate* d; }; #endif /* DIRECTORYNAMELOCALIZER_H */ diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/i18n/hbdirectorynamelocalizer_p.h --- a/src/hbcore/i18n/hbdirectorynamelocalizer_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/i18n/hbdirectorynamelocalizer_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -31,7 +31,7 @@ class HB_CORE_PRIVATE_EXPORT HbDirectoryNameLocalizerPrivate { public: - QMap localizedNames; + QMap localizedNames; }; #endif /* DIRECTORYNAMELOCALIZER_P_H */ diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/i18n/hbdntxmlreader.cpp --- a/src/hbcore/i18n/hbdntxmlreader.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/i18n/hbdntxmlreader.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -37,51 +37,51 @@ */ HbDNTXmlReader::HbDNTXmlReader() { - fullPaths = NULL; - pathStrings = NULL; - - - parseDirectoryPaths = false; - parsePathStrings = false; - elementNumber = 0; - validElement = false; - twoDone = false; + 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); + QString languageStr; + languageStr.append(DirectoryLocalizerTranslationsFile); - languageStr.append(locale.name()); + 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); - } + bool succeed = false; + succeed = trans->load("z:" + languageStr); + if ( succeed == false ) { + trans->load("c:" + languageStr); + } #else // Q_OS_SYMBIAN - trans->load(languageStr); + trans->load(languageStr); #endif // Q_OS_SYMBIAN - QCoreApplication::installTranslator(trans); - validElement = false; - - QFile xmlFile(DirectoryLocalizerFile); + QCoreApplication::installTranslator(trans); + validElement = false; + + QFile xmlFile(DirectoryLocalizerFile); - pathStrings = new QMap; - fullPaths = new QMap; + 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 +91,8 @@ { delete fullPaths; delete pathStrings; - QCoreApplication::removeTranslator(trans); - delete trans; + QCoreApplication::removeTranslator(trans); + delete trans; } /*! @@ -112,50 +112,50 @@ \return true */ bool HbDNTXmlReader::startElement( const QString & , - const QString & , - const QString & qName, - const QXmlAttributes & ) + const QString & , + const QString & qName, + const QXmlAttributes & ) { if( qName == DirectoryLocalizerPathStringsStr ) { - parsePathStrings = true; // set to parse Path - parseDirectoryPaths = false; - elements.clear(); - elementNumber = 0; // Set current path element number as undefined - twoDone = false; + parsePathStrings = true; // set to parse Path + parseDirectoryPaths = false; + elements.clear(); + elementNumber = 0; // Set current path element number as undefined + twoDone = false; } else if( qName == DirectoryLocalizerFullDirectoryPathsStr ) { - parsePathStrings = false; - parseDirectoryPaths = true; // set to parse localized path - elements.clear(); - elementNumber = 0; // set current path element as undefined - twoDone = false; + parsePathStrings = false; + parseDirectoryPaths = true; // set to parse localized path + elements.clear(); + elementNumber = 0; // set current path element as undefined + twoDone = false; } else if( qName == DirectoryLocalizerNameStr ) { - elementNumber = 1; // - validElement = true; - twoDone = false; + elementNumber = 1; // + validElement = true; + twoDone = false; } else if( qName == DirectoryLocalizerPathStr ){ - elementNumber = 2; - validElement = true; - twoDone = false; + elementNumber = 2; + validElement = true; + twoDone = false; } else if( qName == DirectoryLocalizerTranslationStr){ - elementNumber = 3; - validElement = true; + elementNumber = 3; + validElement = true; } else if( qName == DirectoryLocalizerRootPathStr ){ - elementNumber = 1; - validElement = true; - twoDone = false; + elementNumber = 1; + validElement = true; + twoDone = false; } else if( qName == DirectoryLocalizerLocalizedPathStr ){ - elementNumber = 2; - validElement = true; - twoDone = false; + elementNumber = 2; + validElement = true; + twoDone = false; } else if( qName == DirectoryLocalizerLocalizedNameStr ){ - elementNumber = 3; - validElement = true; - twoDone = false; + elementNumber = 3; + validElement = true; + twoDone = false; } else { elementNumber++; } - - return true; + + return true; } /*! @@ -179,14 +179,14 @@ } if( validElement ) { - if(parsePathStrings) { - switch(elementNumber) { + if(parsePathStrings) { + switch(elementNumber) { case 1: // DirectoryLocalizerNameStr t=t.toLower(); elements.insert(0,t); break; case 2: // DirectoryLocalizerPathStr - t= t.replace(DirectoryLocalizerDirectorySeparatorX2,DirectoryLocalizerDirectorySeparatorX1); + t= t.replace(DirectoryLocalizerDirectorySeparatorX2,DirectoryLocalizerDirectorySeparatorX1); t=t.toLower(); if ( elements.count() > 1 ) { elements.insert(1,t); @@ -194,7 +194,7 @@ elements.append(t); } break; - case 3: // DirectoryLocalizerTranslationStr + case 3: // DirectoryLocalizerTranslationStr elements.insert(0,t); localizedStr = QCoreApplication::translate(0,charPtr); @@ -202,7 +202,7 @@ ba = 0; if( localizedStr == t ){ - localizedStr = ""; + localizedStr = ""; } elements.append(localizedStr); break; @@ -210,13 +210,13 @@ elements.append(t); break; } - validElement = false; - } else if(parseDirectoryPaths) { - switch(elementNumber) { + validElement = false; + } else if(parseDirectoryPaths) { + switch(elementNumber) { case 1: // DirectoryLocalizerRootPathStr temp = t; break; - case 2: // DirectoryLocalizerLocalizedPathStr + case 2: // DirectoryLocalizerLocalizedPathStr x = pathStrings->value(temp); y = pathStrings->value(t); @@ -230,12 +230,12 @@ x = pathStrings->value(t); elements.insert(1, x); break; - default: + default: break; - } - validElement = false; - } - } + } + validElement = false; + } + } if (ba) { delete ba; } @@ -252,26 +252,26 @@ const QString &, const QString & qName ) { - if( qName == DirectoryLocalizerPathStringsStr ) { - parsePathStrings = false; - parseDirectoryPaths = false; - elements.clear(); - elementNumber = 0; - } else if( qName == DirectoryLocalizerFullDirectoryPathsStr ) { - parsePathStrings = false; - - parseDirectoryPaths = false; - elements.clear(); - elementNumber = 0; - } - - if( parsePathStrings && elements.count() > 1 ) { + if( qName == DirectoryLocalizerPathStringsStr ) { + parsePathStrings = false; + parseDirectoryPaths = false; + elements.clear(); + elementNumber = 0; + } else if( qName == DirectoryLocalizerFullDirectoryPathsStr ) { + parsePathStrings = false; + + parseDirectoryPaths = false; + elements.clear(); + elementNumber = 0; + } + + if( parsePathStrings && elements.count() > 1 ) { pathStrings->insertMulti(elements.at(0), elements.at(1)); - elements.clear(); + elements.clear(); } else if(parseDirectoryPaths && elements.count() > 1) { - QString element1, element2; - switch(elements.count()) { - case 2: + QString element1, element2; + switch(elements.count()) { + case 2: if(!twoDone){ fullPaths->insertMulti(elements.at(0),elements.at(1)); twoDone = true; @@ -280,9 +280,9 @@ break; default: break; - } - } - return true; + } + } + return true; } /*! @@ -300,7 +300,7 @@ */ QMap HbDNTXmlReader::getFullPaths() { - return *fullPaths; + return *fullPaths; } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/i18n/hbdntxmlreader_p.h --- a/src/hbcore/i18n/hbdntxmlreader_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/i18n/hbdntxmlreader_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -52,7 +52,7 @@ class HbDNTXmlReader : public QXmlDefaultHandler { public: - HbDNTXmlReader(); + HbDNTXmlReader(); ~HbDNTXmlReader(); bool startDocument(); @@ -69,17 +69,17 @@ QMap getFullPaths(); private: QTranslator* trans; - QMap* fullPaths; - QMap* pathStrings; - - bool parseDirectoryPaths; - bool parsePathStrings; - int elementNumber; - bool validElement; - - QStringList elements; - QString temp; - bool twoDone; + QMap* fullPaths; + QMap* pathStrings; + + bool parseDirectoryPaths; + bool parsePathStrings; + int elementNumber; + bool validElement; + + QStringList elements; + QString temp; + bool twoDone; }; #endif // HBDNTXMLREADER_P_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/i18n/hbextendedlocale.cpp --- a/src/hbcore/i18n/hbextendedlocale.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/i18n/hbextendedlocale.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -133,7 +133,7 @@ QChar HbExtendedLocale::dateSeparator( int index ) const { #if defined(Q_OS_SYMBIAN) - _symbianLocale.LoadSystemSettings(); + _symbianLocale.LoadSystemSettings(); TChar val = _symbianLocale.GetLocale()->DateSeparator(index); return QChar(val); #else @@ -163,7 +163,7 @@ if ( index < 0 || index > 3 ) { return false; } - _symbianLocale.LoadSystemSettings(); + _symbianLocale.LoadSystemSettings(); TChar symbianch( ch.unicode() ); _symbianLocale.GetLocale()->SetDateSeparator(symbianch, index); _symbianLocale.GetLocale()->Set(); @@ -443,9 +443,9 @@ _symbianLocale.LoadSystemSettings(); TLocalePos position = _symbianLocale.GetLocale()->AmPmSymbolPosition(); if ( position == ELocaleBefore ) { - return HbExtendedLocale::Before; - } else { - return HbExtendedLocale::After; + return HbExtendedLocale::Before; + } else { + return HbExtendedLocale::After; } #else return HbExtendedLocale::After; @@ -533,11 +533,11 @@ switch ( format ) { default: case QLocale::MetricSystem: - set = EUnitsMetric; - break; + set = EUnitsMetric; + break; case QLocale::ImperialSystem: - set = EUnitsImperial; - break; + set = EUnitsImperial; + break; } _symbianLocale.LoadSystemSettings(); @@ -589,11 +589,11 @@ switch ( format ) { default: case QLocale::MetricSystem: - set = EUnitsMetric; - break; + set = EUnitsMetric; + break; case QLocale::ImperialSystem: - set = EUnitsImperial; - break; + set = EUnitsImperial; + break; } _symbianLocale.LoadSystemSettings(); _symbianLocale.GetLocale()->SetUnitsDistanceLong(set); @@ -620,11 +620,11 @@ switch ( format ) { default: case QLocale::MetricSystem: - set = EUnitsMetric; - break; + set = EUnitsMetric; + break; case QLocale::ImperialSystem: - set = EUnitsImperial; - break; + set = EUnitsImperial; + break; } _symbianLocale.LoadSystemSettings(); _symbianLocale.GetLocale()->SetUnitsGeneral(set); @@ -1311,7 +1311,7 @@ { ELangBasque, "eu_ES" }, { ELangGalician, "gl_ES" }, #endif - { ELangJavanese, "jv_ID" }, + { ELangJavanese, "jv_ID" }, { ELangMaithili, "bh_IN" }, { ELangAzerbaijani_Latin, "az_AZ" }, { ELangOriya, "or_IN" }, @@ -1559,7 +1559,7 @@ ++i; if ( i >= sys_fmt.size() ) { break; - } + } c = sys_fmt.at(i); @@ -1739,8 +1739,8 @@ } if ( !abbrev_next && locale->AmPmSpaceBetween() ) { - if ( pos == ELocaleBefore ) { - qtampm.append(QLatin1Char(' ')); + if ( pos == ELocaleBefore ) { + qtampm.append(QLatin1Char(' ')); } else { qtampm.prepend(QLatin1Char(' ')); } @@ -2127,7 +2127,7 @@ { #if defined(Q_OS_SYMBIAN) QLocale::system(); - _symbianLocale.LoadSystemSettings(); + _symbianLocale.LoadSystemSettings(); #endif } @@ -2166,7 +2166,7 @@ sp.reset(cleanup); } } - QString resultString; + QString resultString; _symbianLocale.LoadSystemSettings(); TDateTime s60DateTime; @@ -2182,30 +2182,30 @@ else { return QString(""); } - - TTime s60Date(s60DateTime); - - HBufC *s60Format = QString2HBufC(dateFormat); + + TTime s60Date(s60DateTime); + + HBufC *s60Format = QString2HBufC(dateFormat); if (!s60Format) { return QString(); } QScopedPointer sp1(s60Format); - - HBufC *s60DateStr = HBufC::New(50); + + HBufC *s60DateStr = HBufC::New(50); if (!s60DateStr) { return QString(); } QScopedPointer sp2(s60DateStr); TPtr s60FormatPtr = s60Format->Des(); - TPtr s60DatePtr = s60DateStr->Des(); - - TRAPD(err, s60Date.FormatL( s60DatePtr, s60FormatPtr )); - if( err ){ - return QString(""); - } - return TDesC2QString(s60DateStr->Des()); - + TPtr s60DatePtr = s60DateStr->Des(); + + TRAPD(err, s60Date.FormatL( s60DatePtr, s60FormatPtr )); + if( err ){ + return QString(""); + } + return TDesC2QString(s60DateStr->Des()); + #else Q_UNUSED(dateFormat); return toString(date, ShortFormat ); @@ -2236,37 +2236,37 @@ } QString resultString; - + TDateTime s60DateTime; if (s60DateTime.Set( 0, TMonth(0), 0, time.hour(), time.minute(), time.second(), time.msec())) { return QString(); } - - TTime s60Time(s60DateTime); - - HBufC *s60Format = QString2HBufC(timeFormat); + + TTime s60Time(s60DateTime); + + HBufC *s60Format = QString2HBufC(timeFormat); if (!s60Format) { return QString(); } QScopedPointer sp1(s60Format); - - - HBufC *s60TimeStr = HBufC::New(50); + + + HBufC *s60TimeStr = HBufC::New(50); if (!s60TimeStr) { return QString(); } QScopedPointer sp2(s60TimeStr); - - TPtr s60FormatPtr = s60Format->Des(); - TPtr s60TimePtr = s60TimeStr->Des(); - - TRAPD(err, s60Time.FormatL( s60TimePtr, s60FormatPtr )); - if( err ){ - return QString(""); - } - return TDesC2QString(s60TimeStr->Des()); + + TPtr s60FormatPtr = s60Format->Des(); + TPtr s60TimePtr = s60TimeStr->Des(); + + TRAPD(err, s60Time.FormatL( s60TimePtr, s60FormatPtr )); + if( err ){ + return QString(""); + } + return TDesC2QString(s60TimeStr->Des()); #else Q_UNUSED(timeFormat); return toString(time, ShortFormat); -#endif +#endif } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/i18n/hbfindfile.cpp --- a/src/hbcore/i18n/hbfindfile.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/i18n/hbfindfile.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -122,7 +122,7 @@ QString drives = availableDrives(); for (int i = 0; i < drives.size(); i++) { if (drives.at(i) == defaultDrive) { - continue; + continue; } file = drives.at(i) + QString(":") + str; QFileInfo info(file); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/i18n/hblanguageutil.cpp --- a/src/hbcore/i18n/hblanguageutil.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/i18n/hblanguageutil.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -270,7 +270,7 @@ } if (!setLocale(language)) { - delete commonEngineRepository; + delete commonEngineRepository; return false; } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/i18n/hblocaleutil.cpp --- a/src/hbcore/i18n/hblocaleutil.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/i18n/hblocaleutil.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -302,7 +302,7 @@ if(mappingList.isEmpty()) { readMappings(); } - + int lanCode = -1; QString dllExt = ""; for (int i = 0; i < mappingList.count(); ++i) { @@ -516,6 +516,26 @@ dummy.SaveSystemSettings(); // cause localeprivate update on next qlocale object QSystemLocale dummy2; + + // Update region to cent rep + bool ok; + int regionCode = mapping.regionDllId.toInt(&ok); + if (!ok) { + return false; + } + + CRepository* commonEngineRepository = 0; + TRAPD( err1, commonEngineRepository = CRepository::NewL( KCRUidCommonEngineKeys ) ); + if ( err1 != KErrNone ) { + return false; + } + + if ( commonEngineRepository->Set( KGSRegion, regionCode ) != KErrNone ) { + delete commonEngineRepository; + return false; + } + delete commonEngineRepository; + return true; } } @@ -722,6 +742,25 @@ dummy.SaveSystemSettings(); // cause localeprivate update on next qlocale object QSystemLocale dummy2; + // Update collation to cent rep + bool ok; + int colCode = mapping.collationDllId.toInt(&ok); + if (!ok) { + return false; + } + + CRepository* commonEngineRepository = 0; + TRAPD( err1, commonEngineRepository = CRepository::NewL( KCRUidCommonEngineKeys ) ); + if ( err1 != KErrNone ) { + return false; + } + + if ( commonEngineRepository->Set( KGSCollation, colCode ) != KErrNone ) { + delete commonEngineRepository; + return false; + } + delete commonEngineRepository; + return true; } } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/i18n/hbngnormalnumber.cpp --- a/src/hbcore/i18n/hbngnormalnumber.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/i18n/hbngnormalnumber.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -27,7 +27,7 @@ #include "hbnumbergrpxmlreader_p.h" namespace NgNormalNumber { - QHash countryList; + QHash countryList; } /*! @@ -38,31 +38,31 @@ \return grouped numbers */ QString HbNgNormalNumber::normalNumberGrouping( const QString &number, - const QLocale::Country &country ) + const QLocale::Country &country ) { - QString decimal; - QString group; - int firstNumber; - int lastNumber; - int dot; - bool sign; - QList patternBlockSizes; - - // Checking received 'number' parameter... - // Here we initialize variables... - if ( HbNgNormalNumber::checkingNumber(number, firstNumber, lastNumber, dot, sign) == false ) { - return QString(); - } - - // Checking XML... - // Here we initialize (more) variables... - if ( HbNgNormalNumber::checkingXML(country, decimal, group, patternBlockSizes) == false ) { - return QString(); - } - - // Formating number group... - // Here we use those variables... - return HbNgNormalNumber::formatingGroup(number, firstNumber, lastNumber, dot, sign, decimal, group, patternBlockSizes); + QString decimal; + QString group; + int firstNumber; + int lastNumber; + int dot; + bool sign; + QList patternBlockSizes; + + // Checking received 'number' parameter... + // Here we initialize variables... + if ( HbNgNormalNumber::checkingNumber(number, firstNumber, lastNumber, dot, sign) == false ) { + return QString(); + } + + // Checking XML... + // Here we initialize (more) variables... + if ( HbNgNormalNumber::checkingXML(country, decimal, group, patternBlockSizes) == false ) { + return QString(); + } + + // Formating number group... + // Here we use those variables... + return HbNgNormalNumber::formatingGroup(number, firstNumber, lastNumber, dot, sign, decimal, group, patternBlockSizes); } /*! @@ -76,97 +76,97 @@ \return true if valid */ bool HbNgNormalNumber::checkingNumber( const QString &number, - int &firstNumber, - int &lastNumber, - int &dot, - bool &sign ) + int &firstNumber, + int &lastNumber, + int &dot, + bool &sign ) { - firstNumber = -1; - lastNumber = -1; - dot = -1; - sign = false; - int index = 0; - int nrSize = number.size(); - - for ( index = 0; index < nrSize; index++ ) { - switch ( number.at(index).toAscii() ) { - case 43: // "+" - case 45: // "-" - if ( index < number.size()-1 ) { - if ( index > 0 ) { - // If sign (+/-) present then it should be a first or last (for arabic) character - return false; - } else { - // Sign (+/-) is the first character - sign=true; - } - } else { - if ( sign ) { - // Sign (+/-) already exists as the first character - // Sign cannot be in both ends same time - return false; - } else { - // Sign (+/-) is the last character - sign=true; - } - } - break; - case 46: // "." - if ( firstNumber == -1 ) { - // We don't support '.x' format - // At least zero should be a first character, example 0.x - return false; - } - if ( dot != -1 ) { - // We don't support multiple dots - // Only one dot is allowed - return false; - } - if ( index == (nrSize-2) ) { - if ( number.at(index+1).toAscii() == 43) { - // We don't support 'x.+' format - // At least zero should be a second last character, example x.0+ - return false; - } - if ( number.at(index+1).toAscii() == 45) { - // We don't support 'x.-' format - // At least zero should be a second last character, example x.0- - return false; - } - } - if ( index == (nrSize-1) ) { - // We don't support 'x.' format - // At least zero should be a last character, example x.0 - return false; - } - dot = index; - break; - case 48: // "0" - case 49: // "1" - case 50: // "2" - case 51: // "3" - case 52: // "4" - case 53: // "5" - case 54: // "6" - case 55: // "7" - case 56: // "8" - case 57: // "9" - if ( firstNumber == -1 ) { - firstNumber = index; - } - lastNumber = index; - break; - default: - // String contains unknown or invalid character(s) - return false; - } - } - - if ( firstNumber == -1 ) { - // String doesn't contain any number for formating - return false; - } - + firstNumber = -1; + lastNumber = -1; + dot = -1; + sign = false; + int index = 0; + int nrSize = number.size(); + + for ( index = 0; index < nrSize; index++ ) { + switch ( number.at(index).toAscii() ) { + case 43: // "+" + case 45: // "-" + if ( index < number.size()-1 ) { + if ( index > 0 ) { + // If sign (+/-) present then it should be a first or last (for arabic) character + return false; + } else { + // Sign (+/-) is the first character + sign=true; + } + } else { + if ( sign ) { + // Sign (+/-) already exists as the first character + // Sign cannot be in both ends same time + return false; + } else { + // Sign (+/-) is the last character + sign=true; + } + } + break; + case 46: // "." + if ( firstNumber == -1 ) { + // We don't support '.x' format + // At least zero should be a first character, example 0.x + return false; + } + if ( dot != -1 ) { + // We don't support multiple dots + // Only one dot is allowed + return false; + } + if ( index == (nrSize-2) ) { + if ( number.at(index+1).toAscii() == 43) { + // We don't support 'x.+' format + // At least zero should be a second last character, example x.0+ + return false; + } + if ( number.at(index+1).toAscii() == 45) { + // We don't support 'x.-' format + // At least zero should be a second last character, example x.0- + return false; + } + } + if ( index == (nrSize-1) ) { + // We don't support 'x.' format + // At least zero should be a last character, example x.0 + return false; + } + dot = index; + break; + case 48: // "0" + case 49: // "1" + case 50: // "2" + case 51: // "3" + case 52: // "4" + case 53: // "5" + case 54: // "6" + case 55: // "7" + case 56: // "8" + case 57: // "9" + if ( firstNumber == -1 ) { + firstNumber = index; + } + lastNumber = index; + break; + default: + // String contains unknown or invalid character(s) + return false; + } + } + + if ( firstNumber == -1 ) { + // String doesn't contain any number for formating + return false; + } + return true; } @@ -180,50 +180,50 @@ \return true if successful */ bool HbNgNormalNumber::checkingXML( const QLocale::Country &country, - QString &decimal, - QString &group, - QList &patternBlockSizes ) + QString &decimal, + QString &group, + QList &patternBlockSizes ) { - decimal = ""; - group = ""; - QString pattern = ""; - - // Firstly we try to find needed data from the list... - QHash::iterator iter = NgNormalNumber::countryList.find(country); - if ( iter == NgNormalNumber::countryList.end() ) { - // Data not found. So now we read XML file... - HbNumberGrpXmlReader numberGrpReader(country); - pattern = numberGrpReader.getPattern(); - decimal = numberGrpReader.getDecimal(); - group = numberGrpReader.getGroup(); - - if ( (pattern.isEmpty()) || (decimal.isEmpty()) ) { - // XML doesn't contain all needed information or reading has failed - return false; - } - - // Checking pattern... - patternBlockSizes = HbNgNormalNumber::checkingPattern(pattern); - if ( patternBlockSizes.isEmpty() ) { - // Pattern was invalid or corrupted - return false; - } - - // Updating the list with new information... - HbNgNormalNumber::CountryData tempCountryData; - tempCountryData.pattern = pattern; - tempCountryData.decimal = decimal; - tempCountryData.group = group; - tempCountryData.patternBlockSizes = patternBlockSizes; - NgNormalNumber::countryList.insert(country, tempCountryData); - } else { - // Data found - HbNgNormalNumber::CountryData tempCountryData2 = iter.value(); - pattern = tempCountryData2.pattern; - decimal = tempCountryData2.decimal; - group = tempCountryData2.group; - patternBlockSizes = tempCountryData2.patternBlockSizes; - } + decimal = ""; + group = ""; + QString pattern = ""; + + // Firstly we try to find needed data from the list... + QHash::iterator iter = NgNormalNumber::countryList.find(country); + if ( iter == NgNormalNumber::countryList.end() ) { + // Data not found. So now we read XML file... + HbNumberGrpXmlReader numberGrpReader(country); + pattern = numberGrpReader.getPattern(); + decimal = numberGrpReader.getDecimal(); + group = numberGrpReader.getGroup(); + + if ( (pattern.isEmpty()) || (decimal.isEmpty()) ) { + // XML doesn't contain all needed information or reading has failed + return false; + } + + // Checking pattern... + patternBlockSizes = HbNgNormalNumber::checkingPattern(pattern); + if ( patternBlockSizes.isEmpty() ) { + // Pattern was invalid or corrupted + return false; + } + + // Updating the list with new information... + HbNgNormalNumber::CountryData tempCountryData; + tempCountryData.pattern = pattern; + tempCountryData.decimal = decimal; + tempCountryData.group = group; + tempCountryData.patternBlockSizes = patternBlockSizes; + NgNormalNumber::countryList.insert(country, tempCountryData); + } else { + // Data found + HbNgNormalNumber::CountryData tempCountryData2 = iter.value(); + pattern = tempCountryData2.pattern; + decimal = tempCountryData2.decimal; + group = tempCountryData2.group; + patternBlockSizes = tempCountryData2.patternBlockSizes; + } return true; } @@ -236,42 +236,42 @@ */ QList HbNgNormalNumber::checkingPattern( const QString &pattern ) { - int index = 0; - int comma = -1; - int patternBlockSize = 0; - QList blockSizes; - - for ( index = 0; index < pattern.size(); index++ ) { - if ( pattern.at(index).toAscii() == 44 ) { // Comma - if ( comma == -1 ) { - comma = index; - } else { - // Calculating size of block... - patternBlockSize = index - comma - 1; - if ( patternBlockSize < 1 ) { - // Pattern was invalid or corrupted - return QList(); - } - blockSizes.append(patternBlockSize); - comma = index; - } - } else if ( pattern.at(index).toAscii() == 46 ) { // Dot - if ( comma == -1 ) { - patternBlockSize = 99999; - } else { - // Calculating size of block... - patternBlockSize = index - comma - 1; - if ( patternBlockSize < 1 ) { - // Pattern was invalid or corrupted - return QList(); - } - } - blockSizes.append(patternBlockSize); - break; - } - } - - return blockSizes; + int index = 0; + int comma = -1; + int patternBlockSize = 0; + QList blockSizes; + + for ( index = 0; index < pattern.size(); index++ ) { + if ( pattern.at(index).toAscii() == 44 ) { // Comma + if ( comma == -1 ) { + comma = index; + } else { + // Calculating size of block... + patternBlockSize = index - comma - 1; + if ( patternBlockSize < 1 ) { + // Pattern was invalid or corrupted + return QList(); + } + blockSizes.append(patternBlockSize); + comma = index; + } + } else if ( pattern.at(index).toAscii() == 46 ) { // Dot + if ( comma == -1 ) { + patternBlockSize = 99999; + } else { + // Calculating size of block... + patternBlockSize = index - comma - 1; + if ( patternBlockSize < 1 ) { + // Pattern was invalid or corrupted + return QList(); + } + } + blockSizes.append(patternBlockSize); + break; + } + } + + return blockSizes; } /*! @@ -288,65 +288,65 @@ \return grouped numbers */ QString HbNgNormalNumber::formatingGroup( const QString &number, - const int &firstNumber, - const int &lastNumber, - const int &dot, - const bool &sign, - const QString &decimal, - const QString &group, - const QList &patternBlockSizes ) + const int &firstNumber, + const int &lastNumber, + const int &dot, + const bool &sign, + const QString &decimal, + const QString &group, + const QList &patternBlockSizes ) { - QString formated = ""; - int index = 0; - int patternBlockSize = 0; - int blockCounter = 0; - int numberOfBlocks = 0; - int nrSize = number.size(); - int tempDot = dot; + QString formated = ""; + int index = 0; + int patternBlockSize = 0; + int blockCounter = 0; + int numberOfBlocks = 0; + int nrSize = number.size(); + int tempDot = dot; - if ( tempDot == -1 ) { - if ( (sign == true) && (lastNumber < nrSize-1) ) { - tempDot = nrSize - 1; - - // Inserting sign (xxx-/+)... - formated.insert(0, number.at(nrSize-1)); - } else { - tempDot = nrSize; - } - } else { - // Inserting decimals (and sign x.xxx-/+)... - formated.append(decimal); - formated.append(number.right(nrSize-tempDot-1)); - } - - // Checking amount of blocks and size of first (last in the list) block for using... - numberOfBlocks = patternBlockSizes.length(); - patternBlockSize = patternBlockSizes.last(); - - for ( index = tempDot-1; index > firstNumber-1; --index ) { - if ( blockCounter < patternBlockSize ) { - // Inserting number... - formated.insert(0, number.at(index)); - blockCounter++; - } else { - // Inserting number and group separator... - formated.insert(0, group); - formated.insert(0, number.at(index)); - blockCounter = 1; - - // Take next size of block in use - numberOfBlocks--; - // Updating the size of block if needed... - if ( numberOfBlocks > 0 ) { - patternBlockSize = patternBlockSizes.at(numberOfBlocks-1); - } - } - } - - if ( firstNumber > 0 ) { - // Inserting sign (+/-xxx)... - formated.insert(0, number.at(0)); - } - - return formated; + if ( tempDot == -1 ) { + if ( (sign == true) && (lastNumber < nrSize-1) ) { + tempDot = nrSize - 1; + + // Inserting sign (xxx-/+)... + formated.insert(0, number.at(nrSize-1)); + } else { + tempDot = nrSize; + } + } else { + // Inserting decimals (and sign x.xxx-/+)... + formated.append(decimal); + formated.append(number.right(nrSize-tempDot-1)); + } + + // Checking amount of blocks and size of first (last in the list) block for using... + numberOfBlocks = patternBlockSizes.length(); + patternBlockSize = patternBlockSizes.last(); + + for ( index = tempDot-1; index > firstNumber-1; --index ) { + if ( blockCounter < patternBlockSize ) { + // Inserting number... + formated.insert(0, number.at(index)); + blockCounter++; + } else { + // Inserting number and group separator... + formated.insert(0, group); + formated.insert(0, number.at(index)); + blockCounter = 1; + + // Take next size of block in use + numberOfBlocks--; + // Updating the size of block if needed... + if ( numberOfBlocks > 0 ) { + patternBlockSize = patternBlockSizes.at(numberOfBlocks-1); + } + } + } + + if ( firstNumber > 0 ) { + // Inserting sign (+/-xxx)... + formated.insert(0, number.at(0)); + } + + return formated; } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/i18n/hbngnormalnumber_p.h --- a/src/hbcore/i18n/hbngnormalnumber_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/i18n/hbngnormalnumber_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -33,34 +33,34 @@ class HB_CORE_EXPORT HbNgNormalNumber { public: - struct CountryData { - QString decimal; - QString group; - QString pattern; - QList patternBlockSizes; - }; - + struct CountryData { + QString decimal; + QString group; + QString pattern; + QList patternBlockSizes; + }; + static QString normalNumberGrouping( const QString &number, const QLocale::Country &country ); private: - static QList checkingPattern( const QString &pattern ); - static bool checkingNumber( const QString &number, - int &firstNumber, - int &lastNumber, - int &dot, - bool &sign ); - static bool checkingXML( const QLocale::Country &country, - QString &decimal, - QString &group, - QList &patternBlockSizes ); - static QString formatingGroup( const QString &number, - const int &firstNumber, - const int &lastNumber, - const int &dot, - const bool &sign, - const QString &decimal, - const QString &group, - const QList &patternBlockSizes ); + static QList checkingPattern( const QString &pattern ); + static bool checkingNumber( const QString &number, + int &firstNumber, + int &lastNumber, + int &dot, + bool &sign ); + static bool checkingXML( const QLocale::Country &country, + QString &decimal, + QString &group, + QList &patternBlockSizes ); + static QString formatingGroup( const QString &number, + const int &firstNumber, + const int &lastNumber, + const int &dot, + const bool &sign, + const QString &decimal, + const QString &group, + const QList &patternBlockSizes ); }; #endif // HBNGNORMALNUMBER_P_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/i18n/hbnumbergrouping.cpp --- a/src/hbcore/i18n/hbnumbergrouping.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/i18n/hbnumbergrouping.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -45,7 +45,7 @@ Example: \snippet{unittest_hbnumbergrouping/unittest_hbnumbergrouping.cpp,1} - + */ /*! @@ -60,17 +60,17 @@ \return modified string. */ QString HbNumberGrouping::formatGeneric( const QString &number, - QLocale::Country country ) + QLocale::Country country ) { - if ( number.size() == 0 ) { - return QString(); - } - - if ( country == QLocale::AnyCountry) { - QLocale locale; - country = locale.country(); - } - + if ( number.size() == 0 ) { + return QString(); + } + + if ( country == QLocale::AnyCountry) { + QLocale locale; + country = locale.country(); + } + return HbNgNormalNumber::normalNumberGrouping(number, country); } @@ -86,17 +86,17 @@ \return modified string. */ QString HbNumberGrouping::formatCurrency( const QString &number, - QLocale::Country country ) + QLocale::Country country ) { - if ( number.size() == 0 ) { - return QString(); - } - - if ( country == QLocale::AnyCountry) { - QLocale locale; - country = locale.country(); - } - + if ( number.size() == 0 ) { + return QString(); + } + + if ( country == QLocale::AnyCountry) { + QLocale locale; + country = locale.country(); + } + return HbNgNormalNumber::normalNumberGrouping(number, country); } @@ -112,16 +112,16 @@ \return modified string. */ QString HbNumberGrouping::formatPhoneNumber( const QString &number, - QLocale::Country country ) + QLocale::Country country ) { - if ( number.size() == 0 ) { - return QString(); - } - - if ( country == QLocale::AnyCountry) { - QLocale locale; - country = locale.country(); - } + if ( number.size() == 0 ) { + return QString(); + } + + if ( country == QLocale::AnyCountry) { + QLocale locale; + country = locale.country(); + } - return QString(); + return QString(); } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/i18n/hbnumbergrpxmlreader.cpp --- a/src/hbcore/i18n/hbnumbergrpxmlreader.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/i18n/hbnumbergrpxmlreader.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -36,31 +36,31 @@ */ HbNumberGrpXmlReader::HbNumberGrpXmlReader( int localeId ) { - locale.setNum(localeId); - locale.insert(0, "C"); - found = false; - done = false; - phase = 0; - decimal = ""; - pattern = ""; - group = ""; + locale.setNum(localeId); + locale.insert(0, "C"); + found = false; + done = false; + phase = 0; + decimal = ""; + pattern = ""; + group = ""; - QFile xmlFile(NumberGroupingFile); + QFile xmlFile(NumberGroupingFile); - 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) ; + } +} /*! \return pattern for grouping */ QString HbNumberGrpXmlReader::getPattern() { - return pattern; + return pattern; } /*! @@ -68,7 +68,7 @@ */ QString HbNumberGrpXmlReader::getGroup() { - return group; + return group; } /*! @@ -76,7 +76,7 @@ */ QString HbNumberGrpXmlReader::getDecimal() { - return decimal; + return decimal; } /*! @@ -104,26 +104,26 @@ \return true */ bool HbNumberGrpXmlReader::startElement( const QString &, - const QString &, - const QString &qName, - const QXmlAttributes & ) + const QString &, + const QString &qName, + const QXmlAttributes & ) { - if ( done ) { - return true; - } + if ( done ) { + return true; + } - if ( found ) { - if ( qName == DecimalStr ) { - phase = 1; - } else if ( qName == GroupStr ) { - phase = 2; - } else if ( qName == PatternStr ) { - phase = 3; - } - } else if ( locale == qName ) { - found = true; - } - return true; + if ( found ) { + if ( qName == DecimalStr ) { + phase = 1; + } else if ( qName == GroupStr ) { + phase = 2; + } else if ( qName == PatternStr ) { + phase = 3; + } + } else if ( locale == qName ) { + found = true; + } + return true; } /*! @@ -140,8 +140,8 @@ QString tmpText; - // This little trick is needed because of limitation in XML reader - // XML reader doesn't read space character corretly + // This little trick is needed because of limitation in XML reader + // XML reader doesn't read space character corretly if ( text.at(0).toAscii() == 32 ) { // " " tmpText = ' '; } else { @@ -149,17 +149,17 @@ } if ( found ) { - if ( phase == 1 ) { //handle Decimal - decimal = tmpText; - } else if ( phase == 2 ) { // handle group - group = tmpText; - } else if ( phase == 3 ) { // handle pattern - pattern = tmpText; - } else {} - - phase = 0; + if ( phase == 1 ) { //handle Decimal + decimal = tmpText; + } else if ( phase == 2 ) { // handle group + group = tmpText; + } else if ( phase == 3 ) { // handle pattern + pattern = tmpText; + } else {} + + phase = 0; } - return true; + return true; } /*! @@ -172,11 +172,11 @@ const QString &, const QString &qName ) { - if ( locale == qName ) { - done = true; - } + if ( locale == qName ) { + done = true; + } - return true; + return true; } /*! diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/i18n/hbnumbergrpxmlreader_p.h --- a/src/hbcore/i18n/hbnumbergrpxmlreader_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/i18n/hbnumbergrpxmlreader_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -40,7 +40,7 @@ class HbNumberGrpXmlReader : public QXmlDefaultHandler { public: - HbNumberGrpXmlReader( int localeId ); + HbNumberGrpXmlReader( int localeId ); ~HbNumberGrpXmlReader(); bool startDocument(); @@ -57,16 +57,16 @@ QString getPattern(); QString getGroup(); QString getDecimal(); - + private: - QString locale; - QString pattern; - QString group; - QString decimal; - bool found; - bool done; - int phase; - + QString locale; + QString pattern; + QString group; + QString decimal; + bool found; + bool done; + int phase; + }; #endif // NUMBERGRPXMLREADER_P_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/i18n/hbstringutil.cpp --- a/src/hbcore/i18n/hbstringutil.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/i18n/hbstringutil.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -109,9 +109,9 @@ TPtrC s1Ptr( strFrom.utf16() ); TPtrC s2Ptr( strToMatch.utf16() ); - if ( (maxLevel < 0) || (maxLevel > 3) ) { - maxLevel = 0; - } + if ( (maxLevel < 0) || (maxLevel > 3) ) { + maxLevel = 0; + } if ( (flags < 0) || (flags > 127) ) { flags = Default; } @@ -154,7 +154,7 @@ \param flags The flags that will be used. Default value is Default. \return Positive if source string is greater, negative if it is less and - zero if the content of both strings match. + zero if the content of both strings match. Example: \snippet{unittest_hbstringutil/unittest_hbstringutil.cpp,1} @@ -166,9 +166,9 @@ TPtrC s1Ptr(string1.utf16()); TPtrC s2Ptr(string2.utf16()); - if ( (maxLevel < 0) || (maxLevel > 3) ) { - maxLevel = 3; - } + if ( (maxLevel < 0) || (maxLevel > 3) ) { + maxLevel = 3; + } if ( (flags < 0) || (flags > 127) ) { flags = Default; } @@ -213,9 +213,9 @@ TPtrC s1Ptr( strFrom.utf16() ); TPtrC s2Ptr( strToFind.utf16() ); - if ( (maxLevel < 0) || (maxLevel > 3) ) { - maxLevel = 0; - } + if ( (maxLevel < 0) || (maxLevel > 3) ) { + maxLevel = 0; + } return s1Ptr.FindC( s2Ptr.Ptr(), s2Ptr.Length(), maxLevel ); @@ -343,15 +343,15 @@ */ QString HbStringUtil::convertDigits( const QString str ) { - HbExtendedLocale locale = HbExtendedLocale::system(); - DigitType digitType = WesternDigit; - if (locale.language() == HbExtendedLocale::Arabic) { - digitType = ArabicIndicDigit; - } else if (locale.language() == HbExtendedLocale::Persian || locale.language() == HbExtendedLocale::Urdu) { - digitType = EasternArabicIndicDigit; - } - QString converted = HbStringUtil::convertDigitsTo(str, digitType); - return converted; + HbExtendedLocale locale = HbExtendedLocale::system(); + DigitType digitType = WesternDigit; + if (locale.language() == HbExtendedLocale::Arabic) { + digitType = ArabicIndicDigit; + } else if (locale.language() == HbExtendedLocale::Persian || locale.language() == HbExtendedLocale::Urdu) { + digitType = EasternArabicIndicDigit; + } + QString converted = HbStringUtil::convertDigitsTo(str, digitType); + return converted; } /*! @@ -382,7 +382,7 @@ convDigit[i] = QChar(convertedDigit); break; default: - convDigit[i] = QChar(digit); + convDigit[i] = QChar(digit); break; }; } @@ -401,18 +401,18 @@ */ void HbStringUtil::sort( QStringList &strList ) { - if ( strList.size() > 1 ) { - qSort(strList.begin(), strList.end(), hbStringUtil_SortHelper); - } + if ( strList.size() > 1 ) { + qSort(strList.begin(), strList.end(), hbStringUtil_SortHelper); + } } bool hbStringUtil_SortHelper( const QString &s1, const QString &s2 ) { - if ( HbStringUtil::compareC(s1, s2) < 0 ) { - // s1 is before s2 - return true; - } else { - // s1 is after s2 (or they are equal) - return false; - } + if ( HbStringUtil::compareC(s1, s2) < 0 ) { + // s1 is before s2 + return true; + } else { + // s1 is after s2 (or they are equal) + return false; + } } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/i18n/translations/languages.ts --- a/src/hbcore/i18n/translations/languages.ts Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/i18n/translations/languages.ts Thu Sep 02 20:44:51 2010 +0300 @@ -15,7 +15,7 @@ German Deutsch - + Spanish Español diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/image/hbicon.cpp --- a/src/hbcore/image/hbicon.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/image/hbicon.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -378,6 +378,27 @@ return result; } +/*! + \internal +*/ +void HbIconPrivate::setAsync(bool async, HbIconEngine::AsyncCallback callback, void *param) +{ + if (engine) { + engine->setAsync(async, callback, param); + } +} + +/*! + \internal +*/ +bool HbIconPrivate::async() const +{ + if (engine) { + return engine->async(); + } + return false; +} + /*! Default constructor. If this constructor is used, the icon name needs to be set * by calling HbIcon::setIconName. */ diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/image/hbicon_p.h --- a/src/hbcore/image/hbicon_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/image/hbicon_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -53,6 +53,8 @@ bool isBadged() const; void setThemedColor(const QColor &color); QColor themedColor() const; + void setAsync(bool async, HbIconEngine::AsyncCallback callback, void *param); + bool async() const; private: // disabled diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/image/hbiconanimator.cpp --- a/src/hbcore/image/hbiconanimator.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/image/hbiconanimator.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -226,9 +226,18 @@ } /*! -* Starts the icon animation if the icon is animated. Otherwise this method has no effect. -* If the animation is already running or finished, it is restarted from the beginning. -* \sa flag HbIcon::NoAutoStartAnimation + Starts the icon animation if the icon is animated. Otherwise this method + has no effect. + + If the animation is already running or finished, it is restarted from the + beginning. + + Note that this function will not override the HbIcon::NoAutoStartAnimation + flag, so if it is called before the first paint of the icon and the flag is + set then the function will have no effect. + + \sa flag HbIcon::NoAutoStartAnimation + \sa stopAnimation */ void HbIconAnimator::startAnimation() { @@ -239,8 +248,18 @@ } /*! -* Stops the icon animation if the icon is animated. Otherwise this method has no effect. -* The icon shows the last frame of the animation. + Stops the icon animation if the icon is animated. Otherwise this method has no effect. + + When an animation is stopped, the icon will show the last frame of the animation. + + Note that in accordance with the lazy loading behavior of icons, this function + has no effect if called before the icon is painted first, so if you need to + make sure that an animation is not automatically started then consider setting + the HbIcon::NoAutoStartAnimation flag for the HbIcon or HbIconItem instead of + using this function. + + \sa flag HbIcon::NoAutoStartAnimation + \sa startAnimation */ void HbIconAnimator::stopAnimation() { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/image/hbiconengine.cpp --- a/src/hbcore/image/hbiconengine.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/image/hbiconengine.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -40,8 +40,8 @@ #include #include - #include +#include #include #include @@ -81,6 +81,8 @@ QColor colorToUse(const QString &iconName) const; public: + HbIconEngine *q; + QSizeF size; struct IconName { @@ -136,6 +138,15 @@ bool signalConnectionsSet; // Icon FormatType HbIconFormatType iconType; + + bool async; + bool asyncOngoing; + HbIconEngine::AsyncCallback asyncCallback; + void *asyncCallbackParam; + int loadFinishedSlotIndex; + + QIcon::Mode curIconMode; + QIcon::State curIconState; }; // Class HbIconEnginePrivate @@ -153,7 +164,12 @@ icon(0), badgeInfo(0), signalConnectionsSet(false), - iconType(INVALID_FORMAT) + iconType(INVALID_FORMAT), + async(false), + asyncOngoing(false), + asyncCallback(0), + asyncCallbackParam(0), + loadFinishedSlotIndex(-1) { if (!iconName.isEmpty()) { HbIconEnginePrivate::IconName newName = {QIcon::Normal, QIcon::Off, iconName}; @@ -179,7 +195,12 @@ icon(0), // HbIconImpl is instance specific, it is recreated when icon is painted. badgeInfo(0), signalConnectionsSet(false), - iconType(INVALID_FORMAT) + iconType(INVALID_FORMAT), + async(false), // similarly to themedColor, this is not copied, it needs to be set explicitly by the clients after copying + asyncOngoing(false), + asyncCallback(0), + asyncCallbackParam(0), + loadFinishedSlotIndex(-1) { if (other.badgeInfo) { badgeInfo = new HbBadgeIcon(); @@ -200,7 +221,12 @@ icon(0), badgeInfo(new HbBadgeIcon), signalConnectionsSet(false), - iconType(INVALID_FORMAT) + iconType(INVALID_FORMAT), + async(false), + asyncOngoing(false), + asyncCallback(0), + asyncCallbackParam(0), + loadFinishedSlotIndex(-1) { // Internalize the icon from the stream stream >> size; @@ -274,6 +300,7 @@ unLoadIcon(); delete badgeInfo; } + /*! \internal @@ -283,8 +310,14 @@ */ void HbIconEnginePrivate::unLoadIcon(bool unloadedByServer) { + HbIconLoader *loader = HbIconLoader::global(); + + // Ignore the result of any outstanding loadIcon request. The + // parameters here must match callback and callbackParam passed to + // HbIconLoader::loadIcon in paintHelper(). + loader->cancelLoadIcon(HbIconEngine::asyncLoadCallback, q); + if (icon) { - HbIconLoader *loader = HbIconLoader::global(); loader->unLoadIcon(icon, unloadedByServer); icon->dispose(); icon = 0; @@ -481,9 +514,7 @@ QIconEngineV2(), d(new HbIconEnginePrivate(QString())) { - // Register the HbIconEngine Instance to HbIconLoader - HbIconLoader *loader = HbIconLoader::global(); - loader->storeIconEngineInfo(this); + init(); } HbIconEngine::HbIconEngine(const QString &iconName) : @@ -491,9 +522,7 @@ QIconEngineV2(), d(new HbIconEnginePrivate(iconName)) { - // Register the HbIconEngine Instance to HbIconLoader - HbIconLoader *loader = HbIconLoader::global(); - loader->storeIconEngineInfo(this); + init(); } HbIconEngine::HbIconEngine(const HbIconEngine &other) : @@ -501,23 +530,15 @@ QIconEngineV2(other), d(new HbIconEnginePrivate(*other.d)) { - HbIcon::Flags newFlags = d->flags; - d->flags = 0; - setFlags(newFlags); - // Register the HbIconEngine Instance to HbIconLoader - HbIconLoader *loader = HbIconLoader::global(); - loader->storeIconEngineInfo(this); + init(); + forceFlagUpdate(); } HbIconEngine::HbIconEngine(QDataStream &stream) : d(new HbIconEnginePrivate(stream)) { - HbIcon::Flags newFlags = d->flags; - d->flags = 0; - setFlags(newFlags); - // Register the HbIconEngine Instance to HbIconLoader - HbIconLoader *loader = HbIconLoader::global(); - loader->storeIconEngineInfo(this); + init(); + forceFlagUpdate(); } HbIconEngine::~HbIconEngine() @@ -528,6 +549,21 @@ delete d; } +void HbIconEngine::init() +{ + d->q = this; + // Register the HbIconEngine Instance to HbIconLoader + HbIconLoader *loader = HbIconLoader::global(); + loader->storeIconEngineInfo(this); +} + +void HbIconEngine::forceFlagUpdate() +{ + HbIcon::Flags newFlags = d->flags; + d->flags = 0; + setFlags(newFlags); +} + bool HbIconEngine::loadFailed(QIcon::Mode mode, QIcon::State state) const { return d->loadFailed.indexOf(mode | (state << 16)) >= 0; @@ -824,6 +860,9 @@ HbIconLoader::global()->updateRenderingMode(paintEngine->type()); } + if (d->async) { + setAsync(false, 0, 0); + } icon = paintHelper(rect.size(), Qt::KeepAspectRatio, mode, state); if (icon) { icon->paint(painter, rect, Qt::AlignCenter); @@ -872,13 +911,13 @@ // If size has not been defined, use icon's default size. if (!s.isValid()) { - // With size (0,0), loader uses the icon's default size. + // With size (0,0) the loader uses the icon's default size. s = QSizeF(0, 0); } // If pixmap has not been loaded yet or parameters affecting to pixmap have changed, // load the pixmap using paintHelper. - if ((!d->icon) || aspectRatioMode != d->aspectRatioMode || mode != d->mode || state != d->state) { + if (!d->asyncOngoing && (!d->icon || aspectRatioMode != d->aspectRatioMode || mode != d->mode || state != d->state)) { d->aspectRatioMode = aspectRatioMode; d->mode = mode; d->state = state; @@ -898,11 +937,14 @@ // Adjust the alignment and draw the icon. if (d->icon) { d->icon->paint(painter, rect, alignment); - } - - // Paint the badge icons - if (d->badgeInfo && d->icon) { - d->badgeInfo->paint(painter, rect, mode, state, d->isMirrored()); + // Paint the badge icons + if (d->badgeInfo) { + d->badgeInfo->paint(painter, rect, mode, state, d->isMirrored()); + } + } else { + // If we made an async loadIcon request then paint some empty content. + if (d->asyncOngoing) { + } } } @@ -926,6 +968,37 @@ } } +void HbIconEngine::asyncLoadCallback(HbIconImpl *icon, void *param, bool wasSync) +{ + HbIconEngine *self = static_cast(param); + if (wasSync) { + self->asyncLoadFinished(icon, wasSync); + } else { + // Was async anyway so let's not rush, to balance the load better. + if (self->d->loadFinishedSlotIndex < 0) { + self->d->loadFinishedSlotIndex = + self->metaObject()->indexOfSlot("asyncLoadFinished(HbIconImpl*,bool)"); + } + self->metaObject()->method(self->d->loadFinishedSlotIndex).invoke(self, + Qt::QueuedConnection, + Q_ARG(HbIconImpl *, icon), + Q_ARG(bool, false)); + } +} + +void HbIconEngine::asyncLoadFinished(HbIconImpl *icon, bool wasSync) +{ + d->asyncOngoing = false; + d->icon = icon; + finishPaintHelper(icon); + if (d->icon && d->icon->isCreatedOnServer()) { + d->iconType = d->icon->iconData().type; + } + if (!wasSync && d->asyncCallback) { + d->asyncCallback(d->asyncCallbackParam); + } +} + HbIconImpl *HbIconEngine::paintHelper( const QSizeF &size, Qt::AspectRatioMode aspectRatioMode, @@ -937,6 +1010,10 @@ // set afterwards (after construction but before the first paint). ensureSignalConnections(); + if (d->asyncOngoing) { + return 0; + } + QString name = iconName(mode, state); QIcon::Mode modeForLoader = mode; HbIconImpl *icon = 0; @@ -966,36 +1043,39 @@ // Otherwise use icon loader to load pixmap else { if (!name.isEmpty()) { + d->curIconMode = mode; + d->curIconState = state; HbIconLoader *loader = HbIconLoader::global(); - - icon = loader->loadIcon( - name, - HbIconLoader::AnyType, - HbIconLoader::AnyPurpose, - size, - aspectRatioMode, - modeForLoader, - d->iconLoaderOptions(), - d->animator, - d->colorToUse(name)); - - // If loading failed, store information so it is not retried in every repaint. - if (!icon) { - d->appendLoadFail(mode, state); - } - - // If animation was returned, set it in the animator and connect to it - HbIconAnimation *anim = animation(); - if (anim) { - connect(anim, SIGNAL(animationUpdated()), this, SLOT(handleAnimationUpdated())); - connect(anim, SIGNAL(animationStarted()), this, SLOT(handleAnimationStarted())); - connect(anim, SIGNAL(animationStopped()), this, SLOT(handleAnimationStopped())); - connect(anim, SIGNAL(animationFinished()), this, SLOT(handleAnimationFinished())); - // If animation start has been forced with HbIconAnimator::startAnimation, - // start the animation here if auto-start is not enabled. - if (d->animator->d->started && d->flags.testFlag(HbIcon::NoAutoStartAnimation)) { - d->animator->startAnimation(); + if (d->async) { + d->asyncOngoing = true; + loader->loadIcon( + name, + HbIconLoader::AnyType, + HbIconLoader::AnyPurpose, + size, + aspectRatioMode, + modeForLoader, + d->iconLoaderOptions(), + d->animator, + d->colorToUse(name), + asyncLoadCallback, + this); + if (!d->asyncOngoing) { + icon = d->icon; } + // else 'icon' remains 0, processing will continue later in asyncLoadCallback() + } else { + icon = loader->loadIcon( + name, + HbIconLoader::AnyType, + HbIconLoader::AnyPurpose, + size, + aspectRatioMode, + modeForLoader, + d->iconLoaderOptions(), + d->animator, + d->colorToUse(name)); + finishPaintHelper(icon); } } } @@ -1003,6 +1083,28 @@ return icon; } +void HbIconEngine::finishPaintHelper(HbIconImpl *icon) +{ + // If loading failed, store information so it is not retried in every repaint. + if (!icon) { + d->appendLoadFail(d->curIconMode, d->curIconState); + } + + // If animation was returned, set it in the animator and connect to it + HbIconAnimation *anim = animation(); + if (anim) { + connect(anim, SIGNAL(animationUpdated()), this, SLOT(handleAnimationUpdated())); + connect(anim, SIGNAL(animationStarted()), this, SLOT(handleAnimationStarted())); + connect(anim, SIGNAL(animationStopped()), this, SLOT(handleAnimationStopped())); + connect(anim, SIGNAL(animationFinished()), this, SLOT(handleAnimationFinished())); + // If animation start has been forced with HbIconAnimator::startAnimation, + // start the animation here if auto-start is not enabled. + if (d->animator->d->started && d->flags.testFlag(HbIcon::NoAutoStartAnimation)) { + d->animator->startAnimation(); + } + } +} + /*! Clears the icon data (e.g. QPixmaps that are stored internally) but does not touch the settings, e.g. the size, state, flags, unlike clear(). @@ -1156,8 +1258,12 @@ } /*! - * Removes the item in the cache if the ref. count is 0 and does delete on - * HbIconImpl and Resets the IconImpl. + * Drops the underlying iconimpl if it is SgImage or NVG based. + * + * There is no unload request to the server in this case, server-side + * unref will be handled by the server when HbIconLoader notifies it + * about losing visibility or when the low graphics memory + * notification is received (on the server-side). */ void HbIconEngine::resetIconImpl() const { @@ -1168,8 +1274,8 @@ if (d->icon->refCount() == 0 && d->icon->isCreatedOnServer()) { HbIconLoader *loader = HbIconLoader::global(); loader->removeItemInCache(d->icon); - d->icon->dispose(); } + d->icon->dispose(); d->icon = 0; } } @@ -1205,12 +1311,29 @@ return d->isBadged(); } -/*! - * Returns the IconFormat Type - */ HbIconFormatType HbIconEngine::iconFormatType() const { return d->iconType; } +/*! + Enables asynchronous icon loading. + + Only effective when called before the first paint. + + Ignored for pixmap() requests and QIcon-based icons. + */ +void HbIconEngine::setAsync(bool async, AsyncCallback callback, void *param) +{ + d->async = async; + d->asyncCallback = callback; + d->asyncCallbackParam = param; +} + +bool HbIconEngine::async() const +{ + return d->async; +} + + // End of File diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/image/hbiconengine_p.h --- a/src/hbcore/image/hbiconengine_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/image/hbiconengine_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -107,6 +107,10 @@ const QList badges() const; HbIconFormatType iconFormatType() const; + typedef void (*AsyncCallback)(void *); + void setAsync(bool async, AsyncCallback callback, void *param); + bool async() const; + private: void ensureSignalConnections(); QPixmap getPixmapFromAnimation() const; @@ -115,10 +119,14 @@ Qt::AspectRatioMode aspectRatioMode, QIcon::Mode, QIcon::State); + void finishPaintHelper(HbIconImpl *icon); bool loadFailed(QIcon::Mode mode, QIcon::State state) const; HbIconAnimation *animation() const; + + void init(); + void forceFlagUpdate(); public: enum ClearingFlag { @@ -128,6 +136,8 @@ }; Q_DECLARE_FLAGS(ClearingFlags, ClearingFlag) + static void asyncLoadCallback(HbIconImpl *icon, void *param, bool wasSync); + public slots: void clearStoredIconContent(ClearingFlags flags = 0); void clearStoredNonAnimIconContent(); @@ -140,6 +150,7 @@ void handleAnimationStarted(); void handleAnimationStopped(); void handleAnimationFinished(); + void asyncLoadFinished(HbIconImpl *icon, bool wasSync); private: HbIconEnginePrivate *d; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/image/hbiconimpl_p.h --- a/src/hbcore/image/hbiconimpl_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/image/hbiconimpl_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -27,6 +27,7 @@ #define HBICONIMPL_P_H #include +#include #include #include "hbthemecommon_p.h" @@ -83,7 +84,7 @@ HbMaskableIconImpl *maskIconData = 0) = 0; virtual QSize defaultSize() const = 0; virtual QSize size() = 0; - virtual ErrorCode intialize() { + virtual ErrorCode initialize() { return ErrorNone; } @@ -175,5 +176,6 @@ HbRenderingMode renderMode; }; +Q_DECLARE_METATYPE(HbIconImpl *) + #endif // HBICONIMPL_P_H - diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/image/hbiconimplcreator_p.h --- a/src/hbcore/image/hbiconimplcreator_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/image/hbiconimplcreator_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -57,12 +57,14 @@ QString cleanIconName; // Resolved filename for the icon QString iconFileName; - // Pixmap where the icon is rasterized - QPixmap canvasPixmap; + // Image where the icon is rasterized + QImage image; // cannot use QPixmap, must support non-gui threads too // Icon's rendering mode ( Hardware / Software ) HbRenderingMode renderMode; }; +Q_DECLARE_METATYPE(HbIconLoadingParams) + class HB_AUTOTEST_EXPORT HbIconImplCreator { public: @@ -71,4 +73,3 @@ }; #endif //HBICONIMPLCREATOR_P_H - diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/image/hbiconloader.cpp --- a/src/hbcore/image/hbiconloader.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/image/hbiconloader.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -28,6 +28,7 @@ #include "hbicontheme_p.h" #include "hblayoutdirectionnotifier_p.h" #include "hbinstance.h" +#include "hbinstance_p.h" #include "hbiconanimation_p.h" #include "hbiconanimator.h" #include "hbiconanimator_p.h" @@ -40,10 +41,10 @@ #include "hbimagetraces_p.h" #include "hbmemoryutils_p.h" #include "hbpixmapiconimpl_p.h" +#include "hbiconimplcreator_p.h" #include "hbiconsource_p.h" #include "hbthemeindex_p.h" #include "hbthemecommon_p.h" -#include "hbiconimplcreator_p.h" #include #include #include @@ -56,30 +57,19 @@ #include #include #include +#include +#include +#include #ifdef HB_NVG_CS_ICON #include "hbeglstate_p.h" #endif -#define HB_ICONIMPL_CACHE -/* - * Client side caching of sgimage icon required, - * as sgimage lite cannot be opened multiple times - */ -#ifdef HB_SGIMAGE_ICON -#ifndef HB_ICONIMPL_CACHE -#define HB_ICONIMPL_CACHE -#endif -#endif - -// Just an experimental implementation.. Disable if necessary. -#define ENABLE_EXPERIMENTAL_RESIZE_BOOST__ - // SVG animation is currently disabled because of bugs in QT's svg engine #undef HB_SVG_ANIMATION +// Icon name without extension static const char *s_unknown = "unknown"; -// Icon name without extension /*! \class HbIconLoader @@ -93,9 +83,64 @@ // Deleting it later causes segmentation fault. static HbIconLoader *theLoader = 0; -#ifdef HB_ICONIMPL_CACHE +/* + * Client side caching of sgimage icon required, as sgimage lite cannot be + * opened multiple times + * + * It is also beneficial for performance, because it reduces IPC in certain + * cases. + * + * Note that by default this is not a permanent cache, i.e. when an iconimpl's + * refcount reaches zero it is removed from the cache. This means that the + * cache is beneficial for having the same icon rendered by two or more HbIcons + * at the same time (very typical in some itemview (e.g. list widget) cases), + * but it would not benefit a load-unload-load scenario because the icon is + * removed from the cache during the unload when there are no references + * anymore. + * + * However the cachekeeper below will change this behavior, preventing refcounts + * reaching zero in unLoadIcon(), so this cache may contain also icons that are + * not really in use and are only referenced by the cachekeeper. This is + * required for further reduction of IPC calls. + */ static QHash iconImplCache; -#endif + +// The global cachekeeper instance will hold references to icons that would +// normally be unloaded (i.e. mIcons will contain icons with refcount 1). +// +// Icons get added from unLoadIcon(), meaning that if the cachekeeper decides to +// hold a reference then the icon is not really unloaded (and thus stays in +// iconImplCache). +// +// When the icon gets referenced due to a cache hit, in loadIcon() and other +// places, the icon is removed from the cachekeeper. +class CacheKeeper { +public: + CacheKeeper() : mConsumption(0) { } + void ref(HbIconImpl *icon); + void unref(HbIconImpl *icon); + void clear(); +private: + void del(HbIconImpl *icon, bool sendUnloadReq); + QList mIcons; + int mConsumption; +}; + +Q_GLOBAL_STATIC(CacheKeeper, cacheKeeper) + +// The max consumption for the icons held by the cachekeeper, assuming that each +// icon is 32bpp. Note that the cachekeeper's content is cleared also when +// losing visibility and when switching rendering mode. +const int MAX_KEEPALIVE_CACHE_SIZE_BYTES = 1024 * 1024; // 1 MB + +// 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; + +class HbLocalLoaderThread : public QThread +{ +public: + void run(); +}; class HbIconLoaderPrivate { @@ -122,17 +167,13 @@ bool isLayoutMirrored(); void setLayoutMirrored(bool mirrored); -#ifdef HB_ICONIMPL_CACHE QByteArray createCacheKeyFrom(const QString &iconName, const QSizeF &size, Qt::AspectRatioMode aspectRatioMode, QIcon::Mode mode, bool mirrored, - const QColor &color, - HbRenderingMode renderMode); -#endif + const QColor &color); -public: QString storedTheme; int sourceResolution; @@ -147,7 +188,6 @@ HbIconSource *lastIconSource; -private: enum { Unknown = 0, NotMirrored = 1, @@ -158,8 +198,29 @@ * Flipped icons are used in the mirrored layout. */ int layoutMirrored; + + struct AsyncParams { + HbIconLoader::HbAsyncIconLoaderCallback mCallback; + HbIconLoadingParams mLdParams; + void *mParam; + }; + + QList mActiveAsyncRequests; + + HbLocalLoaderThread mLocalLoaderThread; + HbLocalIconLoader *mLocalLoader; + QMutex mLocalLoadMutex; + QMutex mIconSourceMutex; + friend class HbLocalLoaderThread; }; +void HbLocalLoaderThread::run() +{ + setPriority(QThread::LowPriority); + exec(); + delete HbIconLoaderPrivate::global()->mLocalLoader; +} + HbIconLoaderPrivate::HbIconLoaderPrivate() : storedTheme(HbTheme::instance()->name()), sourceResolution(144), // This is about the resolution of a Nokia N95 8GB @@ -168,13 +229,26 @@ animationManager(HbIconAnimationManager::global()), animationLoading(false), lastIconSource(0), - layoutMirrored(Unknown) + layoutMirrored(Unknown), + mLocalLoadMutex(QMutex::Recursive), + mIconSourceMutex(QMutex::Recursive) { + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + mLocalLoader = new HbLocalIconLoader; + mLocalLoader->moveToThread(&mLocalLoaderThread); + mLocalLoaderThread.start(); } HbIconLoaderPrivate::~HbIconLoaderPrivate() { + // quit() cannot be called directly on mLocalLoaderThread because + // there is a chance that start() has not yet executed. + QMetaObject::invokeMethod(mLocalLoader, "doQuit", Qt::QueuedConnection); + mLocalLoaderThread.wait(); delete lastIconSource; + qDeleteAll(mActiveAsyncRequests); } HbIconLoaderPrivate *HbIconLoaderPrivate::global() @@ -221,7 +295,9 @@ return suffix; } -QString HbIconLoaderPrivate::findSharedResourceHelper(const QString &resourceName, bool mirrored, bool &mirroredIconFound, Hb::ResourceType itemType, bool useThemeIndex) +QString HbIconLoaderPrivate::findSharedResourceHelper(const QString &resourceName, bool mirrored, + bool &mirroredIconFound, Hb::ResourceType itemType, + bool useThemeIndex) { Q_UNUSED(useThemeIndex) Q_UNUSED(itemType) @@ -443,16 +519,14 @@ layoutMirrored = mirrored ? Mirrored : NotMirrored; } -#ifdef HB_ICONIMPL_CACHE QByteArray HbIconLoaderPrivate::createCacheKeyFrom(const QString &iconName, - const QSizeF &size, - Qt::AspectRatioMode aspectRatioMode, - QIcon::Mode mode, - bool mirrored, - const QColor &color, - HbRenderingMode renderMode) + const QSizeF &size, + Qt::AspectRatioMode aspectRatioMode, + QIcon::Mode mode, + bool mirrored, + const QColor &color) { - static const int paramArraySize = 8; + static const int paramArraySize = 7; // This uses QByteArray to improve performance compared to QString. // It allows appending stuff with less heap allocations and conversions compared to using QString. @@ -478,8 +552,11 @@ temp[6] = 0; } - // Append render mode when creating cache key - temp[7] = renderMode; + // The rendering mode should not be included in the cache key to prevent + // confusion when the requested and the received rendering modes are + // different (i.e. to make life simple). Having a cache hit is always + // preferable to anything else. + cacheKey.append((char *)&(temp[0]), sizeof(int)*paramArraySize); const QChar *iconNamePtr = iconName.constData(); @@ -491,13 +568,40 @@ return cacheKey; } -#endif + +inline HbThemeClient::IconReqInfo paramsToReqInfo(const HbIconLoadingParams ¶ms) +{ + HbThemeClient::IconReqInfo reqInfo; + reqInfo.iconPath = params.iconFileName; + reqInfo.size = params.size; + reqInfo.aspectRatioMode = params.aspectRatioMode; + reqInfo.mode = params.mode; + reqInfo.mirrored = (params.mirrored && !params.mirroredIconFound); + reqInfo.options = params.options; + reqInfo.color = params.color; + reqInfo.renderMode = params.renderMode; + return reqInfo; +} + +inline HbThemeClient::IconReqInfo iconImplToReqInfo(HbIconImpl *icon) +{ + HbThemeClient::IconReqInfo reqInfo; + reqInfo.iconPath = icon->iconFileName(); + reqInfo.size = icon->keySize(); + reqInfo.aspectRatioMode = icon->iconAspectRatioMode(); + reqInfo.mode = icon->iconMode(); + reqInfo.mirrored = icon->isMirrored(); + reqInfo.color = icon->color(); + reqInfo.renderMode = icon->iconRenderingMode(); + return reqInfo; +} HbIconLoader::HbIconLoader(const QString &appName, QObject *parent) : QObject(parent) { setObjectName(appName); - d = new HbIconLoaderPrivate(); + d = new HbIconLoaderPrivate; + connect(d->mLocalLoader, SIGNAL(ready(HbIconLoadingParams, void*)), SLOT(localLoadReady(HbIconLoadingParams, void*))); // Set default rendering mode to EHWRendering renderMode = EHWRendering; @@ -516,6 +620,7 @@ HbIconLoader::~HbIconLoader() { + cacheKeeper()->clear(); delete d; } @@ -533,6 +638,7 @@ QSizeF HbIconLoader::defaultSize(const QString &iconName, const QString &appName, IconLoaderOptions options) { Q_UNUSED(appName) + QMutexLocker locker(&d->mIconSourceMutex); QSizeF size; // Populate parameters needed for getting the default size @@ -678,7 +784,7 @@ void HbIconLoader::themeChange(const QStringList &updatedFiles) { - foreach(HbFrameDrawerPrivate * frameDrawer, this->frameDrawerInstanceList) frameDrawer->themeChange(updatedFiles); + foreach(HbFrameDrawerPrivate * frameDrawer, frameDrawerInstanceList) frameDrawer->themeChange(updatedFiles); } void HbIconLoader::destroy() @@ -707,7 +813,7 @@ void HbIconLoader::handleForegroundLost() { #if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON) - // Remove SGImage /NVG type of icons + // Remove SGImage/NVG type of icons freeGpuIconData(); // delete the VGImage HbEglStates *eglStateInstance = HbEglStates::global(); @@ -722,13 +828,9 @@ */ void HbIconLoader::removeItemInCache(HbIconImpl *iconImpl) { -#ifdef HB_ICONIMPL_CACHE if (iconImpl) { iconImplCache.remove(iconImplCache.key(iconImpl)); } -#else - Q_UNUSED(iconImpl); -#endif } /*! @@ -738,6 +840,7 @@ void HbIconLoader::freeGpuIconData() { #if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON) + cacheKeeper()->clear(); // unref all unused icons for (int i = 0; i < iconEngineList.count(); i++) { HbIconEngine *engine = iconEngineList.at(i); engine->resetIconImpl(); @@ -865,7 +968,7 @@ params.size, params.aspectRatioMode, QIcon::Normal, - params.options, + params.options | DoNotCache, 0, params.color); @@ -878,9 +981,9 @@ // Return the first frame in the canvas pixmap if (frameList.count()) { - params.canvasPixmap = frameList.at(0).pixmap; + params.image = frameList.at(0).pixmap.toImage(); // Mirroring is already done when loading the frame. - // Mode is handled for canvasPixmap in the end of this function. + // Mode is handled for the image at the end of this function. params.mirroringHandled = true; } @@ -896,7 +999,7 @@ } // Take default size from the first frame - QSizeF renderSize = QSizeF(params.canvasPixmap.size()); + QSizeF renderSize = QSizeF(params.image.size()); if (!params.isDefaultSize) { renderSize.scale(params.size, params.aspectRatioMode); @@ -943,61 +1046,105 @@ */ HbIconImpl *HbIconLoader::getIconFromServer(HbIconLoadingParams ¶ms) { - HbIconImpl *icon = 0; - #ifdef HB_ICON_TRACES qDebug() << "HbIconLoader::getIconFromServer: req to server for" << params.iconFileName; #endif + HbSharedIconInfo iconInfo; iconInfo.type = INVALID_FORMAT; HbThemeClient *themeClient = HbThemeClient::global(); - //Initiate an IPC to themeserver to get the icon-data from the server via themeclient. - iconInfo = themeClient->getSharedIconInfo( - params.iconFileName, - params.size, - params.aspectRatioMode, - params.mode, - (params.mirrored && !params.mirroredIconFound), - params.options, - params.color, - params.renderMode); + // Initiate an IPC to themeserver to get the icon-data from the server via themeclient. + iconInfo = themeClient->getSharedIconInfo(paramsToReqInfo(params)); + HbIconImpl *icon = finishGetIconFromServer(iconInfo, params); +#ifdef HB_ICON_TRACES + qDebug() << "Image from server: " << params.iconFileName << " offset = " << iconInfo.pixmapData.offset << "icon ptr" << (int) icon; +#endif + + return icon; +} + +HbIconImpl *HbIconLoader::finishGetIconFromServer(HbSharedIconInfo &iconInfo, HbIconLoadingParams ¶ms) +{ //Creates HbIconImpl instance based on the type of data returned by themeserver. //HbIconImpl thus created could be any one of the following impl-types: //1. HbSgImageIconImpl //2. HbNvgIconImpl //3. HbPixmapIconImpl - icon = HbIconImplCreator::createIconImpl(iconInfo, params); + HbIconImpl *icon = HbIconImplCreator::createIconImpl(iconInfo, params); - if (icon && (icon->intialize() == HbIconImpl::ErrorLowGraphicsMemory)) { + if (icon && icon->initialize() == HbIconImpl::ErrorLowGraphicsMemory) { // initialisation failed due to low graphics memory, in sgimage icon case // try creating pixmap based icon // unload the created GPU icon - unLoadIcon(icon); + unLoadIcon(icon, false, true); icon = 0; // create a pixmap based icon - iconInfo = themeClient->getSharedIconInfo( - params.iconFileName, - params.size, - params.aspectRatioMode, - params.mode, - (params.mirrored && !params.mirroredIconFound), - params.options, - params.color, - ESWRendering); - + HbThemeClient *themeClient = HbThemeClient::global(); + HbThemeClient::IconReqInfo reqInfo = paramsToReqInfo(params); + reqInfo.renderMode = ESWRendering; + iconInfo = themeClient->getSharedIconInfo(reqInfo); icon = HbIconImplCreator::createIconImpl(iconInfo, params); // no need call initialize of this icon } -#ifdef HB_ICON_TRACES - qDebug() << "Image from server: " << params.iconFileName << " offset = " << iconInfo.pixmapData.offset << "icon ptr" << (int) icon; -#endif return icon; } +bool HbIconLoader::asyncCallback(const HbSharedIconInfo &info, void *param) +{ + HbIconLoader *self = theLoader; + HbIconLoaderPrivate::AsyncParams *p = static_cast(param); + HbSharedIconInfo iconInfo = info; + if (!self->d->mActiveAsyncRequests.contains(p)) { + // 'p' is destroyed already, this happens when canceling the loadIcon + // request. Stop here and return false so the themeclient will issue an + // unload request. + return false; + } + bool result = true; + // The icon may have been loaded via another request meanwhile so check the cache again. + HbIconImpl *icon = self->lookupInCache(p->mLdParams, 0); + if (icon) { + // Found in the local iconimpl cache so use that and roll back, i.e. do + // an unload for the data we just got (this is necessary to maintain + // proper remote refcounts). + result = false; + } else { + icon = self->finishGetIconFromServer(iconInfo, p->mLdParams); + if (!icon) { + self->loadLocal(p->mLdParams, self->formatFromPath(p->mLdParams.iconFileName)); + icon = self->finishLocal(p->mLdParams); + } + if (icon) { + self->cacheIcon(p->mLdParams, icon, 0); + } + } + if (p->mCallback) { + p->mCallback(icon, p->mParam, false); + } + self->d->mActiveAsyncRequests.removeOne(p); + delete p; + return result; +} + +void HbIconLoader::getIconFromServerAsync(HbIconLoadingParams ¶ms, + HbAsyncIconLoaderCallback callback, + void *callbackParam) +{ + HbThemeClient *themeClient = HbThemeClient::global(); + HbIconLoaderPrivate::AsyncParams *p = new HbIconLoaderPrivate::AsyncParams; + p->mCallback = callback; + p->mLdParams = params; + p->mParam = callbackParam; + d->mActiveAsyncRequests.append(p); + themeClient->getSharedIconInfo(paramsToReqInfo(params), + asyncCallback, + p); +} + void HbIconLoader::loadSvgIcon(HbIconLoadingParams ¶ms) { HbIconSource *source = getIconSource(params.iconFileName, "SVG"); @@ -1053,12 +1200,10 @@ #endif // HB_SVG_ANIMATION - QPixmap &pm = params.canvasPixmap; - - pm = QPixmap(renderSize.toSize()); - pm.fill(Qt::transparent); + params.image = QImage(renderSize.toSize(), QImage::Format_ARGB32); // should be _Premultiplied but that results in incorrect rendering + params.image.fill(Qt::transparent); QPainter painter; - painter.begin(&pm); + painter.begin(¶ms.image); svgRenderer->render(&painter, QRectF(QPointF(), renderSize.toSize())); painter.end(); } @@ -1096,13 +1241,10 @@ sy = renderSize.height() / picSize.height(); } - QPixmap &pm = params.canvasPixmap; - - pm = QPixmap(renderSize.toSize()); - pm.fill(Qt::transparent); - + params.image = QImage(renderSize.toSize(), QImage::Format_ARGB32); + params.image.fill(Qt::transparent); QPainter painter; - painter.begin(&pm); + painter.begin(¶ms.image); if (scale) { painter.scale(sx, sy); } @@ -1165,7 +1307,7 @@ // Get the first frame if (animationCreated) { - params.canvasPixmap = params.animator->d->animation->currentFrame(); + params.image = params.animator->d->animation->currentFrame().toImage(); // Mirroring and mode are handled in HbIconAnimationImage::currentFrame() params.mirroringHandled = true; params.modeHandled = true; @@ -1174,9 +1316,7 @@ if (imgRenderer->size() != scaledSize) { imgRenderer->setScaledSize(scaledSize); } - - QImage img = imgRenderer->read(); - params.canvasPixmap = QPixmap::fromImage(img); + params.image = imgRenderer->read(); } source->releaseImageReader(); @@ -1186,39 +1326,34 @@ { HbIconSource *source = getIconSource(params.iconFileName, format); - QPixmap &pm = params.canvasPixmap; - // Render bitmap graphics onto pixmap - pm = *source->pixmap(); + // Render bitmap graphics into an image. We have to use QImage because this + // code may run outside the gui (main) thread. + params.image = *source->image(); - if (!pm.isNull()) { -#ifdef ENABLE_EXPERIMENTAL_RESIZE_BOOST__ - // This test implementation improves resize speed up to 5 times.. + if (!params.image.isNull()) { + // This implementation improves resize speed up to 5 times. if (!params.isDefaultSize && !params.size.isEmpty()) { // Smooth scaling is very expensive (size^2). Therefore we reduce the size // to 1.5 of the destination size and using fast transformation. // Therefore we speed up but don't loose quality.. - if (pm.size().width() > (4 * params.size.toSize().width())) { + if (params.image.size().width() > (4 * params.size.toSize().width())) { // Improve scaling speed by add an intermediate fast transformation.. QSize intermediate_size = QSize(params.size.toSize().width() * 2, params.size.toSize().height() * 2); - pm = pm.scaled( - intermediate_size, - params.aspectRatioMode, - Qt::FastTransformation); // Cheap operation! + params.image = params.image.scaled( + intermediate_size, + params.aspectRatioMode, + Qt::FastTransformation); // Cheap operation } -#endif // ENABLE_EXPERIMENTAL_RESIZE_BOOST__ - pm = pm.scaled( - params.size.toSize(), - params.aspectRatioMode, - Qt::SmoothTransformation); // Expensive operation! - -#ifdef ENABLE_EXPERIMENTAL_RESIZE_BOOST__ + params.image = params.image.scaled( + params.size.toSize(), + params.aspectRatioMode, + Qt::SmoothTransformation); // Expensive operation } -#endif } // Delete original pixmap if its size is large - source->deletePixmapIfLargerThan(PIXMAP_SIZE_LIMIT); + source->deleteImageIfLargerThan(IMAGE_SIZE_LIMIT); } /*! @@ -1240,6 +1375,7 @@ #if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON) if (newRenderMode != renderMode) { + cacheKeeper()->clear(); // unref all unused icons if (newRenderMode == ESWRendering) { // switching from HW to SW mode freeGpuIconData(); @@ -1260,6 +1396,41 @@ } } +inline bool isLocalContent(const QString &iconName) +{ + // Check if we have a simple file or embedded resource, given with full + // or relative path. A filename like "x.png" is also local content + // because logical icon names must never contain an extension. + bool localContent = iconName.startsWith(':') + || iconName.contains('/') || iconName.contains('\\') + || (iconName.length() > 1 && iconName.at(1) == ':') + || (iconName.contains('.') && !iconName.startsWith("qtg_", Qt::CaseInsensitive)); + + // Cannot load NVG locally. Remove this check when local loading for NVG is available. + if (iconName.endsWith(".nvg", Qt::CaseInsensitive)) { + localContent = false; + } + + return localContent; +} + +inline bool serverUseAllowed(const QString &iconName, HbIconLoader::IconLoaderOptions options) +{ + bool allowServer = !options.testFlag(HbIconLoader::DoNotCache); + + // No local loading for NVG... The server must still be used. + if (iconName.endsWith(".nvg", Qt::CaseInsensitive)) { + allowServer = true; + } + // We have no choice but to assume that theme graphics (logical names) are + // NVG in order to keep it working with DoNotCache. + if (!iconName.contains('.') && !iconName.contains('/') && !iconName.contains('\\')) { + allowServer = true; + } + + return allowServer; +} + /*! * \fn HbIconImpl* HbIconLoader::loadIcon() * @@ -1280,26 +1451,21 @@ QIcon::Mode mode, IconLoaderOptions options, HbIconAnimator *animator, - const QColor &color) + const QColor &color, + HbAsyncIconLoaderCallback callback, + void *callbackParam) { #ifdef HB_ICON_TRACES - QString debugString = "HbIconLoader::loadIcon START - "; - debugString.append(iconName); - debugString.append(" @ "); - if (size.isNull()) { - debugString.append("DEFAULT SIZE"); - } else { - debugString.append(QString::number(size.width())); - debugString.append('x'); - debugString.append(QString::number(size.height())); - } - qDebug() << debugString; + qDebug() << "loadIcon" << iconName << size; #endif Q_UNUSED(type) HbIconImpl *icon = 0; if (!size.isValid()) { + if (callback) { + callback(0, callbackParam, true); + } return 0; } @@ -1348,28 +1514,16 @@ } // Step 2: There was no animation definition, try get icon from server + QByteArray cacheKey; if (!params.animationCreated) { - -#ifdef HB_ICONIMPL_CACHE - QByteArray cacheKey = d->createCacheKeyFrom(params.iconName, - params.size, - params.aspectRatioMode, - params.mode, - params.mirrored, - params.color, - params.renderMode); - //look up in the local iconImplCache. - //If found return the ptr directly - if (iconImplCache.contains(cacheKey)) { - HbIconImpl *ptr = iconImplCache.value(cacheKey); - ptr->incrementRefCount(); -#ifdef HB_ICON_CACHE_DEBUG - qDebug() << "HbIconLoader::loadIcon(): " << "Cache hit in iconImplCache for" << params.iconName << params.size.height() << "X" << params.size.width() ; - qDebug() << "HbIconLoader::loadIcon(): Client RefCount now = " << ptr->refCount(); -#endif - return ptr; + // First check in the local iconimpl cache. + HbIconImpl *cachedIcon = lookupInCache(params, &cacheKey); + if (cachedIcon) { + if (callback) { + callback(cachedIcon, callbackParam, true); + } + return cachedIcon; } -#endif // Resolve used icon filename. It uses themeindex for themed icons. params.iconFileName = resolveIconFileName(params); @@ -1383,57 +1537,37 @@ #ifdef HB_ICON_TRACES qDebug() << "HbIconLoader::loadIcon (empty icon) END"; #endif - icon = new HbPixmapIconImpl(params.canvasPixmap); + icon = new HbPixmapIconImpl(QPixmap()); + if (callback) { + callback(icon, callbackParam, true); + } return icon; } -#ifdef Q_OS_SYMBIAN - // Check whether icon is in a private directory which cannot be accessed by the theme server - bool privateDirectory = isInPrivateDirectory(iconName); -#endif // Q_OS_SYMBIAN - QString format = formatFromPath(params.iconFileName); -// Theme server on desktop was found very slow (probably due to IPC with QLocalServer/QLocalSocket). -// disabling icon sharing via theme server until theme server performance on desktop is improved #ifdef Q_OS_SYMBIAN GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory) // Try to take data from server if parameters don't prevent it - if (!options.testFlag(DoNotCache) - && format != "MNG" - && format != "GIF" - && !iconName.startsWith(':') // not using server for app's own resources (iconName is a logical name for theme elements) - && !privateDirectory // server cannot load from protected private dir - && manager) { + if (serverUseAllowed(iconName, options) + // Use the server only for theme graphics. + // For local files, i.e. anything that is not a single logical name, use local loading. + && !isLocalContent(iconName) + && format != "MNG" + && format != "GIF" + && manager) { //Initiate an IPC to themeserver to get the icon-data from the server. + + if (callback) { + getIconFromServerAsync(params, callback, callbackParam); + return 0; + } + icon = getIconFromServer(params); if (icon) { -#ifdef HB_ICONIMPL_CACHE - if (params.renderMode != icon->iconRenderingMode()) { - cacheKey = d->createCacheKeyFrom(params.iconName, - params.size, - params.aspectRatioMode, - params.mode, - params.mirrored, - params.color, - icon->iconRenderingMode()); - if (iconImplCache.contains(cacheKey)) { - HbIconImpl * oldIcon = iconImplCache.value(cacheKey); - this->unLoadIcon(icon); - icon->dispose(); - icon = oldIcon; - icon->incrementRefCount(); - } - } else { - iconImplCache.insert(cacheKey, icon); - } -#ifdef HB_ICON_CACHE_DEBUG - qDebug() << "HbIconLoader::loadIcon(): " << params.iconName << " inserted into impl-cache, ref-count now = " << icon->refCount(); -#endif - -#endif + cacheIcon(params, icon, &cacheKey); return icon; } @@ -1441,52 +1575,167 @@ #endif // Q_OS_SYMBIAN // Step 3: Finally fall back to loading icon locally in the client side - if (!icon) { - if (format == "SVG") { - loadSvgIcon(params); - } else if (format == "PIC") { - loadPictureIcon(params); - } else if (format == "MNG" || format == "GIF") { - loadAnimatedIcon(params, format); - } else { - loadPixmapIcon(params, format); - } + if (callback) { + loadLocalAsync(params, format, callback, callbackParam); + return 0; } + loadLocal(params, format); } + icon = finishLocal(params); + if (!params.animationCreated && icon && !options.testFlag(DoNotCache)) { + cacheIcon(params, icon, &cacheKey); + } + + if (callback) { + callback(icon, callbackParam, true); + } + +#ifdef HB_ICON_TRACES + qDebug() << "HbIconLoader::loadIcon END"; +#endif + + return icon; +} + +HbIconImpl *HbIconLoader::lookupInCache(const HbIconLoadingParams ¶ms, QByteArray *outCacheKey) +{ + QByteArray cacheKey = d->createCacheKeyFrom(params.iconName, + params.size, + params.aspectRatioMode, + params.mode, + params.mirrored, + params.color); + if (outCacheKey) { + *outCacheKey = cacheKey; + } + if (iconImplCache.contains(cacheKey)) { + HbIconImpl *icon = iconImplCache.value(cacheKey); + icon->incrementRefCount(); + cacheKeeper()->unref(icon); +#ifdef HB_ICON_CACHE_DEBUG + qDebug() << "HbIconLoader::loadIcon(): " << "Cache hit in iconImplCache for" << params.iconName << params.size; + qDebug() << "HbIconLoader::loadIcon(): Client RefCount now = " << icon->refCount(); +#endif + return icon; + } + return 0; +} + +void HbIconLoader::loadLocal(HbIconLoadingParams ¶ms, const QString &format) +{ + QMutexLocker loadLocker(&d->mLocalLoadMutex); + QMutexLocker iconSourceLocker(&d->mIconSourceMutex); + if (format == "SVG") { + loadSvgIcon(params); + } else if (format == "PIC") { + loadPictureIcon(params); + } else if (format == "MNG" || format == "GIF") { + loadAnimatedIcon(params, format); + } else { + loadPixmapIcon(params, format); + } +} + +void HbIconLoader::loadLocalAsync(const HbIconLoadingParams ¶ms, const QString &format, + HbAsyncIconLoaderCallback callback, void *callbackParam) +{ + HbIconLoaderPrivate::AsyncParams *p = new HbIconLoaderPrivate::AsyncParams; + p->mCallback = callback; + p->mLdParams = params; + p->mParam = callbackParam; + d->mActiveAsyncRequests.append(p); + QMetaObject::invokeMethod(d->mLocalLoader, "load", + Qt::QueuedConnection, + Q_ARG(HbIconLoadingParams, params), + Q_ARG(QString, format), + Q_ARG(void *, p)); +} + +HbIconImpl *HbIconLoader::finishLocal(HbIconLoadingParams ¶ms) +{ + // This is called on the main thread so QPixmap can be used. + QPixmap pm = QPixmap::fromImage(params.image); + if (!params.mirroringHandled) { // Apply mirroring if required if (params.mirrored && !params.mirroredIconFound) { QTransform t; t.scale(-1, 1); - params.canvasPixmap = params.canvasPixmap.transformed(t); + pm = pm.transformed(t); } } if (params.color.isValid()) { - QPixmap &pm = params.canvasPixmap; if (!pm.isNull()) { QPixmap mask = pm.alphaChannel(); - pm.fill(color); + pm.fill(params.color); pm.setAlphaChannel(mask); } } if (!params.modeHandled) { // Apply mode - if (mode != QIcon::Normal) { + if (params.mode != QIcon::Normal) { QStyleOption opt(0); opt.palette = QApplication::palette(); - params.canvasPixmap = QApplication::style()->generatedIconPixmap(mode, params.canvasPixmap, &opt); + pm = QApplication::style()->generatedIconPixmap(params.mode, pm, &opt); } } -#ifdef HB_ICON_TRACES - qDebug() << "HbIconLoader::loadIcon END"; + return new HbPixmapIconImpl(pm, params.iconFileName); +} + +void HbIconLoader::cacheIcon(const HbIconLoadingParams ¶ms, HbIconImpl *icon, QByteArray *existingCacheKey) +{ + QByteArray cacheKey; + if (existingCacheKey) { + cacheKey = *existingCacheKey; + } else { + cacheKey = d->createCacheKeyFrom(params.iconName, + params.size, + params.aspectRatioMode, + params.mode, + params.mirrored, + params.color); + } + iconImplCache.insert(cacheKey, icon); + +#ifdef HB_ICON_CACHE_DEBUG + qDebug() << "HbIconLoader::loadIcon(): " << params.iconName << " inserted into impl-cache, ref-count now = " << icon->refCount(); #endif +} - icon = new HbPixmapIconImpl(params.canvasPixmap, params.iconFileName); - return icon; +/*! + Cancels an outstanding loadIcon request. + + \a callback must match the callback parameter of a previous loadIcon call. + All loadIcon requests using the same callback will be canceled and the + callback will not be invoked. + + Has no effect if no matching loadIcon request is active. + + If \a callbackParam is not 0 then it is used in the matching too so only + loadIcon requests where both \a callback and \a callbackParam match will be + canceled. If \a callbackParam is 0 then only \a callback is used in the + matching. + */ +void HbIconLoader::cancelLoadIcon(HbAsyncIconLoaderCallback callback, void *callbackParam) +{ + // The callback used with the themeclient api is always the same, but the + // AsyncParams pointer in the custom parameter is different for each request + // so it can be used for identification. + foreach (HbIconLoaderPrivate::AsyncParams *p, d->mActiveAsyncRequests) { + if (p->mCallback == callback && (!callbackParam || callbackParam == p->mParam)) { + // Cancel the remote request. It will have no effect in case of + // local content. This is fine because for the local threaded loader + // the removal from mActiveAsyncRequests is enough. + HbThemeClient::global()->cancelGetSharedIconInfo(asyncCallback, p); + d->mActiveAsyncRequests.removeOne(p); + delete p; + return; + } + } } /*! @@ -1522,28 +1771,25 @@ bool mirroredIconFound = false; // We don't want to get the consolidated icon for only NVG build, ie. without SGImage lite support. - // Consolidated icon will be created for NVG with SGImage lite support. - // and when NVG is not available. -#if defined(HB_ICONIMPL_CACHE) - - QByteArray cacheKey = d->createCacheKeyFrom(multiPartIconData.multiPartIconId, - size, - aspectRatioMode, - mode, - mirrored, - color, - renderMode); + // Consolidated icon will be created for NVG with SGImage lite support and when NVG is not available. + QByteArray cacheKey = d->createCacheKeyFrom( + multiPartIconData.multiPartIconId, + size, + aspectRatioMode, + mode, + mirrored, + color); //If consolidated icon found in the client's cache, increment ref-count and return if (iconImplCache.contains(cacheKey)) { HbIconImpl *ptr = iconImplCache.value(cacheKey); ptr->incrementRefCount(); + cacheKeeper()->unref(ptr); #ifdef HB_ICON_CACHE_DEBUG - qDebug() << "HbIconLoader::loadMultiPieceIcon()" << "Cache hit in iconImplCache " << multiPartIconData.multiPartIconId << size.height() << "X" << size.width() ; + qDebug() << "HbIconLoader::loadMultiPieceIcon()" << "Cache hit in iconImplCache " << multiPartIconData.multiPartIconId << size; qDebug() << "HbIconLoader::loadMultiPieceIcon : Client RefCount now = " << ptr->refCount(); #endif return ptr; } -#endif QStringList iconPathList; @@ -1586,34 +1832,15 @@ params.mirrored = mirrored; params.mirroredIconFound = mirroredIconFound; - //Creating HbIconImpl for the consolidated icon-data returned from themeserver + // Creating HbIconImpl for the consolidated icon-data returned from themeserver. icon = HbIconImplCreator::createIconImpl(iconInfo, params); if (icon) { -#ifdef HB_ICONIMPL_CACHE - if (renderMode != icon->iconRenderingMode()) { - cacheKey = d->createCacheKeyFrom(params.iconName, - params.size, - params.aspectRatioMode, - params.mode, - params.mirrored, - params.color, - icon->iconRenderingMode()); - if (iconImplCache.contains(cacheKey)) { - HbIconImpl * oldIcon = iconImplCache.value(cacheKey); - this->unLoadIcon(icon); - icon->dispose(); - icon = oldIcon; - icon->incrementRefCount(); - } - } else { - iconImplCache.insert(cacheKey, icon); - } + // Not yet in local cache (was checked before the server request) so insert. + iconImplCache.insert(cacheKey, icon); + icon->setMultiPieceIcon(); #ifdef HB_ICON_CACHE_DEBUG qDebug() << "HbIconLoader::loadMultiPieceIcon(): " << params.iconName << " inserted into impl-cache, ref-count now = " << icon->refCount(); #endif - -#endif - icon->setMultiPieceIcon(); } return icon; } else { @@ -1660,8 +1887,85 @@ } } -// Initiates an IPC call to the ThemeServer to unload ( decrement ref count ) the icon -void HbIconLoader::unLoadIcon(HbIconImpl *icon, bool unloadedByServer) +inline int iconImplConsumption(HbIconImpl *icon) +{ + QSize sz = icon->keySize().toSize(); + return sz.width() * sz.height() * 4; +} + +void CacheKeeper::ref(HbIconImpl *icon) +{ + int consumption = iconImplConsumption(icon); + // Never hold something more than once and do not ref anything when icons + // are unloaded immediately when becoming hidden. Ignore also icons that are + // too large and those which had not been inserted into iconImplCache + // (e.g. icons that were created with the DoNotCache option). + if (!mIcons.contains(icon) + && !HbInstancePrivate::d_ptr()->mDropHiddenIconData + && consumption < MAX_KEEPALIVE_ITEM_SIZE_BYTES + && !iconImplCache.key(icon).isEmpty()) + { + icon->incrementRefCount(); + mIcons.append(icon); + mConsumption += consumption; + // Now do some housekeeping. + while (mConsumption > MAX_KEEPALIVE_CACHE_SIZE_BYTES) { + HbIconImpl *oldest = mIcons.first(); + unref(oldest); + if (oldest->refCount() == 0 && oldest != icon) { + del(oldest, true); + } + } + } +} + +void CacheKeeper::unref(HbIconImpl *icon) +{ + if (mIcons.contains(icon)) { + mIcons.removeOne(icon); + mConsumption -= iconImplConsumption(icon); + icon->decrementRefCount(); + } +} + +void CacheKeeper::clear() +{ + // Get rid of all unused icons in the iconimplcache, regardless of + // the icons' rendering mode. Note that the list may contain non-sgimage + // iconimpls too that are created on the server, and unlike sgimage the + // unload request for these can never be skipped. + QVector unloadList; + foreach (HbIconImpl *icon, mIcons) { + icon->decrementRefCount(); + if (icon->refCount() == 0) { + if (icon->isCreatedOnServer()) { + unloadList.append(iconImplToReqInfo(icon)); + } + del(icon, false); // no unload request, do it at once at the end + } + } + mConsumption = 0; + mIcons.clear(); + // Now do batch unloading, to reduce IPC. + if (!unloadList.isEmpty()) { + HbThemeClient::global()->batchUnloadIcon(unloadList); + } +} + +void CacheKeeper::del(HbIconImpl *icon, bool sendUnloadReq) +{ + HbIconLoader::global()->removeItemInCache(icon); + if (sendUnloadReq && icon->isCreatedOnServer()) { + HbThemeClient::global()->unloadIcon(iconImplToReqInfo(icon)); + } + icon->dispose(); +} + +// Initiates an IPC call to the ThemeServer to unload (or at least decrement the +// server-side refcount of) the icon, unless the icon unload was initiated by +// the server itself. Also, if the local refcount reaches zero, the icon is +// removed from the local cache. +void HbIconLoader::unLoadIcon(HbIconImpl *icon, bool unloadedByServer, bool noKeep) { if (!icon) { return; @@ -1669,26 +1973,22 @@ icon->decrementRefCount(); - if (icon->refCount() == 0 && icon->isCreatedOnServer()) { + if (icon->refCount() == 0) { if (!unloadedByServer) { - HbThemeClient::global()->unloadIcon(icon->iconFileName(), - icon->keySize(), - icon->iconAspectRatioMode(), - icon->iconMode(), - icon->isMirrored(), - icon->color(), - icon->iconRenderingMode() - ); + // Offer the icon to the cacheKeeper first. + if (!noKeep) { + cacheKeeper()->ref(icon); + } + // If it was accepted then the refcount was increased so stop here. + if (icon->refCount() > 0) { + return; + } + // Otherwise continue with unloading. + if (icon->isCreatedOnServer()) { + HbThemeClient::global()->unloadIcon(iconImplToReqInfo(icon)); + } } -#ifdef HB_ICONIMPL_CACHE - int rem = iconImplCache.remove(iconImplCache.key(icon)); - if (rem > 0) { -#ifdef HB_ICON_TRACES - qDebug() << "Removed from HbIconImpl Cache " << rem << icon->iconFileName() << icon->keySize().height() << "X" << icon->keySize().width() ; -#endif - } -#endif - + removeItemInCache(icon); } } @@ -1735,45 +2035,45 @@ { Q_UNUSED(type); QVector posList; -#ifdef HB_ICONIMPL_CACHE - // search the client cache first before asking the server - for (int i = 0; i < multiPartIconList.count(); i++) { + // Search the client cache first before asking the server. + int count = multiPartIconList.count(); + QVector cacheKeys; + for (int i = 0; i < count; i++) { QByteArray cacheKey = d->createCacheKeyFrom(multiPartIconList[i], - sizeList[i], - aspectRatioMode, - mode, - mirrored, - color, - currRenderMode); - //look up in the local iconImplCache. - //If found return the ptr directly + sizeList[i], + aspectRatioMode, + mode, + mirrored, + color); + cacheKeys.append(cacheKey); + // Look up in the local iconImplCache. HbIconImpl *ptr = 0; if (iconImplCache.contains(cacheKey)) { ptr = iconImplCache.value(cacheKey); - // if a specific frame-item is found in local impl-cache, - // increment the ref count and remove the entry from the list that needs to be sent to server. + // If a specific frame-item is found in local impl-cache, + // increment the ref count and remove the entry from the + // list that needs to be sent to server. ptr->incrementRefCount(); + cacheKeeper()->unref(ptr); #ifdef HB_ICON_CACHE_DEBUG qDebug() << "HbIconLoader::getMultiIconImplFromServer()" << "Cache hit in iconImplCache "; qDebug() << "HbIconLoader::getMultiIconImplFromServer : Client RefCount now = " << ptr->refCount(); #endif iconImplList.append(ptr); - multiPartIconList.replace(i, QString("")); + multiPartIconList.replace(i, QString()); } else { posList << i; } } - for (int i = 0; i < multiPartIconList.count(); i++) { - + for (int i = 0; i < count; i++) { if (multiPartIconList[i].isEmpty()) { multiPartIconList.removeAt(i); sizeList.remove(i); i--; } } -#endif - // If client-side cache is not enabled, ask server for all the pieces' information - int count = multiPartIconList.count(); + + // If no hit in local cache, ask server for all the pieces' information. if (count > 0) { HbSharedIconInfoList iconInfoList = HbThemeClient::global()->getMultiIconInfo(multiPartIconList, sizeList, aspectRatioMode, mode, mirrored, options, color, currRenderMode); @@ -1787,40 +2087,22 @@ params.mirrored = mirrored; params.mirroredIconFound = mirroredIconFound; - for (int i = 0; i < count; i++) { + params.iconFileName = multiPartIconList[i]; + params.size = sizeList.at(i); impl = HbIconImplCreator::createIconImpl(iconInfoList.icon[i], params); if (impl) { - params.iconFileName = multiPartIconList[i]; - params.size = sizeList.at(i); - - -#ifdef HB_ICONIMPL_CACHE - QByteArray cacheKey = d->createCacheKeyFrom( multiPartIconList[i], - sizeList.at(i) , - aspectRatioMode, - mode, - mirrored, - color, - impl->iconRenderingMode() ); - if (iconImplCache.contains(cacheKey)) { - HbIconImpl * oldIcon = iconImplCache.value(cacheKey); - this->unLoadIcon(impl); - impl->dispose(); - impl = oldIcon; - impl->incrementRefCount(); - } else { - iconImplCache.insert(cacheKey, impl); - } + // Not yet in local cache (was checked before the server request) so insert. + iconImplCache.insert(cacheKeys[i], impl); #ifdef HB_ICON_CACHE_DEBUG - qDebug() << "HbIconLoader::getMultiIconImplFromServer(): " << params.iconName << " inserted into impl-cache, ref-count now = " << impl->refCount(); -#endif - + qDebug() << "HbIconLoader::getMultiIconImplFromServer(): " + << params.iconName << " inserted into impl-cache, ref-count now = " << impl->refCount(); #endif } else { //If for some reason individual frame-item's loading in themeserver fails, use HbIconLoader::loadIcon() // as a fallback option to load it. - impl = loadIcon(multiPartIconList[i], HbIconLoader::AnyType, + impl = loadIcon(multiPartIconList[i], + HbIconLoader::AnyType, HbIconLoader::AnyPurpose, sizeList.at(i), Qt::IgnoreAspectRatio, @@ -1830,14 +2112,10 @@ if (impl) { impl->setMultiPieceIcon(); -#ifdef HB_ICONIMPL_CACHE if (posList.count() > 0) { iconImplList.insert(posList.front(), impl); posList.pop_front(); } -#else - iconImplList.append(impl); -#endif } } } @@ -1857,18 +2135,18 @@ // then send to server for unload. foreach(HbIconImpl * impl, multiPieceImpls) { impl->decrementRefCount(); - if (impl->refCount() == 0 && impl->isCreatedOnServer()) { -#ifdef HB_ICONIMPL_CACHE + if (impl->refCount() == 0) { int rem = iconImplCache.remove(iconImplCache.key(impl)); if (rem > 0) { #ifdef HB_ICON_TRACES - qDebug() << "HbIconLoader::unLoadMultiIcon :Removed from HbIconImpl Cache " << rem << impl->iconFileName() << impl->keySize().height() << "X" << impl->keySize().width() ; + qDebug() << "HbIconLoader::unLoadMultiIcon :Removed from HbIconImpl Cache " << rem << impl->iconFileName() << impl->keySize(); #endif } -#endif - // List of icons to be unloaded. - iconNameList << impl->iconFileName(); - sizeList << impl->keySize(); + if (impl->isCreatedOnServer()) { + // List of icons to be unloaded. + iconNameList << impl->iconFileName(); + sizeList << impl->keySize(); + } } } @@ -1886,7 +2164,6 @@ bool HbIconLoader::isInPrivateDirectory(const QString &filename) { - Q_UNUSED(filename); bool isPrivate = false; #ifdef Q_OS_SYMBIAN @@ -1897,9 +2174,54 @@ isPrivate = true; } } +#else + Q_UNUSED(filename); #endif return isPrivate; } +void HbIconLoader::localLoadReady(const HbIconLoadingParams &loadParams, void *reqParams) +{ + // This code is running on the main thread. + HbIconLoaderPrivate::AsyncParams *p = static_cast(reqParams); + // Stop right away if canceled. + if (!d->mActiveAsyncRequests.contains(p)) { + return; + } + // Do not use d->mLdParams, it is not up-to-date. + HbIconLoadingParams params = loadParams; + HbIconImpl *icon = finishLocal(params); + if (icon && !params.options.testFlag(DoNotCache)) { + cacheIcon(params, icon, 0); + } + if (p->mCallback) { + p->mCallback(icon, p->mParam, false); + } + d->mActiveAsyncRequests.removeOne(p); + delete p; +} + +void HbLocalIconLoader::load(const HbIconLoadingParams ¶ms, const QString &format, void *reqParams) +{ + // This is running on a separate thread (d->mLocalLoaderThread) and since + // the HbLocalIconLoader instance is moved to that thread, the requests from + // the main thread are delivered using queued connection so slots/signals + // provide easy inter-thread communication in this case. + HbIconLoaderPrivate::AsyncParams *p = static_cast(reqParams); + // Stop right away if canceled. + if (!HbIconLoaderPrivate::global()->mActiveAsyncRequests.contains(p)) { + return; + } + HbIconLoadingParams loadParams = params; + HbIconLoader::global()->loadLocal(loadParams, format); + emit ready(loadParams, reqParams); +} + +void HbLocalIconLoader::doQuit() +{ + QThread::currentThread()->quit(); +} + + // End of File diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/image/hbiconloader_p.h --- a/src/hbcore/image/hbiconloader_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/image/hbiconloader_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -94,6 +94,8 @@ HbIconAnimator *animator = 0, const QColor &color = QColor()); + typedef void (*HbAsyncIconLoaderCallback)(HbIconImpl *, void *, bool); + HbIconImpl *loadIcon( const QString &iconName, HbIconLoader::IconDataType type, @@ -103,9 +105,13 @@ QIcon::Mode = QIcon::Normal, IconLoaderOptions options = IconLoaderOptions(ReturnUnknownIcon | BitmapIcons | VectorIcons), HbIconAnimator *animator = 0, - const QColor &color = QColor()); + const QColor &color = QColor(), + HbAsyncIconLoaderCallback callback = 0, + void *callbackParam = 0); - void unLoadIcon(HbIconImpl *icon, bool unloadedByServer = false); + void cancelLoadIcon(HbAsyncIconLoaderCallback callback, void *callbackParam); + + void unLoadIcon(HbIconImpl *icon, bool unloadedByServer = false, bool noKeep = false); void unLoadMultiIcon(QVector &multiPieceImpls); HbIconImpl *loadMultiPieceIcon(const QStringList &listOfIcons, @@ -160,13 +166,24 @@ void themeChange(const QStringList &updatedFiles); void destroy(); void updateLayoutDirection(); + void localLoadReady(const HbIconLoadingParams &loadParams, void *reqParams); private: + HbIconImpl *lookupInCache(const HbIconLoadingParams ¶ms, QByteArray *outCacheKey); + void loadLocal(HbIconLoadingParams ¶ms, const QString &format); + void loadLocalAsync(const HbIconLoadingParams ¶ms, const QString &format, + HbAsyncIconLoaderCallback callback, void *callbackParam); + HbIconImpl *finishLocal(HbIconLoadingParams ¶ms); + void cacheIcon(const HbIconLoadingParams ¶ms, HbIconImpl *icon, QByteArray *existingCacheKey); + HbIconImpl *finishGetIconFromServer(HbSharedIconInfo &iconInfo, HbIconLoadingParams ¶ms); void resolveCleanIconName(HbIconLoadingParams ¶ms) const; QSizeF getAnimationDefaultSize(HbIconAnimationDefinition &def, HbIconLoadingParams ¶ms); void loadAnimation(HbIconAnimationDefinition &def, HbIconLoadingParams ¶ms); QString resolveIconFileName(HbIconLoadingParams ¶ms); HbIconImpl *getIconFromServer(HbIconLoadingParams ¶ms); + void getIconFromServerAsync(HbIconLoadingParams ¶ms, + HbAsyncIconLoaderCallback callback, + void *callbackParam); void getMultiIconImplFromServer(QStringList &multiPartIconList, QVector &sizeList, Qt::AspectRatioMode aspectRatioMode, @@ -187,15 +204,31 @@ QList< HbFrameDrawerPrivate *> frameDrawerInstanceList; QList< HbIconEngine *> iconEngineList; - friend class HbApplication; - friend class HbIconLoaderPrivate; + + static bool asyncCallback(const HbSharedIconInfo &info, void *param); private: Q_DISABLE_COPY(HbIconLoader) HbIconLoaderPrivate *d; HbRenderingMode renderMode; + + friend class HbApplication; + friend class HbIconLoaderPrivate; + friend class HbLocalIconLoader; }; Q_DECLARE_OPERATORS_FOR_FLAGS(HbIconLoader::IconLoaderOptions) +class HbLocalIconLoader : public QObject +{ + Q_OBJECT + +public slots: + void load(const HbIconLoadingParams ¶ms, const QString &format, void *reqParams); + void doQuit(); + +signals: + void ready(const HbIconLoadingParams &loadParams, void *reqParams); +}; + #endif // HBICONLOADER_P_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/image/hbiconsource.cpp --- a/src/hbcore/image/hbiconsource.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/image/hbiconsource.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include @@ -44,6 +44,7 @@ #endif // HB_NVG_CS_ICON #endif // HB_BOOTSTRAPPED + #ifdef HB_BOOTSTRAPPED // Copied from HbIconLoader::formatFromPath, @@ -119,7 +120,7 @@ HbIconSource::HbIconSource(const QString &filename) : mFilename(filename), mPicture(0), - mPixmap(0), + mImage(0), mByteArray(0), mSvgRenderer(0), mImageReader(0) @@ -131,7 +132,7 @@ mFilename(filename), mType(type), mPicture(0), - mPixmap(0), + mImage(0), mByteArray(0), mSvgRenderer(0), mImageReader(0) @@ -144,7 +145,7 @@ delete mImageReader; delete mSvgRenderer; delete mPicture; - delete mPixmap; + delete mImage; delete mByteArray; } @@ -228,10 +229,13 @@ } releaseImageReader(); } else if (mType != "BLOB") { - if (!mPixmap) { - mPixmap = new QPixmap(mFilename); + if (!mImage) { + mImage = new QImage(mFilename); + if (mImage->isNull()) { + qWarning("HbIconSource::defaultSize: Cannot load %s", qPrintable(mFilename)); + } } - mDefaultSize = mPixmap->size(); + mDefaultSize = mImage->size(); } } @@ -245,6 +249,9 @@ { if (!mSvgRenderer) { mSvgRenderer = new QSvgRenderer(mFilename); + if (!mSvgRenderer->isValid()) { + qWarning("HbIconSource::svgRenderer: Invalid SVG document: %s", qPrintable(mFilename)); + } } return mSvgRenderer && mSvgRenderer->isValid() ? mSvgRenderer : 0; } @@ -305,6 +312,9 @@ if (!mImageReader) { type(); // make sure type is initialized mImageReader = new QImageReader(mFilename, mType.toLatin1()); + if (!mImageReader->canRead()) { + qWarning("HbIconSource::imageReader: Cannot read image %s", qPrintable(mFilename)); + } } return mImageReader && mImageReader->canRead() ? mImageReader : 0; } @@ -328,25 +338,38 @@ mImageReader = 0; } -QPixmap *HbIconSource::pixmap() +/*! + Returns the QImage, reading from the file, if needed. + + If image() has been called before and the data is still available + then no file access is done. + + HbIconSource works with QImage everywhere so it can be used outside + the gui thread too. + */ +QImage *HbIconSource::image() { - if (!mPixmap) { - mPixmap = new QPixmap(mFilename); + if (!mImage) { + // Must use QImage so this function can be called outside the + // main thread. + mImage = new QImage(mFilename); + if (mImage->isNull()) { + qWarning("HbIconSource::image: Cannot load %s", qPrintable(mFilename)); + } } - - return mPixmap; + return mImage; } -void HbIconSource::deletePixmapIfLargerThan(int limitInBytes) +void HbIconSource::deleteImageIfLargerThan(int limitInBytes) { - if (mPixmap) { - QSize size = mPixmap->size(); - int sizeInBytes = size.width() * size.height() * mPixmap->depth(); + if (mImage) { + QSize size = mImage->size(); + int sizeInBytes = size.width() * size.height() * mImage->depth(); sizeInBytes /= 8; // depth is in bits, we want bytes if (sizeInBytes > limitInBytes) { - delete mPixmap; - mPixmap = 0; + delete mImage; + mImage = 0; } } } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/image/hbiconsource_p.h --- a/src/hbcore/image/hbiconsource_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/image/hbiconsource_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -38,14 +38,14 @@ QT_BEGIN_NAMESPACE class QSvgRenderer; class QPicture; -class QPixmap; +class QImage; class QImageReader; class QByteArray; QT_END_NAMESPACE -// Pixmaps larger than this amount of bytes are deleted after use from previously used icon sources list +// Images larger than this amount of bytes are deleted after use from previously used icon sources list // for not wasting system's memory too much. -static const int PIXMAP_SIZE_LIMIT = 150000; +static const int IMAGE_SIZE_LIMIT = 150000; class HB_CORE_PRIVATE_EXPORT HbIconSource { @@ -66,10 +66,10 @@ QImageReader *imageReader(); void releaseImageReader(); void takeImageReader(); - QPixmap *pixmap(); + QImage *image(); QByteArray *byteArray(); - void deletePixmapIfLargerThan(int limitInBytes); + void deleteImageIfLargerThan(int limitInBytes); private: bool canKeepOpen() const; @@ -78,9 +78,9 @@ QString mFullFilename; QString mType; - // These are used to generate the raster pixmap of the icon and for fetching icon's default size + // These are used to generate the raster image of the icon and for fetching icon's default size QPicture *mPicture; - QPixmap *mPixmap; + QImage *mImage; QByteArray *mByteArray; // Stored default size diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/image/hbsgimageiconimpl_p.cpp --- a/src/hbcore/image/hbsgimageiconimpl_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/image/hbsgimageiconimpl_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -295,6 +295,7 @@ if (vgImageRenderer) { vgImageRenderer->draw(painter, topLeft, clipPath); + //eglWaitClient(); return; } } @@ -372,7 +373,7 @@ return contentSize; } -HbIconImpl::ErrorCode HbSgimageIconImpl::intialize() +HbIconImpl::ErrorCode HbSgimageIconImpl::initialize() { ErrorCode error = ErrorNone; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/image/hbsgimageiconimpl_p.h --- a/src/hbcore/image/hbsgimageiconimpl_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/image/hbsgimageiconimpl_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -57,7 +57,7 @@ QSize defaultSize() const; QSize size(); - ErrorCode intialize(); + ErrorCode initialize(); void destroyMaskedData(HbIconMaskedData *data); private : diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/image/hbvgimageiconrenderer.cpp --- a/src/hbcore/image/hbvgimageiconrenderer.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/image/hbvgimageiconrenderer.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -34,21 +34,17 @@ iconMode(QIcon::Normal), specialCaseApplied(false), rendersize(size), - addedToStates(false), opacityPaint(VG_INVALID_HANDLE), lastOpacity(1.0), iconImpl(impl) { - eglStates = HbEglStates::global(); - eglStates->ref(); } HbVgImageIconRenderer::~HbVgImageIconRenderer() { if (vgImage) { - eglStates->removeVGImage(&vgImage); + vgDestroyImage(vgImage); } - eglStates->deref(eglStates); } void HbVgImageIconRenderer::applyIconProperties() @@ -99,13 +95,8 @@ if (vgImage == VG_INVALID_HANDLE) { vgImage = vgImageCreator(iconImpl , painter); - addedToStates = false; } - if (!addedToStates && vgImage != VG_INVALID_HANDLE) { - eglStates->addVGImage(&vgImage); - addedToStates = true; - } if (vgImage != VG_INVALID_HANDLE) { QPainterPath oldPath; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/image/hbvgimageiconrenderer_p.h --- a/src/hbcore/image/hbvgimageiconrenderer_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/image/hbvgimageiconrenderer_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -81,8 +81,6 @@ QIcon::Mode iconMode; bool specialCaseApplied; QSize rendersize; - HbEglStates *eglStates; - bool addedToStates; VGPaint opacityPaint; qreal lastOpacity; HbIconImpl *iconImpl; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/image/image.pri --- a/src/hbcore/image/image.pri Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/image/image.pri Thu Sep 02 20:44:51 2010 +0300 @@ -81,10 +81,10 @@ PRIVATE_HEADERS += $$PWD/hbnvgiconimpl_p.h PRIVATE_HEADERS += $$PWD/hbeglstate_p.h PRIVATE_HEADERS += $$PWD/hbvgimageiconrenderer_p.h - + SOURCES += $$PWD/hbnvgiconimpl_p.cpp SOURCES += $$PWD/hbeglstate.cpp - SOURCES += $$PWD/hbvgimageiconrenderer.cpp + SOURCES += $$PWD/hbvgimageiconrenderer.cpp } sgimage { SOURCES += $$PWD/hbsgimageiconimpl_p.cpp diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/inputfw/hbinputdef.h --- a/src/hbcore/inputfw/hbinputdef.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/inputfw/hbinputdef.h Thu Sep 02 20:44:51 2010 +0300 @@ -64,25 +64,25 @@ bit HbTouchInputMask set. */ enum HbKeyboardTypeFlag { - HbKeyboardNone = 0x00000000, + HbKeyboardNone = 0x00000000, - HbKeyboard12Key = 0x00000001, /**< Deprecated, use HbKeyboardHardwarePortrait instead. */ + HbKeyboard12Key = 0x00000001, /**< Deprecated, use HbKeyboardHardwarePortrait instead. */ HbKeyboardHardwarePortrait = HbKeyboard12Key, /**< Hardware keyboard for portrait orientation. */ - HbKeyboardQwerty = 0x00000001 | HbQwertyKeyboardMask, /**< Deprecated, use HbKeyboardHardwareLandcape instead */ + HbKeyboardQwerty = 0x00000001 | HbQwertyKeyboardMask, /**< Deprecated, use HbKeyboardHardwareLandcape instead */ HbKeyboardHardwareLandcape = HbKeyboardQwerty, /**< Hardware keyboard for landscape mode. */ - HbKeyboardVirtual12Key = 0x00000001 | HbTouchInputMask, /**< Deprecated, use HbKeyboardTouchPortrait instead. */ + HbKeyboardVirtual12Key = 0x00000001 | HbTouchInputMask, /**< Deprecated, use HbKeyboardTouchPortrait instead. */ HbKeyboardTouchPortrait = HbKeyboardVirtual12Key, /**< Touch keyboard for portrait mode. */ - HbKeyboardVirtualQwerty = 0x00000002 | HbTouchInputMask| HbQwertyKeyboardMask, /**< Touchscreen version of qwerty keyboard */ + HbKeyboardVirtualQwerty = 0x00000002 | HbTouchInputMask| HbQwertyKeyboardMask, /**< Touchscreen version of qwerty keyboard */ HbKeyboardTouchLandscape = HbKeyboardVirtualQwerty, /**< Touch keyboard for landscape mode. */ - HbKeyboardSctPortrait = 0x00000003 | HbTouchInputMask, /**< Special character selection keypad for portrait view */ - HbKeyboardSctLandscape = 0x00000004 | HbTouchInputMask| HbQwertyKeyboardMask, /**< Special character selection keypad for landscape view */ - HbKeyboardHwr = 0x00000005 | HbTouchInputMask| HbHwrKeyboardMask, /**< Hand writing recognition keypad */ - HbKeyboardVirtual12KeyLabels = 0x00000006 | HbTouchInputMask, /**< Key labels for virtual 12 key keyboard */ + HbKeyboardSctPortrait = 0x00000003 | HbTouchInputMask, /**< Special character selection keypad for portrait view */ + HbKeyboardSctLandscape = 0x00000004 | HbTouchInputMask| HbQwertyKeyboardMask, /**< Special character selection keypad for landscape view */ + HbKeyboardHwr = 0x00000005 | HbTouchInputMask| HbHwrKeyboardMask, /**< Hand writing recognition keypad */ + HbKeyboardVirtual12KeyLabels = 0x00000006 | HbTouchInputMask, /**< Key labels for virtual 12 key keyboard */ - HbKeyboardVirtual12KeyEmail = 0x00000008 | HbTouchInputMask, /**< Touchscreen version of conventional phone keypad in URL editor*/ - HbKeyboardVirtual12KeyUrl = 0x00000009 | HbTouchInputMask, /**< Touchscreen version of qwerty keyboard in Email editor */ - HbKeyboardSctEmail = 0x0000000A | HbTouchInputMask, /**< Url Special character selection keypad for portrait view */ - HbKeyboardSctUrl = 0x0000000B | HbTouchInputMask /**< Email Special character selection keypad for portrait view */ + HbKeyboardVirtual12KeyEmail = 0x00000008 | HbTouchInputMask, /**< Touchscreen version of conventional phone keypad in URL editor*/ + HbKeyboardVirtual12KeyUrl = 0x00000009 | HbTouchInputMask, /**< Touchscreen version of qwerty keyboard in Email editor */ + HbKeyboardSctEmail = 0x0000000A | HbTouchInputMask, /**< Url Special character selection keypad for portrait view */ + HbKeyboardSctUrl = 0x0000000B | HbTouchInputMask /**< Email Special character selection keypad for portrait view */ }; Q_DECLARE_FLAGS(HbKeyboardType, HbKeyboardTypeFlag) diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/inputfw/hbinputeditorinterface.cpp --- a/src/hbcore/inputfw/hbinputeditorinterface.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/inputfw/hbinputeditorinterface.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -147,7 +147,7 @@ /*! Returns editor constraints. The returned value is a combination of HbEditorConstraint flags. -\sa setEditorConstraints +\sa setInputConstraints */ HbEditorConstraints HbEditorInterface::inputConstraints() const { @@ -164,7 +164,7 @@ /*! Sets editor constraints. -\sa editorConstraints +\sa inputConstraints */ void HbEditorInterface::setInputConstraints(HbEditorConstraints constraints) { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/inputfw/hbinputeditorinterface_p.cpp --- a/src/hbcore/inputfw/hbinputeditorinterface_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/inputfw/hbinputeditorinterface_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -115,8 +115,14 @@ } } -HbEditorInterfacePrivate *HbEditorInterfacePrivateCache::attachEditor(QObject *editor, HbEditorInterface *interface) +HbEditorInterfacePrivate *HbEditorInterfacePrivateCache::attachEditor(QObject *incomingEditor, HbEditorInterface *interface) { + QObject *editor = incomingEditor; + QGraphicsProxyWidget *proxyTmp = qobject_cast(editor); + if (proxyTmp) { + editor = proxyTmp->widget(); + } + if (editor) { for (int i = 0; i < mObjectCache.count(); i++) { if (mObjectCache[i]->mHostEditor == editor) { @@ -138,32 +144,18 @@ connect(interface, SIGNAL(destroyed(QObject *)), this, SLOT(interfaceDestroyed(QObject *))); connect(newItem, SIGNAL(cursorPositionChanged(int, int)), interface, SIGNAL(cursorPositionChanged(int, int))); - // Check whether the connected object is a QLineEdit or QTextEdit, plain or wrapped in QGraphicsProxyWidget + // Check whether the connected object is Hb editor, QLineEdit or QTextEdit, // and if yes, connect its cursorPositionChanged() signal to this item's cursorPositionChanged() signal if (editor->inherits("HbAbstractEdit")) { connect(editor, SIGNAL(cursorPositionChanged(int, int)), newItem, SIGNAL(cursorPositionChanged(int, int))); } else { - QGraphicsProxyWidget *proxywidget = qobject_cast(editor); - if (proxywidget) { - QWidget *editorwidget = proxywidget->widget(); - QLineEdit *lineedit = qobject_cast(editorwidget); - if (lineedit) { - connect(lineedit, SIGNAL(cursorPositionChanged(int, int)), newItem, SIGNAL(cursorPositionChanged(int, int))); - } else { - QTextEdit *textedit = qobject_cast(editorwidget); - if (textedit) { - connect(textedit, SIGNAL(cursorPositionChanged()), newItem, SLOT(cursorPositionChanged())); - } - } + QLineEdit *lineedit = qobject_cast(editor); + if (lineedit) { + connect(lineedit, SIGNAL(cursorPositionChanged(int, int)), newItem, SIGNAL(cursorPositionChanged(int, int))); } else { - QLineEdit *lineedit = qobject_cast(editor); - if (lineedit) { - connect(lineedit, SIGNAL(cursorPositionChanged(int, int)), newItem, SIGNAL(cursorPositionChanged(int, int))); - } else { - QTextEdit *textedit = qobject_cast(editor); - if (textedit) { - connect(textedit, SIGNAL(cursorPositionChanged()), newItem, SLOT(cursorPositionChanged())); - } + QTextEdit *textedit = qobject_cast(editor); + if (textedit) { + connect(textedit, SIGNAL(cursorPositionChanged()), newItem, SLOT(cursorPositionChanged())); } } } @@ -174,12 +166,18 @@ return 0; } -void HbEditorInterfacePrivateCache::destroyed(QObject *object) +void HbEditorInterfacePrivateCache::destroyed(QObject *incomingObject) { + QObject *object = incomingObject; + QGraphicsProxyWidget *proxyTmp = qobject_cast(object); + if (proxyTmp) { + object = proxyTmp->widget(); + } + for (int i = 0; i < mObjectCache.count(); i++) { if (mObjectCache[i]->mHostEditor == object) { delete mObjectCache[i]; - mObjectCache.remove(i); + mObjectCache.removeAt(i); break; } } @@ -222,8 +220,14 @@ } } -bool HbEditorInterfacePrivateCache::isConnected(QObject *object) +bool HbEditorInterfacePrivateCache::isConnected(QObject *incomingObject) { + QObject *object = incomingObject; + QGraphicsProxyWidget *proxyTmp = qobject_cast(object); + if (proxyTmp) { + object = proxyTmp->widget(); + } + for (int i = 0; i < mObjectCache.count(); i++) { if (mObjectCache[i]->mHostEditor == object) { return true; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/inputfw/hbinputeditorinterface_p.h --- a/src/hbcore/inputfw/hbinputeditorinterface_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/inputfw/hbinputeditorinterface_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -43,7 +43,7 @@ class HbEditorInterface; -class HbEditorInterfacePrivate : public QObject +class HB_CORE_PRIVATE_EXPORT HbEditorInterfacePrivate : public QObject { Q_OBJECT @@ -89,8 +89,7 @@ QMutex mMutex; }; - -class HbEditorInterfacePrivateCache : public QObject +class HB_CORE_PRIVATE_EXPORT HbEditorInterfacePrivateCache : public QObject { Q_OBJECT @@ -112,7 +111,7 @@ void actionDestroyed(QObject *object); private: - QVector mObjectCache; + QList mObjectCache; }; /// @endcond diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/inputfw/hbinputfocusobject.cpp --- a/src/hbcore/inputfw/hbinputfocusobject.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/inputfw/hbinputfocusobject.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -159,8 +159,7 @@ if (d->mFocusedObject) { HbEvent *event = new HbEvent(HbEvent::InputMethodFocusOut); - QCoreApplication::sendEvent(d->mFocusedObject, event); - delete event; + QCoreApplication::postEvent(d->mFocusedObject, event); } delete d_ptr; @@ -731,10 +730,10 @@ } /*! -Sets focus to the editor point by this focus objetc. This method is needed because sometimes +Sets focus to the editor pointed by this focus object. Sometimes input method does something that temporarily removes focus from the original editor, for example displays a dialog which itself contains an editor in it. This method can -be used to return the focus to the original editor. +be used to return the input focus to the original editor. */ void HbInputFocusObject::setFocus() { @@ -749,6 +748,13 @@ widget->setFocus(); } } + + QInputContext* ic = qApp->inputContext(); + if (ic) { + QEvent *openEvent = new QEvent(QEvent::RequestSoftwareInputPanel); + ic->filterEvent(openEvent); + delete openEvent; + } } /*! diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/inputfw/hbinputkeymap.cpp --- a/src/hbcore/inputfw/hbinputkeymap.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/inputfw/hbinputkeymap.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -252,17 +252,8 @@ const HbKeyboardMap *HbKeymap::keyboard(HbKeyboardType keyboard) const { HbKeyboardMap *keyboardMap = 0; - HbKeyboardType newKb = keyboard; - if (keyboard == HbKeyboardVirtual12KeyEmail || - keyboard == HbKeyboardVirtual12KeyUrl) { - newKb = HbKeyboardTouchPortrait; - } - if (keyboard == HbKeyboardSctEmail || - keyboard == HbKeyboardSctUrl) { - newKb = HbKeyboardSctPortrait; - } - if (mPrivate->mKeyboards.contains(newKb)) { - keyboardMap = mPrivate->mKeyboards.value(newKb); + if (mPrivate->mKeyboards.contains(keyboard)) { + keyboardMap = mPrivate->mKeyboards.value(keyboard); } return keyboardMap; } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/inputfw/hbinputkeymapfactory.cpp --- a/src/hbcore/inputfw/hbinputkeymapfactory.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/inputfw/hbinputkeymapfactory.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -30,6 +30,7 @@ #include #include #include +#include #include "hbinputkeymap.h" #include "hbinputsettingproxy.h" @@ -102,7 +103,7 @@ bool HbKeymapFactoryPrivate::findKeymapFile(const HbInputLanguage &language, const QStringList &searchPaths, QFile &file) const { QString filename, latestVersionFilename; - int maxVersionNumber = -1; + qreal maxVersionNumber = -1; foreach(const QString &path, searchPaths) { if (language.variant() == QLocale::AnyCountry) { @@ -114,7 +115,7 @@ if (QFile::exists(filename)) { file.setFileName(filename); - qreal fileVersion = keymapVersion(file); + int fileVersion = keymapVersion(file); if (fileVersion > maxVersionNumber) { latestVersionFilename = filename; maxVersionNumber = fileVersion; @@ -204,9 +205,16 @@ keyboard->keys.append(mappedKey); } } + if (keyboard) { + // The last keyboard definition was not terminated properly, so it needs to be freed at this point + delete keyboard; + keyboard = 0; + qDebug() << "HbInputKeymapFactory: unterminated keyboard definition detected"; + } if (!isValid(keymap)) { delete keymap; keymap = 0; + qDebug() << "HbInputKeymapFactory: invalid keymap definition detected"; } return keymap; } @@ -397,28 +405,30 @@ HbKeymapFactory *instance = HbKeymapFactory::instance(); bool romLanguagesCached = !instance->mPrivate->mRomLanguages.isEmpty(); QList languages; - QStringList files; - QStringList romFiles; + QStringList* files = new QStringList(); + QStringList* romFiles = new QStringList(); foreach(const QString &path, HbInputSettingProxy::keymapPluginPaths()) { if (path.left(2) == ":/" || path.left(2) == "z:") { if (romLanguagesCached) { continue; } QDir languagedir(path); - romFiles += languagedir.entryList(QStringList(QString("*.txt")), QDir::Files); + *romFiles += languagedir.entryList(QStringList(QString("*.txt")), QDir::Files); } else { QDir languagedir(path); - files += languagedir.entryList(QStringList(QString("*.txt")), QDir::Files); + *files += languagedir.entryList(QStringList(QString("*.txt")), QDir::Files); } } if (romLanguagesCached) { languages = instance->mPrivate->mRomLanguages; } else { - instance->mPrivate->parseFileNames(romFiles, languages); + instance->mPrivate->parseFileNames(*romFiles, languages); instance->mPrivate->mRomLanguages = languages; } - instance->mPrivate->parseFileNames(files, languages); + instance->mPrivate->parseFileNames(*files, languages); + delete files; + delete romFiles; return languages; } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/inputfw/hbinputmethod.cpp --- a/src/hbcore/inputfw/hbinputmethod.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/inputfw/hbinputmethod.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -404,7 +404,7 @@ return; } - + // attach focuswidget to prxoy inputcontext as proxy is // the only inputcotext known to qt framework. d->proxy()->QInputContext::setFocusWidget(widget); @@ -814,7 +814,8 @@ } /*! -Wrapper. +Returns true if automatic condititions for automatic upper case are met at +current cursor position. Returns false if there isn't active editor. */ bool HbInputMethod::automaticTextCaseNeeded() const { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/inputfw/hbinputmethod_p.cpp --- a/src/hbcore/inputfw/hbinputmethod_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/inputfw/hbinputmethod_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -149,18 +149,10 @@ HbInputLanguage ret = mInputState.language(); if (ret.undefined()) { - ret = HbInputSettingProxy::instance()->globalInputLanguage(); - if (mFocusObject) { - if ((mFocusObject->editorInterface().inputConstraints() & HbEditorConstraintLatinAlphabetOnly) && - !ret.isLatinAlphabetLanguage()) { - // This is latin alphabet flagged editor, but the language isn't - // latin alphabet language. Switch to english locally. - ret = QLocale::English; - } - } + ret = findStateLanguage(); } - return HbInputLanguage(ret); + return ret; } /*! @@ -191,6 +183,7 @@ // the input mode indicates non-latin mode. Reject. return false; } + return true; } @@ -204,17 +197,19 @@ return false; } - if ((state.inputMode() & HbChineseModeMask) == 0) { - HbEditorConstraints constraints = (HbEditorConstraints)editorConstraints(); - if ((state.textCase() == HbTextCaseUpper || state.textCase() == HbTextCaseAutomatic) - && isLowerCaseOnlyEditor()) { - return false; - } - - if (state.textCase() == HbTextCaseLower - && isUpperCaseOnlyEditor() - && !(state.inputMode() & HbNumericModeMask)) { - return false; + if ((state.inputMode() & HbChineseModeMask) == 0) { + if (state.textCase() == HbTextCaseLower) { + // Reject if text case is lower but the editor is + // configured as upper case only editor. + if (isUpperCaseOnlyEditor() && !(state.inputMode() & HbNumericModeMask)) { + return false; + } + } else if (state.textCase() != HbTextCaseNone) { + // Reject if text case is upper or automatic but the editor + // is configured as lower case only editor. + if (isLowerCaseOnlyEditor() && !(state.inputMode() & HbNumericModeMask)) { + return false; + } } } @@ -223,40 +218,41 @@ /*! \internal -Finds state handler for given input state. +Finds state handler for given input state. There has to be focus object. */ HbInputMethod *HbInputMethodPrivate::findStateHandler(HbInputState &state) { HbInputMethod *stateHandler = 0; - if (mFocusObject && - (mFocusObject->editorInterface().inputConstraints() & HbEditorConstraintIgnoreFocus)) { - return HbInputMethodNull::Instance(); - } - - if (stateAllowedInEditor(state)) { - HbInputMethodDescriptor preferredMethod = HbInputSettingProxy::instance()->preferredInputMethod(); - if (!preferredMethod.isEmpty()) { - stateHandler = HbInputModeCache::instance()->loadInputMethod(preferredMethod); - if (stateHandler && !HbInputModeCache::instance()->acceptsState(stateHandler, state)) { - stateHandler = 0; - } + if (mFocusObject) { + if (mFocusObject->editorInterface().inputConstraints() & HbEditorConstraintIgnoreFocus) { + return HbInputMethodNull::Instance(); } - if (!stateHandler) { - stateHandler = HbInputModeCache::instance()->findStateHandler(state); - } + if (stateAllowedInEditor(state)) { + HbInputMethodDescriptor preferredMethod = HbInputSettingProxy::instance()->preferredInputMethod(mFocusObject->orientation()); + if (!preferredMethod.isEmpty()) { + stateHandler = HbInputModeCache::instance()->loadInputMethod(preferredMethod); + if (stateHandler && !HbInputModeCache::instance()->acceptsState(stateHandler, state)) { + stateHandler = 0; + } + } - if (!stateHandler && - state.inputMode() == HbInputModeNumeric && - state.language() != QLocale::English && - mFocusObject && - (mFocusObject->editorInterface().inputConstraints() & HbEditorConstraintFixedInputMode)) { - // This is number only editor but there was no numeric handler - // for specified language. Use default numeric hanlder - // as a fallback. - state.setLanguage(QLocale::English); - stateHandler = HbInputModeCache::instance()->findStateHandler(state); + if (!stateHandler) { + stateHandler = HbInputModeCache::instance()->findStateHandler(state); + } + + if (!stateHandler && + state.inputMode() == HbInputModeNumeric && + state.language() != QLocale::English && + mFocusObject && + (mFocusObject->editorInterface().inputConstraints() & HbEditorConstraintFixedInputMode)) { + // This is number only editor but there was no numeric handler + // for specified language. Use default numeric hanlder + // as a fallback. + state.setLanguage(QLocale::English); + stateHandler = HbInputModeCache::instance()->findStateHandler(state); + } } } @@ -631,8 +627,6 @@ HbTextCase ret = HbTextCaseNone; if (mFocusObject) { - Qt::InputMethodHints hints = mFocusObject->inputMethodHints(); - // Then handle the text case: find out what it should be and and if // automatic text case is needed. ret = (HbTextCase)mFocusObject->editorInterface().textCase(); @@ -653,7 +647,7 @@ } // Then see if there are exceptions that override previous decisions. - if (hints & Qt::ImhPreferUppercase) { + if (mFocusObject->inputMethodHints() & Qt::ImhPreferUppercase) { ret = HbTextCaseUpper; } @@ -673,6 +667,8 @@ */ HbInputModeType HbInputMethodPrivate::initialInputMode(const HbInputLanguage &language) const { + Q_UNUSED(language); + HbInputModeType ret = HbInputModeNone; if (mFocusObject) { @@ -680,13 +676,12 @@ // This is fixed mode editor, always trust what editor interface gives us. ret = (HbInputModeType)mFocusObject->editorInterface().mode(); } else { - // Editor doesn't have mode asigned. Propose default mode. - Qt::InputMethodHints hints = mFocusObject->inputMethodHints(); + // Editor doesn't have mode asigned. Propose default mode. if (mFocusObject->editorInterface().isNumericEditor()) { // It is fixed numeric editor. ret = HbInputModeNumeric; } else { - ret = defaultInputMode(language); + ret = HbInputModeDefault; } } } @@ -709,17 +704,6 @@ /*! \internal -Returns the default input mode for given language. -*/ -HbInputModeType HbInputMethodPrivate::defaultInputMode(const HbInputLanguage &inputLanguage) const -{ - Q_UNUSED(inputLanguage); - - return HbInputModeDefault; -} - -/*! -\internal A convenience method for setting up the editor as digits only editor. */ void HbInputMethodPrivate::setUpFocusedObjectAsDigitsOnlyEditor() @@ -867,7 +851,7 @@ // QGraphicsWidget is inside a graphics view which is not inside a HbMainWindow. if (mInsideVanillaWindow) { HbInputMainWindow *mainWindow = HbInputMainWindow::instance(); - mainWindow->hideInputWindow(); + mainWindow->hideInputWindow(); } } @@ -945,7 +929,9 @@ if (mFocusLocked == false) { // Focus out, but don't delete focus object. We're going to need signals from // it when the orientation sequence is over. - q->disconnect(mFocusObject->object(), SIGNAL(destroyed(QObject *)), q, SLOT(editorDeleted(QObject *))); + if (mFocusObject) { + q->disconnect(mFocusObject->object(), SIGNAL(destroyed(QObject *)), q, SLOT(editorDeleted(QObject *))); + } q->focusLost(false); hideMainWindow(); @@ -967,12 +953,11 @@ /*! \internal -Creates new focus object and connects the signals. +Creates new focus object. */ HbInputFocusObject *HbInputMethodPrivate::createAndSetupFocusObject(QObject *editorWidget) { HbInputFocusObject *fo = new HbInputFocusObject(editorWidget); - return fo; } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/inputfw/hbinputmethod_p.h --- a/src/hbcore/inputfw/hbinputmethod_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/inputfw/hbinputmethod_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -25,15 +25,14 @@ #ifndef HB_INPUT_METHOD_P_H #define HB_INPUT_METHOD_P_H -#include #include #include #include #include + #include "hbinputcontextproxy_p.h" -class HbInputStateMachine; class HbInputFilter; class HbInputMethod; class HbInputMainWindow; @@ -81,8 +80,7 @@ void editorRootState(HbInputState &result) const; void constructLatinState(HbInputState &result) const; HbTextCase initialTextCase(HbInputModeType inputMode) const; - HbInputModeType initialInputMode(const HbInputLanguage &language) const; - HbInputModeType defaultInputMode(const HbInputLanguage &inputLanguage) const; + HbInputModeType initialInputMode(const HbInputLanguage &language) const; void setUpFocusedObjectAsDigitsOnlyEditor(); void setUpFocusedObjectAsFormattedNumberEditor(); void setUpFocusedObjectAsPhoneNumberEditor(); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/inputfw/hbinputmodecache.cpp --- a/src/hbcore/inputfw/hbinputmodecache.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/inputfw/hbinputmodecache.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -259,20 +259,6 @@ void HbInputModeCachePrivate::updateMonitoredPaths() { - QStringList watchedDirs = mWatcher->directories(); - if (!watchedDirs.isEmpty()) { - mWatcher->removePaths(watchedDirs); - } - - QStringList paths = HbInputSettingProxy::instance()->inputMethodPluginPaths(); - foreach(const QString &path, paths) { - QDir dir(path); - if (!dir.exists() && path.left(1) == "f") { - mWatcher->addPath(QString("f:") + QDir::separator()); - } else { - mWatcher->addPath(path); - } - } } bool HbInputModeCachePrivate::isMappedLanguage(const HbInputLanguage &language) const diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/inputfw/hbinputsettingproxy.cpp --- a/src/hbcore/inputfw/hbinputsettingproxy.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/inputfw/hbinputsettingproxy.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -424,7 +424,6 @@ if (aObserver) { connect(this, SIGNAL(globalInputLanguageChanged(const HbInputLanguage &)), aObserver, SLOT(globalInputLanguageChanged(const HbInputLanguage &))); connect(this, SIGNAL(globalSecondaryInputLanguageChanged(const HbInputLanguage &)), aObserver, SLOT(globalSecondaryInputLanguageChanged(const HbInputLanguage &))); - connect(this, SIGNAL(activeKeyboardChanged(HbKeyboardType)), aObserver, SLOT(activeKeyboardChanged(HbKeyboardType))); } } @@ -438,7 +437,6 @@ if (aObserver) { disconnect(this, SIGNAL(globalInputLanguageChanged(const HbInputLanguage &)), aObserver, SLOT(globalInputLanguageChanged(const HbInputLanguage &))); disconnect(this, SIGNAL(globalSecondaryInputLanguageChanged(const HbInputLanguage &)), aObserver, SLOT(globalSecondaryInputLanguageChanged(const HbInputLanguage &))); - disconnect(this, SIGNAL(activeKeyboardChanged(HbKeyboardType)), aObserver, SLOT(activeKeyboardChanged(HbKeyboardType))); } } @@ -495,25 +493,8 @@ } /*! -\deprecated HbInputSettingProxy::activeHwKeyboard() const - is deprecated. Use HbInputSettingProxy::activeKeyboard(Qt::Orientation) instead. -Returns active hardware keyboard type. +Stores speed attribute for handwriting recognition. */ -HbKeyboardType HbInputSettingProxy::activeHwKeyboard() const -{ - return HbKeyboardNone; -} - -/*! -\deprecated HbInputSettingProxy::activeTouchKeyboard() const - is deprecated. Use HbInputSettingProxy::activeKeyboard(Qt::Orientation) instead. -Returns active touch keyboard type. -*/ -HbKeyboardType HbInputSettingProxy::activeTouchKeyboard() const -{ - return HbKeyboardNone; -} - void HbInputSettingProxy::setHwrWritingSpeed(HbHwrWritingSpeed speed) { Q_D(HbInputSettingProxy); @@ -532,6 +513,9 @@ } } +/*! +Returns handwriting recignition speed attribute. +*/ HbHwrWritingSpeed HbInputSettingProxy::hwrWritingSpeed() const { Q_D(const HbInputSettingProxy); @@ -545,6 +529,9 @@ return res; } +/*! +Strores detail mode for Chinese CangJie input mode. +*/ void HbInputSettingProxy::setDetailedCangjieMode(HbCangjieDetailMode cangjieDetail) { Q_D(HbInputSettingProxy); @@ -563,6 +550,9 @@ } } +/*! +Returns detail mode for Chinese CangJie input mode. +*/ HbCangjieDetailMode HbInputSettingProxy::detailedCangjieMode() const { Q_D(const HbInputSettingProxy); @@ -577,16 +567,6 @@ } /*! -\deprecated HbInputSettingProxy::activeKeyboard() const - is deprecated. Use HbInputSettingProxy::activeKeyboard(Qt::Orientation) instead. -*/ -HbKeyboardType HbInputSettingProxy::activeKeyboard() const -{ - Q_D(const HbInputSettingProxy); - return activeKeyboard(d->inputFrameworkScreenOrientation()); -} - -/*! Returns active keyboard for given screen oriention. */ HbKeyboardType HbInputSettingProxy::activeKeyboard(Qt::Orientation orientation) const @@ -635,30 +615,6 @@ } /*! -\deprecated HbInputSettingProxy::preferredInputMethod() const - is deprecated. Use HbInputSettingProxy::preferredInputMethod(Qt::Orientation) const instead. -*/ -HbInputMethodDescriptor HbInputSettingProxy::preferredInputMethod() const -{ - Q_D(const HbInputSettingProxy); - - HbInputMethodDescriptor result; - - HbSettingProxyInternalData *prData = d->proxyData(); - if (prData) { - d->lock(); - if (d->inputFrameworkScreenOrientation() == Qt::Horizontal) { - result = prData->iPreferredMethodHorizontal.descriptor(); - } else { - result = prData->iPreferredMethodVertical.descriptor(); - } - d->unlock(); - } - - return result; -} - -/*! Returns custom data associated to preferred input method. \sa setPreferredInputMethod @@ -756,33 +712,6 @@ } /*! -\deprecated HbInputSettingProxy::setActiveHwKeyboard(HbKeyboardType) - is deprecated. -*/ -void HbInputSettingProxy::setActiveHwKeyboard(HbKeyboardType keyboard) -{ - Q_UNUSED(keyboard); -} - -/*! -\deprecated HbInputSettingProxy::setActiveTouchKeyboard(HbKeyboardType) - is deprecated. -*/ -void HbInputSettingProxy::setActiveTouchKeyboard(HbKeyboardType keyboard) -{ - Q_UNUSED(keyboard); -} - -/*! -\deprecated HbInputSettingProxy::setActiveKeyboard(HbKeyboardType) - is deprecated. -*/ -void HbInputSettingProxy::setActiveKeyboard(HbKeyboardType keyboard) -{ - Q_UNUSED(keyboard); -} - -/*! Returns the status of predictive input feature. Returns true if any one of given keyboard types has the prediction enabled. An editor instance may still forbid predictive input feature, even if the device wide status allows it. @@ -1117,73 +1046,6 @@ } /*! -\deprecated HbInputSettingProxy::activeCustomInputMethod() const - is deprecated. Use preferredInputMethod instead. -Returns active custom input method. The pluginNameAndPath field is empty if no custom input methid is active. - -\sa setActiveCustomInputMethod -*/ -HbInputMethodDescriptor HbInputSettingProxy::activeCustomInputMethod() const -{ - return HbInputMethodDescriptor(); -} - -/*! -\deprecated HbInputSettingProxy::setActiveCustomInputMethod(const HbInputMethodDescriptor&) - is deprecated. Use setPreferredInputMethod instead. -\sa activeCustomInputMethod -*/ -void HbInputSettingProxy::setActiveCustomInputMethod(const HbInputMethodDescriptor &inputMethod) -{ - Q_UNUSED(inputMethod) -} - -/*! -\deprecated HbInputSettingProxy::screenOrientation() - is deprecated. Use HbInputFocusObject::screenOrientation() instead. -*/ -Qt::Orientation HbInputSettingProxy::screenOrientation() -{ - Q_D(HbInputSettingProxy); - return d->inputFrameworkScreenOrientation(); -} - -/*! -\deprecated HbInputSettingProxy::setScreenOrientation(Qt::Orientation) - is deprecated. -*/ -void HbInputSettingProxy::setScreenOrientation(Qt::Orientation screenOrientation) -{ - Q_UNUSED(screenOrientation); -} - -/*! -\deprecated HbInputSettingProxy::notifyScreenOrientationChange() - is deprecated. -*/ -void HbInputSettingProxy::notifyScreenOrientationChange() -{ -} - -/*! -\deprecated HbInputSettingProxy::orientationChangeCompleted() const - is deprecated. -*/ -bool HbInputSettingProxy::orientationChangeCompleted() const -{ - return false; -} - -/*! -\deprecated HbInputSettingProxy::initializeOrientation(Qt::Orientation) - is deprecated. -*/ -void HbInputSettingProxy::initializeOrientation(Qt::Orientation screenOrientation) -{ - Q_UNUSED(screenOrientation); -} - -/*! Returns the status of regional input correction feature. \sa enableRegionalCorrection. @@ -1386,4 +1248,55 @@ return res; } +/*! +Set the variable to true if the default keypad is western for chinese input method + +\sa useWesternDefaultKeypadForChinese +*/ +void HbInputSettingProxy::setWesternDefaultKeypadForChinese(bool set) +{ + Q_D(const HbInputSettingProxy); + + HbSettingProxyInternalData *prData = d->proxyData(); + if (prData) { + bool notify = false; + d->lock(); + if(prData->iUseWesternDefaultKeypadForChinese != set) { + prData->iUseWesternDefaultKeypadForChinese = set; + notify = true; + } + d->unlock(); + if(notify) { + emit chineseDefaultKeypadChanged(prData->iUseWesternDefaultKeypadForChinese); + } + } +} + +/*! +Get whether the default keypad is western for chinese input method + +\sa setWesternDefaultKeypadForChinese +*/ +bool HbInputSettingProxy::useWesternDefaultKeypadForChinese() const +{ + Q_D(const HbInputSettingProxy); + + HbSettingProxyInternalData *prData = d->proxyData(); + + if (prData) { + return prData->iUseWesternDefaultKeypadForChinese; + } + + return false; +} + +/*! +\deprecated HbInputSettingProxy::setActiveKeyboard(HbKeyboardType) + is deprecated. +*/ +void HbInputSettingProxy::setActiveKeyboard(HbKeyboardType keyboard) +{ + Q_UNUSED(keyboard); +} + // End of file diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/inputfw/hbinputsettingproxy.h --- a/src/hbcore/inputfw/hbinputsettingproxy.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/inputfw/hbinputsettingproxy.h Thu Sep 02 20:44:51 2010 +0300 @@ -58,16 +58,10 @@ void disconnectObservingObject(QObject *observer); HbInputLanguage globalInputLanguage() const; void availableHwKeyboard(QList& listOfAvailableKeyboards) const; - HbInputLanguage globalSecondaryInputLanguage() const; - HbKeyboardType activeKeyboard() const; - HbKeyboardType activeKeyboard(Qt::Orientation orientation) const; - HbKeyboardType activeHwKeyboard() const; - HbKeyboardType activeTouchKeyboard() const; + HbInputLanguage globalSecondaryInputLanguage() const; + HbKeyboardType activeKeyboard(Qt::Orientation orientation) const; void setGlobalInputLanguage(const HbInputLanguage &langauge); - void setGlobalSecondaryInputLanguage(const HbInputLanguage &language); - void setActiveKeyboard(HbKeyboardType keyboard); - void setActiveHwKeyboard(HbKeyboardType keyboard); - void setActiveTouchKeyboard(HbKeyboardType keyboard); + void setGlobalSecondaryInputLanguage(const HbInputLanguage &language); bool predictiveInputStatus(HbKeyboardSettingFlags keyboardType) const; void setPredictiveInputStatus(HbKeyboardSettingFlags keyboardType, bool newStatus); bool predictiveInputStatusForActiveKeyboard() const; @@ -77,14 +71,7 @@ bool automaticTextCasingForQwerty(); void setAutomaticTextCasingForQwerty(bool status); void setCharacterPreviewForQwerty(bool previewEnabled); - bool isCharacterPreviewForQwertyEnabled(); - HbInputMethodDescriptor activeCustomInputMethod() const; - void setActiveCustomInputMethod(const HbInputMethodDescriptor &inputMethod); - Qt::Orientation screenOrientation(); - void setScreenOrientation(Qt::Orientation screenOrientation); - void notifyScreenOrientationChange(); - bool orientationChangeCompleted() const; - void initializeOrientation(Qt::Orientation screenOrientation); + bool isCharacterPreviewForQwertyEnabled(); bool regionalCorrectionEnabled(); void enableRegionalCorrection(bool status); void setKeypressTimeout(int timeout); @@ -95,26 +82,24 @@ HbTypingCorrectionLevel typingCorrectionLevel() const; void setPrimaryCandidateMode(HbPrimaryCandidateMode mode); HbPrimaryCandidateMode primaryCandidateMode() const; - HbInputMethodDescriptor preferredInputMethod(Qt::Orientation orientation) const; - HbInputMethodDescriptor preferredInputMethod() const; + HbInputMethodDescriptor preferredInputMethod(Qt::Orientation orientation) const; QByteArray preferredInputMethodCustomData(Qt::Orientation orientation) const; void setPreferredInputMethod(Qt::Orientation orientation, const HbInputMethodDescriptor &inputMethod, const QByteArray &customData = QByteArray()); void setHwrWritingSpeed(HbHwrWritingSpeed speed); HbHwrWritingSpeed hwrWritingSpeed() const; void setDetailedCangjieMode(HbCangjieDetailMode cangjieDetail); HbCangjieDetailMode detailedCangjieMode() const; + void setWesternDefaultKeypadForChinese(bool useWestern); + bool useWesternDefaultKeypadForChinese() const; + + void setActiveKeyboard(HbKeyboardType keyboard); signals: void globalInputLanguageChanged(const HbInputLanguage &newLanguage); - void globalSecondaryInputLanguageChanged(const HbInputLanguage &newLanguage); - void activeKeyboardChanged(HbKeyboardType newKeyboard); - void activeHwKeyboardChanged(HbKeyboardType newKeyboard); - void activeTouchKeyboardChanged(HbKeyboardType newKeyboard); + void globalSecondaryInputLanguageChanged(const HbInputLanguage &newLanguage); void predictiveInputStateChanged(HbKeyboardSettingFlags keyboardType, bool newState); void automaticTextCasingStateForQwertyChanged(bool newState); - void characterPreviewStateForQwertyChanged(bool newState); - void orientationAboutToChange(); - void orientationChanged(Qt::Orientation orientation); + void characterPreviewStateForQwertyChanged(bool newState); void regionalCorretionStatusChanged(bool newStatus); void keypressTimeoutChanged(int newTimeout); void autocompletionStateChanged(HbKeyboardSettingFlags keyboardType, bool newState); @@ -122,6 +107,7 @@ void primaryCandidateModeChanged(HbPrimaryCandidateMode newMode); void hwrWritingSpeedChanged(HbHwrWritingSpeed speed); void detailedCangjieModeChanged(HbCangjieDetailMode); + void chineseDefaultKeypadChanged(bool toWestern); public slots: void togglePrediction(); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/inputfw/hbinputsettingproxy_p.h --- a/src/hbcore/inputfw/hbinputsettingproxy_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/inputfw/hbinputsettingproxy_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -32,7 +32,7 @@ #include "hbinputmethoddescriptor.h" #include "hbinputlanguage.h" -const int HbProxyDataRequiredVersion = 20; +const int HbProxyDataRequiredVersion = 22; const QString KInputSettingProxyKey("HbInputSettingProxy"); const unsigned int HbActiveMethodNameMax = 255; const unsigned int HbActiveMethodKeyMax = 64; @@ -83,6 +83,7 @@ HbSettingProxyInputMethodDescriptor iPreferredMethodVertical; HbHwrWritingSpeed iHwrSpeed; HbCangjieDetailMode iCangjieMode; + bool iUseWesternDefaultKeypadForChinese; }; class HB_CORE_PRIVATE_EXPORT HbInputSettingProxyPrivate diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/primitives/hbiconitem.cpp --- a/src/hbcore/primitives/hbiconitem.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/primitives/hbiconitem.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -29,6 +29,7 @@ #include "hbicon_p.h" #include "hboogmwatcher_p.h" #include "hbinstance_p.h" +#include "hbiconengine_p.h" #include #include @@ -112,6 +113,16 @@ bool HbIconItemPrivate::outlinesEnabled = false; +static void asyncReady(void *param) +{ + HbIconItem *item = static_cast(param); + HbIconItemPrivate *d = HbIconItemPrivate::d_ptr(item); + bool doUpdate = d->mAsyncFilter ? !d->mAsyncFilter(item, d->mAsyncFilterParam) : true; + if (doUpdate) { + item->update(); + } +} + HbIconItemPrivate::HbIconItemPrivate(const HbIcon &icon) : mIcon(icon), mAnimator(), @@ -120,7 +131,10 @@ mState(HbIconItem::defaultState), mMode(HbIconItem::defaultMode), mClearCachedRect(true), - mIconScalingEnabled(true) + mIconScalingEnabled(true), + mAsync(false), + mAsyncFilter(0), + mAsyncFilterParam(0) { q_ptr = 0; } @@ -137,7 +151,9 @@ // possibility of detaching. Doing it afterwards would lead to // colorization errors as the themed color might potentially be set for // a different icon engine, not for the one that is used in painting. - HbIconPrivate::d_ptr_detached(&mIcon)->setThemedColor(mThemedColor); + HbIconPrivate *p = HbIconPrivate::d_ptr_detached(&mIcon); + p->setThemedColor(mThemedColor); + p->setAsync(mAsync, asyncReady, q); } const QRectF boundingRect = q->rect(); if (!boundingRect.size().isEmpty()) { @@ -153,7 +169,9 @@ Q_Q(HbIconItem); if (mIconRect.isValid()) { if (!mIcon.isNull()) { - HbIconPrivate::d_ptr_detached(&mIcon)->setThemedColor(mThemedColor); + HbIconPrivate *p = HbIconPrivate::d_ptr_detached(&mIcon); + p->setThemedColor(mThemedColor); + p->setAsync(mAsync, asyncReady, q); } mAnimator.setIcon(mIcon); } @@ -174,6 +192,27 @@ } /*! + Requests clearStoredIconContent() for the currently set icon. +*/ +void HbIconItemPrivate::clearStoredIconContent() +{ + HbIconPrivate::d_ptr(&mIcon)->clearStoredIconContent(); +} + +/*! + Installs a filter for the async-load-ready callbacks. + + When non-null, the filter is called before invoking update() on the + icon item, and if the filter returns true, the update() call is + suppressed. +*/ +void HbIconItemPrivate::setAsyncCallbackFilter(AsyncCallbackFilter filter, void *filterParam) +{ + mAsyncFilter = filter; + mAsyncFilterParam = filterParam; +} + +/*! Constructs a new HbIconItem with \a iconName and \a parent. \param iconName the name of the icon. See HbIcon for a description of how the icon name and the icon image filename are related. @@ -461,7 +500,26 @@ d->updateIconItem(); } } - + +/*! + This function can be used to enable asynchronous icon data retrieval. + + It has no effect if called after the first paint so it needs to be called + immediately after creating the HbIconItem instance. + + While the data is not available empty content will be painted. + + \sa async + */ +void HbIconItem::setAsync(bool async) +{ + Q_D(HbIconItem); + if (d->mAsync != async) { + d->mAsync = async; + d->updateIconItem(); + } +} + /*! Sets the new icon name for this HbIconItem for \a mode and \a state. If iconName is already set in HbIconItem then it will be replaced with this new iconName. @@ -647,7 +705,19 @@ Q_D(const HbIconItem); return d->mIconScalingEnabled; } - + +/*! + \return the current setting for asynchronous icon data retrieval. + By default the value is false (i.e. disabled). + + \sa setAsync + */ +bool HbIconItem::async() const +{ + Q_D(const HbIconItem); + return d->mAsync; +} + /*! * Refer HbIcon::isNull() */ @@ -667,14 +737,22 @@ Q_UNUSED(widget) Q_UNUSED(option) Q_D(HbIconItem); + + if (d->mIcon.isNull()) { + return; + } + if (d->mClearCachedRect){ d->recalculateBoundingRect(); } + if (!d->mBoundingRect.isEmpty()){ if (d->mIconRect != d->mBoundingRect) { d->mIconRect = d->mBoundingRect; if (!d->mIcon.isNull()) { - HbIconPrivate::d_ptr_detached(&d->mIcon)->setThemedColor(d->mThemedColor); + HbIconPrivate *p = HbIconPrivate::d_ptr_detached(&d->mIcon); + p->setThemedColor(d->mThemedColor); + p->setAsync(d->mAsync, asyncReady, this); } d->mIcon.setSize(d->mIconScalingEnabled ? d->mIconRect.size() : d->mIcon.defaultSize()); d->mAnimator.setIcon(d->mIcon); @@ -686,6 +764,7 @@ d->mAspectRatioMode, d->mAlignment, d->mMode, d->mState); } + if (HbIconItemPrivate::outlinesEnabled) { painter->setBrush(QBrush(QColor(0, 255, 0, 50))); painter->drawRect(contentsRect()); @@ -762,12 +841,4 @@ return d->mAnimator; } -/*! - Requests clearStoredIconContent() for the currently set icon. - */ -void HbIconItemPrivate::clearStoredIconContent() -{ - HbIconPrivate::d_ptr(&mIcon)->clearStoredIconContent(); -} - // end of file diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/primitives/hbiconitem.h --- a/src/hbcore/primitives/hbiconitem.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/primitives/hbiconitem.h Thu Sep 02 20:44:51 2010 +0300 @@ -56,6 +56,7 @@ void setMirroringMode(HbIcon::MirroringMode mode); void setBrush(const QBrush &brush); void setIconScaling(bool enabled = true); + void setAsync(bool async = true); void setColor(const QColor &color); QColor color() const; @@ -72,6 +73,7 @@ HbIcon::MirroringMode mirroringMode() const; QBrush brush() const; bool iconScaling() const; + bool async() const; bool isNull() const; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/primitives/hbiconitem_p.h --- a/src/hbcore/primitives/hbiconitem_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/primitives/hbiconitem_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -34,21 +34,27 @@ #include #include -class HbIconItemPrivate : public HbWidgetBasePrivate +class HB_CORE_PRIVATE_EXPORT HbIconItemPrivate : public HbWidgetBasePrivate { Q_DECLARE_PUBLIC(HbIconItem) public: HbIconItemPrivate(const HbIcon &icon); ~HbIconItemPrivate(); + void clearStoredIconContent(); void updateIconItem(); void updateIconParams(); void recalculateBoundingRect() const; void setThemedColor(const QColor &color); + + typedef bool (*AsyncCallbackFilter)(HbIconItem *target, void *param); + void setAsyncCallbackFilter(AsyncCallbackFilter filter, void *filterParam); + static HbIconItemPrivate *d_ptr(HbIconItem *item) { return item->d_func(); } + HbIcon mIcon; HbIconAnimator mAnimator; Qt::Alignment mAlignment; @@ -62,6 +68,9 @@ mutable QRectF mAdjustedRect; mutable bool mClearCachedRect; bool mIconScalingEnabled; + bool mAsync; + AsyncCallbackFilter mAsyncFilter; + void *mAsyncFilterParam; static bool outlinesEnabled; }; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/primitives/hbprogresstrackitem.cpp --- a/src/hbcore/primitives/hbprogresstrackitem.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/primitives/hbprogresstrackitem.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -76,8 +76,8 @@ } void HbProgressTrackItem::paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget ) { - Q_UNUSED(widget); - Q_UNUSED(option); + Q_UNUSED(widget); + Q_UNUSED(option); if(boundingRect()!= parentItem()->boundingRect()){ setGeometry(parentItem()->boundingRect()); @@ -105,8 +105,8 @@ } else{ - qreal start = boundingRect().bottom() -(qreal)boundingRect().height()*((value - minimum)/(qreal) (mDiff)); - maskRect = QRectF( + qreal start = boundingRect().bottom() -(qreal)boundingRect().height()*((value - minimum)/(qreal) (mDiff)); + maskRect = QRectF( (qreal)boundingRect().topLeft().x(), start, (qreal)boundingRect().width(), @@ -116,9 +116,9 @@ } } -// QPainterPath path; -// path.addRect(maskRect); -// frameDrawer().setClipPath(path); +// QPainterPath path; +// path.addRect(maskRect); +// frameDrawer().setClipPath(path); QPixmap pixmap(boundingRect().size().toSize()); pixmap.fill(Qt::white); QPainter painter1; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/primitives/hbrepeaticonitem_p.cpp --- a/src/hbcore/primitives/hbrepeaticonitem_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/primitives/hbrepeaticonitem_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -47,11 +47,11 @@ mOffset(0), mRepeatPixmap(0), mOrientation(Qt::Horizontal), - mConnected(false) + mConnected(false) { - connect(&mTimer,SIGNAL(timeout()),this,SLOT(updateAnimation())); - + connect(&mTimer,SIGNAL(timeout()),this,SLOT(updateAnimation())); + } @@ -62,7 +62,7 @@ mMask(QPixmap()), mOffset(0), mRepeatPixmap(0), - mConnected(false) + mConnected(false) { connect(&mTimer,SIGNAL(timeout()),this,SLOT(updateAnimation())); } @@ -112,7 +112,7 @@ */ void HbRepeatIconItem::updateAnimation() { - mConnected = true; + mConnected = true; if(mIcon.width()>0 && mIcon.height()>0){ if(mOrientation == Qt::Horizontal){ mOffset = (mOffset+2) % (int)mIcon.width(); @@ -129,15 +129,15 @@ { Q_UNUSED(option); Q_UNUSED(widget); - if(!mConnected) { - connect(&mTimer,SIGNAL(timeout()),this,SLOT(updateAnimation())); - } - // Chec the status of timer - if (!mTimer.isActive()) { - mTimer.start(122); - } - - if(mParentRect != parentItem()->boundingRect()) { + if(!mConnected) { + connect(&mTimer,SIGNAL(timeout()),this,SLOT(updateAnimation())); + } + // Chec the status of timer + if (!mTimer.isActive()) { + mTimer.start(122); + } + + if(mParentRect != parentItem()->boundingRect()) { resizeEvent(0); // need to regenerate optimized pixmap. } QPixmap newblit(boundingRect().size().toSize()); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/primitives/hbrepeaticonitem_p.h --- a/src/hbcore/primitives/hbrepeaticonitem_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/primitives/hbrepeaticonitem_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -65,7 +65,7 @@ QPixmap* mRepeatPixmap; QRectF mParentRect; Qt::Orientation mOrientation; - bool mConnected; + bool mConnected; }; #endif // HB_REPEATICONITEM_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/primitives/hbrepeatitem_p.cpp --- a/src/hbcore/primitives/hbrepeatitem_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/primitives/hbrepeatitem_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -42,18 +42,18 @@ mMode(Qt::KeepAspectRatio), mOffset(0), mRepeatPixmap(0), - mNumberOfRepeating(5), - mOrientation(Qt::Horizontal), - inverted(false), - mRectWidth(0), - mRectHeight(0), - mBaseIconWidth(0), - mBaseIconHeight(0), - mBaseResizeWidth(0), - mBaseResizeHeight(0), - multiFactor(0) + mNumberOfRepeating(5), + mOrientation(Qt::Horizontal), + inverted(false), + mRectWidth(0), + mRectHeight(0), + mBaseIconWidth(0), + mBaseIconHeight(0), + mBaseResizeWidth(0), + mBaseResizeHeight(0), + multiFactor(0) { - + } HbRepeatItem::HbRepeatItem(const QString& name,QGraphicsItem *parent): @@ -62,97 +62,97 @@ mMode(Qt::KeepAspectRatio), mOffset(0), mRepeatPixmap(0), - mNumberOfRepeating(5), - mOrientation(Qt::Horizontal), - inverted(false), - mRectWidth(0), - mRectHeight(0), - mBaseIconWidth(0), - mBaseIconHeight(0), - mBaseResizeWidth(0), - mBaseResizeHeight(0), - multiFactor(0) + mNumberOfRepeating(5), + mOrientation(Qt::Horizontal), + inverted(false), + mRectWidth(0), + mRectHeight(0), + mBaseIconWidth(0), + mBaseIconHeight(0), + mBaseResizeWidth(0), + mBaseResizeHeight(0), + multiFactor(0) { - if(!mIcon.isNull()) { - mBaseIconWidth = mIcon.width(); - mBaseIconHeight = mIcon.height(); - } + if(!mIcon.isNull()) { + mBaseIconWidth = mIcon.width(); + mBaseIconHeight = mIcon.height(); + } } void HbRepeatItem::resizeEvent ( QGraphicsSceneResizeEvent * event ) { - Q_UNUSED(event); - createPixmap(boundingRect()); + Q_UNUSED(event); + createPixmap(boundingRect()); } void HbRepeatItem::createPixmap(QRectF rect) { - if(!mIcon.isNull()) { - qreal parentWidth = rect.size().width(); - qreal parentHeight = rect.size().height(); - if(parentWidth !=0) { - qreal tempWidth = mNumberOfRepeating*mBaseIconWidth; - multiFactor = (qreal) parentWidth / tempWidth; - qreal tempHeight = multiFactor * mBaseIconHeight; - if(tempHeight > parentHeight) - { - multiFactor = (qreal) parentHeight / mBaseIconHeight; - } - //Convert multiple factor to two digit; - int tempFactor = (int) (10 *multiFactor); - multiFactor = (qreal) tempFactor / 10; - mBaseResizeWidth = (int)(mBaseIconWidth*multiFactor); - mBaseResizeHeight = (int)(mBaseIconHeight*multiFactor); + if(!mIcon.isNull()) { + qreal parentWidth = rect.size().width(); + qreal parentHeight = rect.size().height(); + if(parentWidth !=0) { + qreal tempWidth = mNumberOfRepeating*mBaseIconWidth; + multiFactor = (qreal) parentWidth / tempWidth; + qreal tempHeight = multiFactor * mBaseIconHeight; + if(tempHeight > parentHeight) + { + multiFactor = (qreal) parentHeight / mBaseIconHeight; + } + //Convert multiple factor to two digit; + int tempFactor = (int) (10 *multiFactor); + multiFactor = (qreal) tempFactor / 10; + mBaseResizeWidth = (int)(mBaseIconWidth*multiFactor); + mBaseResizeHeight = (int)(mBaseIconHeight*multiFactor); - mIcon.setSize(QSizeF(mBaseResizeWidth,mBaseResizeHeight)); - if(mRepeatPixmap) { - delete mRepeatPixmap; - mRepeatPixmap =0; - } - mRectWidth = mBaseResizeWidth * mNumberOfRepeating; - mRectHeight = mBaseResizeHeight; - if(mOrientation == Qt::Horizontal){ - mRepeatPixmap = new QPixmap(mRectWidth,mRectHeight); - mRepeatPixmap->fill(Qt::transparent); - QPainter p2; - p2.begin(mRepeatPixmap); - if(mBaseIconWidth > 0){ - for(qreal i = 0 ; i < mRectWidth ; i += mBaseResizeWidth) { - mIcon.paint(&p2, QRectF(i, 0, mBaseResizeWidth, mBaseResizeHeight), mMode); - } - } - p2.end(); - } - else{ - // TODO ANZ - } - setGeometry(0,0,mRectWidth,mRectHeight);//set geometry of QGI - update(); - } - } + mIcon.setSize(QSizeF(mBaseResizeWidth,mBaseResizeHeight)); + if(mRepeatPixmap) { + delete mRepeatPixmap; + mRepeatPixmap =0; + } + mRectWidth = mBaseResizeWidth * mNumberOfRepeating; + mRectHeight = mBaseResizeHeight; + if(mOrientation == Qt::Horizontal){ + mRepeatPixmap = new QPixmap(mRectWidth,mRectHeight); + mRepeatPixmap->fill(Qt::transparent); + QPainter p2; + p2.begin(mRepeatPixmap); + if(mBaseIconWidth > 0){ + for(qreal i = 0 ; i < mRectWidth ; i += mBaseResizeWidth) { + mIcon.paint(&p2, QRectF(i, 0, mBaseResizeWidth, mBaseResizeHeight), mMode); + } + } + p2.end(); + } + else{ + // TODO ANZ + } + setGeometry(0,0,mRectWidth,mRectHeight);//set geometry of QGI + update(); + } + } } HbRepeatItem::~HbRepeatItem() { - if(mRepeatPixmap ) { - delete mRepeatPixmap; - mRepeatPixmap =0; - } + if(mRepeatPixmap ) { + delete mRepeatPixmap; + mRepeatPixmap =0; + } } void HbRepeatItem::setName(const QString& name) { - if(!mIcon.isNull()){ - if (mIcon.iconName() == name) { - return; - } - } + if(!mIcon.isNull()){ + if (mIcon.iconName() == name) { + return; + } + } mIcon.setIconName(name); - mBaseIconWidth = mIcon.width(); - mBaseIconHeight = mIcon.height(); - createPixmap(boundingRect()); + mBaseIconWidth = mIcon.width(); + mBaseIconHeight = mIcon.height(); + createPixmap(boundingRect()); } void HbRepeatItem::setInverted(bool inversion) { - inverted = inversion; + inverted = inversion; } void HbRepeatItem::setAspectRatioMode(Qt::AspectRatioMode mode) @@ -164,21 +164,21 @@ { Q_UNUSED(option); Q_UNUSED(widget); - if(mRepeatPixmap != 0) { - if(boundingRect().isValid()) { - painter->drawPixmap(QPointF(0,0),*mRepeatPixmap); - } - } + if(mRepeatPixmap != 0) { + if(boundingRect().isValid()) { + painter->drawPixmap(QPointF(0,0),*mRepeatPixmap); + } + } } void HbRepeatItem::setRepeatingNumber(int number) { - if(number != mNumberOfRepeating) { - mNumberOfRepeating = number; - createPixmap(boundingRect()); - //resizeEvent(0); - } + if(number != mNumberOfRepeating) { + mNumberOfRepeating = number; + createPixmap(boundingRect()); + //resizeEvent(0); + } } @@ -190,66 +190,66 @@ HbRepeatMaskItem::HbRepeatMaskItem(QGraphicsItem *parent): HbRepeatItem(parent),mMaskValue(0),mMaximum(5) { - + } HbRepeatMaskItem::HbRepeatMaskItem(const QString &name, QGraphicsItem *parent): HbRepeatItem(name,parent),mMaskValue(0),mMaximum(5) { - + } void HbRepeatMaskItem::paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { - Q_UNUSED(option); + Q_UNUSED(option); Q_UNUSED(widget); - if(mRepeatPixmap != 0) { - QPixmap mask(mRectWidth,mRectHeight); - mask.fill(Qt::white); - QPainter p; - p.begin(&mask); - p.setBrush(QBrush(Qt::black)); - if(mOrientation == Qt::Horizontal){ + if(mRepeatPixmap != 0) { + QPixmap mask(mRectWidth,mRectHeight); + mask.fill(Qt::white); + QPainter p; + p.begin(&mask); + p.setBrush(QBrush(Qt::black)); + if(mOrientation == Qt::Horizontal){ - QRectF test = boundingRect(); - qreal left = (qreal)boundingRect().topLeft().x(); - if(qApp->layoutDirection() == Qt::RightToLeft) { - left = (qreal)boundingRect().width()* ((mMaximum - mMaskValue)/(qreal) mMaximum ); - } - p.drawRect(QRectF( - left, - (qreal)boundingRect().topLeft().y(), - (qreal)boundingRect().width()* (mMaskValue/(qreal) mMaximum ), - (qreal)boundingRect().height() - )); - } - else { - - //TODO ANZ + QRectF test = boundingRect(); + qreal left = (qreal)boundingRect().topLeft().x(); + if(inverted) { + left = (qreal)boundingRect().width()* ((mMaximum - mMaskValue)/(qreal) mMaximum ); + } + p.drawRect(QRectF( + left, + (qreal)boundingRect().topLeft().y(), + (qreal)boundingRect().width()* (mMaskValue/(qreal) mMaximum ), + (qreal)boundingRect().height() + )); + } + else { + + //TODO ANZ - } + } - mRepeatPixmap->setMask(mask); - - if(boundingRect().isValid()) { - painter->drawPixmap(QPointF(0,0),*mRepeatPixmap); - } - } + mRepeatPixmap->setMask(mask); + + if(boundingRect().isValid()) { + painter->drawPixmap(QPointF(0,0),*mRepeatPixmap); + } + } } void HbRepeatMaskItem::resizeEvent ( QGraphicsSceneResizeEvent * event ) { - Q_UNUSED(event); - createPixmap(boundingRect()); + Q_UNUSED(event); + createPixmap(boundingRect()); } void HbRepeatMaskItem::setMaximum(int max) { - mMaximum = max; + mMaximum = max; } void HbRepeatMaskItem::setMaskValue(int maskValue) { - mMaskValue = maskValue; + mMaskValue = maskValue; } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/primitives/hbrepeatitem_p.h --- a/src/hbcore/primitives/hbrepeatitem_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/primitives/hbrepeatitem_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -36,48 +36,48 @@ public: HbRepeatItem(QGraphicsItem *parent = 0); HbRepeatItem(const QString &name, QGraphicsItem *parent = 0); - ~HbRepeatItem(); + ~HbRepeatItem(); void setName(const QString& name); - void setRepeatingNumber(int number); + void setRepeatingNumber(int number); void setAspectRatioMode(Qt::AspectRatioMode mode); void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); void setOrientation(Qt::Orientation orientation); - void setInverted(bool inversion); - void createPixmap(QRectF rect); + void setInverted(bool inversion); + void createPixmap(QRectF rect); protected: - void resizeEvent ( QGraphicsSceneResizeEvent * event ); + void resizeEvent ( QGraphicsSceneResizeEvent * event ); public: HbIcon mIcon; Qt::AspectRatioMode mMode; int mOffset; - QPixmap* mRepeatPixmap; - int mNumberOfRepeating; + QPixmap* mRepeatPixmap; + int mNumberOfRepeating; Qt::Orientation mOrientation; - bool inverted; - int mRectWidth; - int mRectHeight; - qreal mBaseIconWidth; - qreal mBaseIconHeight; - int mBaseResizeWidth; - int mBaseResizeHeight; - qreal multiFactor; + bool inverted; + int mRectWidth; + int mRectHeight; + qreal mBaseIconWidth; + qreal mBaseIconHeight; + int mBaseResizeWidth; + int mBaseResizeHeight; + qreal multiFactor; }; class HbRepeatMaskItem : public HbRepeatItem { public: - HbRepeatMaskItem(QGraphicsItem *parent = 0); + HbRepeatMaskItem(QGraphicsItem *parent = 0); HbRepeatMaskItem(const QString &name, QGraphicsItem *parent = 0); - void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); - void setMaskValue(int maskValue); - void setMaximum(int max); - //void setName(const QString& name); + void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + void setMaskValue(int maskValue); + void setMaximum(int max); + //void setName(const QString& name); protected: - void resizeEvent ( QGraphicsSceneResizeEvent * event ); + void resizeEvent ( QGraphicsSceneResizeEvent * event ); public: - int mMaskValue; - int mMaximum; + int mMaskValue; + int mMaximum; }; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/primitives/hbrichtextitem.cpp --- a/src/hbcore/primitives/hbrichtextitem.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/primitives/hbrichtextitem.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -38,6 +38,7 @@ #include #include #include +#include const qreal KMinimumRichTextWidth = 6.0; @@ -354,7 +355,7 @@ void HbRichTextItem::setAlignment(Qt::Alignment alignment) { Q_D(HbRichTextItem); - d->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextAlign, true); + d->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextAlign, true); alignment &= Qt::AlignVertical_Mask | Qt::AlignHorizontal_Mask; if (d->mTextOption.alignment()!=alignment) { prepareGeometryChange(); @@ -383,23 +384,18 @@ const QStyleOptionGraphicsItem *option, QWidget *widget) { - Q_UNUSED(option); Q_UNUSED(widget); Q_D(HbRichTextItem); // Save painter's state - QRegion oldClipRegion = painter->clipRegion(); - QTransform oldTransform = painter->transform(); - painter->translate(d->mOffset); QAbstractTextDocumentLayout::PaintContext context; + context.clip = option->exposedRect; context.palette.setColor(QPalette::Text, textDefaultColor()); d->mRtf->documentLayout()->draw(painter, context); - // Restore painter's state - painter->setClipRegion(oldClipRegion); - painter->setTransform(oldTransform); + painter->translate(-d->mOffset); } /*! @@ -535,7 +531,7 @@ void HbRichTextItem::setTextWrapping(Hb::TextWrapping mode) { Q_D(HbRichTextItem); - d->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextWrapMode, true); + d->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextWrapMode, true); QTextOption::WrapMode textWrapMode = static_cast(mode); if (d->mTextOption.wrapMode()!=textWrapMode) { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/primitives/hbtextitem.cpp --- a/src/hbcore/primitives/hbtextitem.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/primitives/hbtextitem.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -138,7 +138,7 @@ tempText.replace('\n', QChar::LineSeparator); } - // Need to call elidedText explicitly to enable multiple length translations. + // Need to call elidedText explicitly to enable multiple length translations. tempText = fontMetrics.elidedText(tempText, Qt::ElideNone, lineWidth); bool textTruncated = doLayout(tempText, lineWidth, fontMetrics.lineSpacing()); @@ -1071,7 +1071,7 @@ void HbTextItem::setAlignment (Qt::Alignment alignment) { Q_D(HbTextItem); - d->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextAlign, true); + d->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextAlign, true); alignment &= Qt::AlignVertical_Mask | Qt::AlignHorizontal_Mask; if (d->mAlignment != alignment) { prepareGeometryChange(); @@ -1340,7 +1340,7 @@ void HbTextItem::setTextWrapping(Hb::TextWrapping mode) { Q_D(HbTextItem); - d->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextWrapMode, true); + d->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextWrapMode, true); QTextOption::WrapMode textWrapMode = static_cast(mode); QTextOption textOption = d->mTextLayout.textOption(); @@ -1447,7 +1447,7 @@ Q_D( HbTextItem ); minLines = qMax(minLines, 1); // zero or nagative values are meanless and are restoring 1 - d->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMin, true); + d->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMin, true); if( minLines != d->mMinLines ) { if( ( d->mMaxLines > 0 ) && ( minLines > d->mMaxLines ) ) { @@ -1476,7 +1476,7 @@ void HbTextItem::setMaximumLines( int maxLines ) { Q_D( HbTextItem ); - d->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMax, true); + d->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMax, true); maxLines = qMax(maxLines, 0); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/primitives/hbtoucharea.cpp --- a/src/hbcore/primitives/hbtoucharea.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/primitives/hbtoucharea.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -174,7 +174,7 @@ return QSizeF(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX); } else { // Touch area should not enforce a size - return QSizeF(0, 0); + return QSizeF(0, 0); } } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/primitives/hbtoucharea_p.h --- a/src/hbcore/primitives/hbtoucharea_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/primitives/hbtoucharea_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -47,7 +47,7 @@ public: - HbTouchAreaPrivate(); + HbTouchAreaPrivate(); virtual ~HbTouchAreaPrivate(); HbTouchArea *q_ptr; static bool outlineDrawingEnabled(); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/resources.pri --- a/src/hbcore/resources/resources.pri Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/resources.pri Thu Sep 02 20:44:51 2010 +0300 @@ -28,9 +28,9 @@ symbian { RESOURCES += $$PWD/hbvariant_s60.qrc - BLD_INF_RULES.prj_exports += "resources/displaydefinition_hw.xml $${EPOCROOT}epoc32/data/z/resource/displaydefinition.xml" - BLD_INF_RULES.prj_exports += "resources/displaydefinition.xml $${EPOCROOT}epoc32/release/winscw/udeb/z/resource/displaydefinition.xml" - BLD_INF_RULES.prj_exports += "resources/displaydefinition.xml $${EPOCROOT}epoc32/release/winscw/urel/z/resource/displaydefinition.xml" + hbPrjExport("resources/displaydefinition_hw.xml", "$${EPOCROOT}epoc32/data/z/resource/displaydefinition.xml") + hbPrjExport("resources/displaydefinition.xml", "$${EPOCROOT}epoc32/release/winscw/udeb/z/resource/displaydefinition.xml") + hbPrjExport("resources/displaydefinition.xml", "$${EPOCROOT}epoc32/release/winscw/urel/z/resource/displaydefinition.xml") } else { RESOURCES += $$PWD/hbvariant_default.qrc } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/effects/hbdefault/titlebar_orient_disappear.fxml --- a/src/hbcore/resources/themes/effects/hbdefault/titlebar_orient_disappear.fxml Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/effects/hbdefault/titlebar_orient_disappear.fxml Thu Sep 02 20:44:51 2010 +0300 @@ -4,7 +4,7 @@ 0.3 0.0 - -1.3 + -1.4 1.0 1.0 diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/hbdefault.themeindex Binary file src/hbcore/resources/themes/hbdefault.themeindex has changed diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_1.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_1.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_1.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,34 +1,128 @@ - - + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_10.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_10.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_10.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,34 +1,128 @@ - - + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_2.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_2.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_2.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,40 +1,128 @@ - - + + - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_3.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_3.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_3.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,34 +1,128 @@ - - + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_4.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_4.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_4.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,34 +1,128 @@ - - + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_5.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_5.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_5.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,34 +1,128 @@ - - + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_6.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_6.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_6.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,34 +1,128 @@ - - + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_7.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_7.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_7.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,34 +1,128 @@ - - + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_8.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_8.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_8.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,34 +1,128 @@ - - + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_9.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_9.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_9.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,34 +1,128 @@ - - + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_1.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_1.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_1.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,33 +1,33 @@ - - + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_2.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_2.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_2.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,33 +1,33 @@ - - + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_3.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_3.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_3.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,33 +1,33 @@ - - + + - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_4.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_4.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_4.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,33 +1,33 @@ - - + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_5.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_5.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_5.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,33 +1,33 @@ - - + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_6.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_6.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_6.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,37 +1,37 @@ - - + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_7.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_7.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_7.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,41 +1,41 @@ - - + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_8.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_8.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_8.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,45 +1,45 @@ - - + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_9.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_9.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_9.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,44 +1,44 @@ - - + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_1.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_1.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_1.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_2.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_2.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_2.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_3.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_3.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_3.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_4.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_4.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_4.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_5.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_5.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_5.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_6.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_6.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_6.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_7.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_7.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_7.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_8.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_8.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_8.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_1.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_1.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_1.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - + @@ -16,14 +16,14 @@ - - + + - + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_10.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_10.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_10.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - + @@ -16,14 +16,14 @@ - - + + - + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_11.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_11.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_11.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - + @@ -16,14 +16,14 @@ - - + + - + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_12.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_12.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_12.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - + @@ -16,14 +16,14 @@ - - + + - + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_13.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_13.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_13.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - + @@ -16,14 +16,14 @@ - - + + - + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_14.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_14.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_14.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - + @@ -16,14 +16,14 @@ - - + + - + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_15.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_15.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_15.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - + @@ -16,14 +16,14 @@ - - + + - + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_16.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_16.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_16.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - + @@ -16,14 +16,14 @@ - - + + - + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_2.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_2.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_2.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - + @@ -16,14 +16,14 @@ - - + + - + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_3.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_3.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_3.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - + @@ -16,11 +16,11 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_4.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_4.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_4.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - + @@ -16,14 +16,14 @@ - - + + - + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_5.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_5.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_5.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - + @@ -16,14 +16,14 @@ - - + + - + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_6.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_6.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_6.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - + @@ -16,14 +16,14 @@ - - + + - + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_7.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_7.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_7.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - + @@ -16,11 +16,11 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_8.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_8.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_8.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - + @@ -16,14 +16,14 @@ - - + + - + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_9.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_9.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_9.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - + @@ -16,14 +16,14 @@ - - + + - + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_1.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_1.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_1.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,125 +1,131 @@ - - + + - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_10.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_10.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_10.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,125 +1,135 @@ - - + + - - - - - - + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_2.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_2.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_2.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,125 +1,131 @@ - - + + - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_3.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_3.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_3.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,125 +1,131 @@ - - + + - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_4.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_4.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_4.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,125 +1,131 @@ - - + + - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_5.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_5.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_5.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,125 +1,131 @@ - - + + - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_6.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_6.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_6.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,119 +1,131 @@ - - + + - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_7.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_7.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_7.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,125 +1,131 @@ - - + + - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_8.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_8.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_8.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,125 +1,131 @@ - - + + - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_9.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_9.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_9.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,125 +1,131 @@ - - + + - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_highlight_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,19 @@ - - + + - - - - - + + + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,19 @@ - - + + - - - - - + + + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_highlight_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_focused_day_ind_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,10 @@ - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,10 @@ - - + + - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,10 @@ - - + + - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,7 @@ - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,10 @@ - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,10 @@ - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,10 @@ - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,10 @@ - - + + - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_meeting_bg_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,10 @@ - - + + - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_bg_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_title_bg_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_title_bg_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_title_bg_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_title_bg_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_title_bg_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_title_bg_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_title_bg_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_title_bg_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_monthgrid_title_bg_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_bg_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_title_bg_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_title_bg_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_title_bg_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_title_bg_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_title_bg_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_title_bg_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_title_bg_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_title_bg_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_cal_preview_title_bg_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -11,9 +11,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - - - + + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - - - + + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_edit_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_edit_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_edit_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_edit_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_edit_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_edit_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_edit_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_edit_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_edit_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,22 +1,22 @@ - - + + - - - - + + + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - + + + + - - - - - + + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,22 +1,22 @@ - - + + - - - - + + + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -9,8 +9,8 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -9,8 +9,8 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - - + + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - - + + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - - + + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + - - - + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - - + + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - - + + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - - + + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - - + + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_highlight_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - - + + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,18 @@ - - + + - - - - + + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,18 @@ - - + + - - - - + + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,18 @@ - - + + - - - - + + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + - - - + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,18 @@ - - + + - - - - + + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,18 @@ - - + + - - - - + + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,18 @@ - - + + - - - - + + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,18 @@ - - + + - - - - + + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_normal_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,18 @@ - - + + - - - - + + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_received_pressed_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - + + + - + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - + + + - + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_highlight_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,18 @@ - - + + - - - - - + + + + + + - - - - + + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,18 @@ - - + + - - - - + + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,18 @@ - - + + - - - - + + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + - - - + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,18 @@ - - + + - - - - + + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,18 @@ - - + + - - - - + + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,18 @@ - - + + - - - - + + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,18 @@ - - + + - - - - + + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_normal_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,18 @@ - - + + - - - - + + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - + + + - + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - + + + - + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_convlist_sent_pressed_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - - - - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - - - - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - - - - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_fullscreen_heading_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_fullscreen_heading_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_fullscreen_heading_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_fullscreen_heading_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_fullscreen_heading_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_fullscreen_heading_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_fullscreen_heading_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_fullscreen_heading_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_fullscreen_heading_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + - + + - - - + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + - + + - - - + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,13 @@ - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + - + + - - - + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + - + + - - - + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + - + + - - - + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + - + + - - - + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,14 @@ - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + - + + - - - + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + - + + - - - + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + - + + - - + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + - + + - - + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,14 @@ - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + - + + - - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + - + + - - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - + + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - + + + + - - - - + + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - + + + + - - - - + + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,14 @@ - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + + - - + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + + - - + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - + + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - + + + + - - - - + + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - + + + + - - - - + + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + - + + - - - + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + - + + - - - + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,14 @@ - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + - + + - - + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + - + + - - + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,7 @@ - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + - + + - - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + - + + - - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,14 @@ - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + - + + - - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + - + + - - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + - + + - - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + - + + - - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,14 @@ - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + - + + - - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + - + + - - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + - + + - - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + - + + - - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,14 @@ - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + - + + - - + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + - + + - - + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_latched_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_latched_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_latched_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,11 +7,11 @@ - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_latched_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_latched_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_latched_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,11 +8,11 @@ - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_latched_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_latched_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_latched_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,11 +8,11 @@ - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_latched_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_latched_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_latched_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_latched_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_latched_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_latched_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -10,9 +10,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - - - + + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - - - + + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,19 +8,21 @@ + - - - - - + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,19 +8,21 @@ + - - - - - + + + + + - - - + - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,19 +8,21 @@ + - - - - - + + + + + - - - + - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,20 +1,22 @@ - - + + + - - - - - + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,20 +1,22 @@ - - + + + - - - - - + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,23 +1,25 @@ - - + + + - - - - - + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,23 +1,25 @@ - - + + + - - - - - + + + + + - - - + - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,23 +1,25 @@ - - + + + - - - - - + + + + + - - - + - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + + - - - + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + + - - - + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,14 @@ - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,19 @@ - - + + + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,19 @@ - - + + + - - - + + + - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,19 @@ - - + + + - - - + + + - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -9,9 +9,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - - - + + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - - - + + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -9,9 +9,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - - - + + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - - - + + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,16 @@ - - + + - - - - - + + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,16 @@ - - + + - - - - - + + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,16 @@ - - + + - - - - - + + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,15 @@ - - + + - - - - + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,16 @@ - - + + - - - - - + + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,16 @@ - - + + - - - - - + + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,16 @@ - - + + - - - - - + + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,16 @@ - - + + - - - - - + + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsshortcut_normal_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,16 @@ - - + + - - - - - + + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,16 @@ - - + + - - - - - + + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,16 @@ - - + + - - - - - + + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,16 @@ - - + + - - - - - + + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,15 @@ - - + + - - - + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,16 @@ - - + + - - - - - + + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,16 @@ - - + + - - - - - + + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,16 @@ - - + + - - - - - + + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,16 @@ - - + + - - - - - + + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hswidget_normal_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,16 @@ - - + + - - - - - + + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,21 +1,21 @@ - - + + - - - - + + + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,21 +1,21 @@ - - + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,21 +1,21 @@ - - + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,18 +1,18 @@ - - + + - - - - + + + + - - - + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,20 +1,20 @@ - - + + - - - - + + + + - - - + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - - - - + + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - + - - - - - - - + + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - + - - - - - - - + + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - - - - + + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - - - - + + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - - - - + + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - - - - + + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - + - - - - - - - + + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_overlay_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - + - - - - - - - + + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,20 +1,20 @@ - - + + - - - - + + + + - - - + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,26 +1,26 @@ - - + + - - - - + + + + - - - + + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,26 +1,26 @@ - - + + - - - - - - + + + + + + - - - - + + + + - - - - - - - + + + + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lcd_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,26 +1,26 @@ - - + + - - - - - - + + + + + + - - - - + + + + - - - - - - - + + + + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - - + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - - + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - + + + + - - - - - + + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - + + + + - - - - - + + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,11 +7,11 @@ - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - + - + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - + - + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_new_item_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_new_item_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_new_item_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_new_item_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_new_item_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_new_item_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_new_item_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_new_item_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_new_item_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_messaging_char_count_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_messaging_char_count_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_messaging_char_count_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_messaging_char_count_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_messaging_char_count_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_messaging_char_count_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_messaging_char_count_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_messaging_char_count_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_messaging_char_count_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_multimedia_trans_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,11 +7,11 @@ - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - + - + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - + - + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,18 +1,18 @@ - - + + - - - - - - - + + + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,18 +1,18 @@ - - + + - - - - - - - + + + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - - - - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_filled_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_filled_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_filled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_filled_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_filled_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_filled_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_filled_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_filled_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_filled_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_frame_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_frame_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_frame_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,10 +7,10 @@ - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_frame_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_frame_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_frame_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_frame_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_frame_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_frame_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_mask_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_mask_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_mask_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_mask_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_mask_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_mask_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_mask_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_mask_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_mask_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_filled_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_filled_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_filled_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_filled_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_filled_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_filled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_filled_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_filled_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_filled_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_frame_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_frame_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_frame_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_frame_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_frame_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_frame_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,10 +7,10 @@ - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_frame_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_frame_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_frame_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_mask_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_mask_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_mask_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_mask_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_mask_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_mask_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_mask_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_mask_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_mask_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_disabled_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_disabled_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_disabled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_disabled_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_disabled_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_disabled_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_disabled_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_disabled_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_disabled_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,10 +7,10 @@ - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -9,9 +9,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_disabled_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_disabled_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_disabled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_disabled_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_disabled_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_disabled_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_disabled_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_disabled_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_disabled_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_disabled_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_disabled_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_disabled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_disabled_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_disabled_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_disabled_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_disabled_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_disabled_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_disabled_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - + + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,19 @@ - - + + - - - - - - + + + + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - + + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - + + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,18 +1,18 @@ - - + + - - - - - - - + + + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,18 +1,18 @@ - - + + - - - - - - - + + + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,19 @@ - - + + - - - - - - - + + + + + + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,19 @@ - - + + - - - - - - - + + + + + + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_frame_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_frame_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_frame_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_frame_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_frame_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_frame_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_frame_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_frame_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_frame_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_handle_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_handle_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_handle_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_handle_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_handle_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_handle_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_handle_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_handle_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_handle_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - + + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_pressed_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_pressed_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_pressed_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - + + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,19 @@ - - + + - - - - - - + + + + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_pressed_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_pressed_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_pressed_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - + + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,18 +1,18 @@ - - + + - - - - - - - + + + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,18 +1,18 @@ - - + + - - - - - - - + + + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_pressed_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_pressed_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_pressed_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,19 @@ - - + + - - - - - - - + + + + + + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_pressed_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_pressed_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_pressed_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,19 @@ - - + + - - - - - - - + + + + + + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_frame_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_frame_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_frame_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_frame_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_frame_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_frame_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_frame_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_frame_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_frame_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_handle_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_handle_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_handle_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_handle_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_handle_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_handle_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_handle_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_handle_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_handle_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_shortcut_badge_bg_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_shortcut_badge_bg_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_shortcut_badge_bg_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_shortcut_badge_bg_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_shortcut_badge_bg_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_shortcut_badge_bg_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_shortcut_badge_bg_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_shortcut_badge_bg_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_shortcut_badge_bg_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_disabled_c.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_disabled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,9 @@ + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_disabled_l.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_disabled_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,7 @@ + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_disabled_r.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_disabled_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,7 @@ + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_disabled_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_disabled_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_disabled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_disabled_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_disabled_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_disabled_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_disabled_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_disabled_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_disabled_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,10 +7,10 @@ - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -9,9 +9,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_disabled_b.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_disabled_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,7 @@ + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_disabled_c.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_disabled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,7 @@ + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_disabled_t.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_disabled_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,7 @@ + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_disabled_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_disabled_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_disabled_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_disabled_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_disabled_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_disabled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_disabled_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_disabled_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_disabled_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,10 +7,10 @@ - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_pressed_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_pressed_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_pressed_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -9,9 +9,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_pressed_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_pressed_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_pressed_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,11 +7,11 @@ - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,11 +8,11 @@ - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,11 +7,11 @@ - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,11 +8,11 @@ - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,11 +8,11 @@ - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,19 @@ - - + + - - - - - + + + + + - - - + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,19 @@ - - + + - - - - - + + + + + - - - + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,20 +1,20 @@ - - + + - - - + + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,8 +8,8 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,8 +8,8 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,8 +7,8 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,8 +7,8 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_cb.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_cb.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_cb.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_ct.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_ct.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_ct.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,20 +1,20 @@ - - + + - - - + + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_cb.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_cb.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_cb.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_ct.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_ct.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_ct.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_cb.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_cb.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_cb.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_ct.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_ct.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_ct.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_cb.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_cb.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_cb.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_ct.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_ct.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_ct.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_cb.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_cb.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_cb.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_ct.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_ct.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_ct.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_cb.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_cb.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_cb.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_ct.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_ct.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_ct.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,11 +7,11 @@ - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_cb.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_cb.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_cb.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_ct.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_ct.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_ct.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,11 +8,11 @@ - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_cb.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_cb.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_cb.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_ct.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_ct.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_ct.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,11 +7,11 @@ - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_cb.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_cb.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_cb.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,11 +8,11 @@ - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_ct.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_ct.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_ct.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,11 +8,11 @@ - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_cb.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_cb.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_cb.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_ct.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_ct.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_ct.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - - + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - - + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - + + + + - - - - - + + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - + + + + - - - - - + + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,11 +8,11 @@ - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,11 +7,11 @@ - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,18 +1,18 @@ - - + + - + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,18 +1,18 @@ - - + + - + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,11 +7,11 @@ - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,11 +7,11 @@ - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,9 +7,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,20 +1,20 @@ - - + + - - - + + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_cl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_cl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_cl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_cr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_cr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_cr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,12 +8,12 @@ - - - - - - + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,19 @@ - - + + - - - - - + + + + + - - - - - - + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,19 @@ - - + + - - - - - + + + + + - - - - - - + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - - - + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,12 +8,12 @@ - - - - - - + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,12 +8,12 @@ - - - - - - + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,12 +8,12 @@ - - - - - - + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,19 @@ - - + + - - - - - + + + + + - - - - - - + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,19 @@ - - + + - - - - - + + + + + - - - - - - + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,24 +1,24 @@ - - + + - - - - - + + + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,19 @@ - - + + - - - - - + + + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,19 @@ - - + + - - - - - + + + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_bl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_bl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_bl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_br.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_br.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_br.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_tl.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_tl.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_tl.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_tr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_tr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_tr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tuner_c.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tuner_c.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tuner_c.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,32 +1,32 @@ - - + + - - - - + + + + - - - - + + + + - - + + - - - - - - - + + + + + + + @@ -34,4 +34,4 @@ - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tuner_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tuner_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tuner_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,37 +1,37 @@ - - + + - - - - + + + + - - - - + + + + - - + + - - - - - - - + + + + + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tuner_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tuner_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tuner_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,38 +1,38 @@ - - + + - - - - + + + + - - - - + + + + - - + + - - - - - - - + + + + + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_bg.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_bg.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_bg.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_full.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_full.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_full.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_low.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_low.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_low.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_medium.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_medium.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_medium.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_cal_bg_lsc.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_cal_bg_lsc.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_cal_bg_lsc.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_cal_bg_prt.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_cal_bg_prt.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_cal_bg_prt.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_cal_event_ind.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_cal_event_ind.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_cal_event_ind.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_day_bg.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_day_bg.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_day_bg.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,107 +1,109 @@ - - + + - + - - - + + + + - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_day_hour.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_day_hour.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_day_hour.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_day_min.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_day_min.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_day_min.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_day_sec.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_day_sec.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_day_sec.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,22 +1,23 @@ - - + + - - - + + + - - - - - + + + + + - + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_night_bg.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_night_bg.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_night_bg.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,105 +1,107 @@ - - + + - + - - - - + + + + + - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_night_hour.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_night_hour.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_night_hour.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_night_min.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_night_min.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_night_min.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_night_sec.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_night_sec.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_clock_night_sec.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,22 +1,23 @@ - - + + - - - + + + - - - - - + + + + + - + - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_colorpicker_empty.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_colorpicker_empty.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_colorpicker_empty.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_colorpicker_filled.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_colorpicker_filled.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_colorpicker_filled.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_colorpicker_mask.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_colorpicker_mask.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_colorpicker_mask.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_disabled.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_disabled.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_disabled.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_highlight.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_highlight.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_highlight.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_latched.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_latched.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_latched.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,18 @@ - - + + - - - + + + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_normal.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_normal.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_normal.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,19 @@ - - + + - - - + + + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_pressed.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_pressed.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_pressed.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,19 @@ - - + + - - - - + + + + + + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_dimming_image.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_dimming_image.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_dimming_image.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_divider_h_thin.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_divider_h_thin.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_divider_h_thin.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_divider_v_thin.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_divider_v_thin.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_divider_v_thin.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_capital.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_capital.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_capital.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_numeric.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_numeric.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_numeric.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_small.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_small.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_small.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_text.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_text.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_text.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_handle_begin.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_handle_end.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hs_delete_highlight.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hs_delete_highlight.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hs_delete_highlight.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,21 @@ - - + + - - - + + + + - - - - - + + + + + + + - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hs_delete_normal.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hs_delete_normal.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hs_delete_normal.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,13 @@ - - + + - - - - + + + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hs_dialer_normal.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hs_dialer_normal.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hs_dialer_normal.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,26 +1,30 @@ - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hs_dialer_pressed.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hs_dialer_pressed.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hs_dialer_pressed.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,25 +1,29 @@ - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hspage_highlight.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hspage_highlight.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hspage_highlight.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hspage_normal.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hspage_normal.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hspage_normal.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - - + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hsradio_bg.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hsradio_bg.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hsradio_bg.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,21 +1,21 @@ - - + + - - - - + + + + - + - - - - + + + + - + @@ -30,56 +30,56 @@ - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hsscreen_bg_lsc.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hsscreen_bg_lsc.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hsscreen_bg_lsc.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hsscreen_bg_prt.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hsscreen_bg_prt.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_hsscreen_bg_prt.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_input_h_swipe.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_input_h_swipe.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_input_h_swipe.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,118 +1,118 @@ - - + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_input_v_swipe.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_input_v_swipe.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_input_v_swipe.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,118 +1,118 @@ - - + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progbar_h_wait.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progbar_h_wait.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progbar_h_wait.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progbar_v_wait.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progbar_v_wait.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progbar_v_wait.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - + + + - - - + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_disabled.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_disabled.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_disabled.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_normal.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_normal.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_normal.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_pressed.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_pressed.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_pressed.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_rated.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_rated.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_rated.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,6 @@ - - + + - - + - - - - - - - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_rated_disabled.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_rated_disabled.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_rated_disabled.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_rated_normal.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_rated_normal.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_rated_pressed.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_rated_pressed.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_rated_pressed.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_unrated.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_unrated.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_unrated.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,6 @@ - - + + - - + - - - - - - - - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_unrated_disabled.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_unrated_disabled.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_unrated_disabled.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_unrated_normal.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_unrated_normal.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_unrated_pressed.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_unrated_pressed.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_unrated_pressed.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_screen_bg_lsc.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_screen_bg_lsc.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_screen_bg_lsc.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_screen_bg_prt.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_screen_bg_prt.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_screen_bg_prt.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_scrollarea_mask_b.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_scrollarea_mask_b.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_scrollarea_mask_b.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_scrollarea_mask_l.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_scrollarea_mask_l.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_scrollarea_mask_l.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_scrollarea_mask_r.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_scrollarea_mask_r.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_scrollarea_mask_r.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_scrollarea_mask_t.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_scrollarea_mask_t.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_scrollarea_mask_t.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_bg.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_bg.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_bg.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,4 +7,4 @@ - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_full.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_full.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_full.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_low.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_low.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_low.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_medium.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_medium.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_medium.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -8,9 +8,9 @@ - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_disabled.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_disabled.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_disabled.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_normal.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_normal.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_normal.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,20 +1,20 @@ - - + + - - - - + + + + - - - - - - - + + + + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_pressed.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_pressed.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_pressed.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,20 +1,20 @@ - - + + - - - - + + + + - - - - - - - + + + + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_tick_major.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_tick_major.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_tick_major.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_tick_minor.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_tick_minor.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_tick_minor.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_disabled.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_disabled.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_disabled.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_normal.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_normal.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_normal.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,20 +1,20 @@ - - + + - - - - + + + + - - - - - - + + + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_pressed.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_pressed.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_pressed.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,20 +1,20 @@ - - + + - - - - + + + + - - - - - - + + + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_tick_major.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_tick_major.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_tick_major.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_tick_minor.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_tick_minor.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_tick_minor.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_taskswitcher_camcorder.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_taskswitcher_camcorder.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_taskswitcher_camcorder.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,22 @@ - - + + - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_taskswitcher_camera.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_taskswitcher_camera.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_taskswitcher_camera.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,19 @@ - - + + - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_theme_preview_lsc.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_theme_preview_lsc.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_theme_preview_lsc.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,32 +1,32 @@ - - + + - - - - - + + + + + - - - - - - + + + + + + - + - - - - - + + + + + @@ -34,431 +34,446 @@ - - - - - + + + + + + + + + - + - + - + - + - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + + + + + - + - - - - - - - - - + + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - + - - - + + + - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_theme_preview_prt.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_theme_preview_prt.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_theme_preview_prt.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,32 +1,32 @@ - - + + - - - - - + + + + + - - - - - - + + + + + + - + - - - - - + + + + + @@ -34,505 +34,520 @@ - - - - - + + + + + + + + + - + - + - + - + - - - - - - - + + + + + + + + + - - - + + + - + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + + + + + - + - - - - - - - - - + + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - + - - - + + + - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_theme_preview_thumbnail.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_theme_preview_thumbnail.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_theme_preview_thumbnail.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,116 +1,116 @@ - - + + - - - - - + + + + + - - - - - - + + + + + + - + - - - - - + + + + + - - + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - + + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_handle_normal.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_handle_normal.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_handle_normal.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,21 +1,21 @@ - - + + - - - - - - - - - + + + + + + + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_handle_pressed.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_handle_pressed.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_handle_pressed.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,19 @@ - - + + - - - - - - - - - + + + + + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_minimize.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_minimize.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_minimize.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,20 +1,20 @@ - - + + - - - + + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trim_end_normal.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trim_end_normal.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trim_end_pressed.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trim_end_pressed.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trim_start_normal.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trim_start_normal.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trim_start_pressed.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trim_start_pressed.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_tumbler_divider.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_tumbler_divider.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_tumbler_divider.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_tuner_selected.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_tuner_selected.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_tuner_selected.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_tuner_unselected.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_tuner_unselected.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_tuner_unselected.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_about.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_about.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_about.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,135 +1,137 @@ - - + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + + + + + + - - - - + + + + + - - - - - - - + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_accessibility.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_accessibility.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_accessibility.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,35 +1,37 @@ - - + + - - - - - + + + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - - - + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_account_setup.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,97 +1,99 @@ - - + + - - + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,31 +1,33 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_mode.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,143 +1,145 @@ - - + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + + + + + + - - - - + + + + + - - - - - - - + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_add_contact_picture.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,107 +1,111 @@ - - + + + + - - - + + + - - - - - + + + + + - + + + - - - - - - + + + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_add_group_picture.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,120 +1,126 @@ - - + + + + - - - - + + + + + - - - - - + + + + + + + + + + - - - - + + + + + - - - - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_album_art.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,47 +1,51 @@ - - + + - - - + + + + - + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_als.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_als.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_als.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,268 +1,270 @@ - - + + - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_application.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_application.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_application.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,57 +1,61 @@ - - + + + - - - + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_download.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,53 +1,55 @@ - - + + - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + - - + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_essential.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_essential.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_games.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,267 +1,159 @@ - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_office.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,35 +1,37 @@ - - + + - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + - - + + + @@ -172,30 +174,30 @@ - + - + - + - - - + + + @@ -209,16 +211,16 @@ - - - + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_user.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,88 +1,90 @@ - - + + - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + - - + + + - - - - + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_avatar.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_avatar.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_avatar.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -13,4 +14,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_avatar_mycard.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -13,39 +14,40 @@ + - - - + + + - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bell.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bell.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bell.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,61 +1,63 @@ - - + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,26 +1,28 @@ - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_active_connection.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,59 +1,61 @@ - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_hide.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,28 +1,28 @@ - - + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_hide_connection.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,61 +1,61 @@ - - + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_off.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,37 +1,39 @@ - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - + + + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_browser.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_browser.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_browser.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,61 +1,63 @@ - - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calculator.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calculator.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calculator.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,274 +1,276 @@ - - + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + + + - - - - - - - - - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,102 +1,104 @@ - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_alarm.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,162 +1,164 @@ - - + + + - - - - - - - - - - - - + + + + + - - - - + + + + + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - + + + + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_dynamic.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,92 +1,94 @@ - - + + - - - - - - + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_assistant.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,150 +1,152 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + + - + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_car.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,33 +1,35 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + + @@ -102,4 +104,4 @@ - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_duration.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,105 +1,81 @@ - - + + + - - - - - - - - - - - + + + + - - - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + - - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - + + + + - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,294 +1,296 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_home.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,311 +1,313 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_work.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,310 +1,312 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + + - - - - - + + + + + - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - + + + + - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + + + - - - - - - - - - + + + + + - - - - + + + + + + + + + - - - - + + + + - - - - - - - + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - + + + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_group.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,33 +1,35 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + + @@ -73,13 +75,13 @@ - + - + @@ -128,13 +130,13 @@ - + - + @@ -194,7 +196,7 @@ - + @@ -208,4 +210,4 @@ - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,253 +1,255 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + + - - - - - - - - - - - - - + + + + - - - - - - - + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_home.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,266 +1,268 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_work.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,265 +1,267 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - + - - - - + + + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,129 +1,131 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_home.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,146 +1,148 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_work.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,145 +1,147 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - + + + + - - - - - - + + + + - - - - + + + + + + - - - - - + + + + - - - - - - + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + - - - - + + + + - - - - - + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_muted.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,261 +1,263 @@ - - + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - + + + + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_pager.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,111 +1,113 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - + + + + + + + - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_service.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,71 +1,73 @@ - - + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,110 +1,112 @@ - - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip_home.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,151 +1,153 @@ - - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip_work.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,112 +1,114 @@ - - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - + + @@ -212,4 +214,4 @@ - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_camera.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_camera.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_camera.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,112 +1,116 @@ - - + + + - - - - + + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - + + + + + - + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_car.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_car.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_car.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -76,4 +77,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_cellinfo.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_cellinfo.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_cellinfo.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,97 +1,97 @@ - - + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,70 +1,72 @@ - - + + + - - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + - - - - + + + + - - - - - - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_home.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,111 +1,113 @@ - - + + + - - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_night.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,60 +1,62 @@ - - + + - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + - - - - + + + + - - - - - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_night_home.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,101 +1,103 @@ - - + + - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + + - - - - - - - - - - - - + + + + + + - - - - - - + + + + + - - - - + + + + + + - - - - - + + + + - - - - + + + + + + + + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_computer.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_computer.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_computer.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,67 +1,69 @@ - - + + + - - - - - - - - - - - + + + + + - - - - - + + + + + - - - - + + + + + - - - - + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + + + + + + - - - - + + + + - - - - - - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_corrupted.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_corrupted.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_corrupted.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,55 +1,57 @@ - - + + - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_custom.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_custom.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_custom.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -34,4 +35,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_data_import.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -195,4 +196,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_date_time.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_date_time.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_default_server.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,172 +1,176 @@ - - + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - - + + + + - - - - - + + + + - - - - - + + + + + - - - - + + + + + - - - - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + + + - - - - - - + + + + + + + - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - + + + - - - - - + + + + + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_lock.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,149 +1,153 @@ - - + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + - + + - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_update.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,130 +1,132 @@ - - + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialer.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialer.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialer.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -43,4 +44,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialled_voice_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,58 +1,21 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - + + + + + - - - - - - - + + - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dictionary.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dictionary.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dictionary.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,42 +1,44 @@ - - + + - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,25 +1,27 @@ - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_disabled.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,27 +1,27 @@ - - + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_group.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,27 +1,29 @@ - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - + + + @@ -67,13 +69,13 @@ - + - + @@ -122,13 +124,13 @@ - + - + @@ -188,7 +190,7 @@ - + @@ -202,4 +204,4 @@ - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_home.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,66 +1,68 @@ - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - + + + + - - - - - + + + + + + + + + + - - - - - - + + + + + - - - - + + + + + + + + + + + - - - - - + + + + + - - - - + + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_setup.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,48 +1,50 @@ - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_work.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,27 +1,29 @@ - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - + + + @@ -127,4 +129,4 @@ - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_end_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,39 +1,43 @@ - - + + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_fail.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_fail.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_fail.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,23 +1,25 @@ - - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_favourites.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_favourites.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_favourites.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,33 +1,35 @@ - - + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_filemgr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_filemgr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_filemgr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,90 +1,92 @@ - - + + + - - - - + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_folder.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_folder.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_folder.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,33 +1,35 @@ - - + + - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friend.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friend.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friend.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,74 +1,76 @@ - - + + - - + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friends.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friends.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friends.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,202 +1,204 @@ - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ftu.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ftu.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ftu.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,112 +1,114 @@ - - + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + + + + + + - - - - + + + + + - - - - - - - + + @@ -152,4 +154,4 @@ - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_games.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_games.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_games.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,157 +1,159 @@ - - + + + - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_audio.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,126 +1,128 @@ - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_bluetooth.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,29 +1,31 @@ - - + + - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_group_feeds.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,223 +1,225 @@ - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_help.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_help.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_help.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,26 +1,28 @@ - - + + + - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_hold_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,39 +1,41 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_homezone.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_homezone.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_homezone.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,57 +1,59 @@ - - + + - - - + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_im.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_im.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_im.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,46 +1,48 @@ - - + + + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - \ No newline at end of file + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_imageprint.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_imageprint.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_imageprint.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,149 +1,151 @@ - - + + + - - - - - - - - - + + + - - - - - - - + + + + + - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + + + + + + - - - - + + + + + - - - - - - - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_info.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_info.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_info.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,33 +1,35 @@ - - + + + - - - - - + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_input_device.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,78 +1,86 @@ - - + + + - - - - + + + + - - - - - + + + + + - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_internet_radio.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,337 +1,339 @@ - - + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - - + + + + - - - - - - + + + + - - - - - + + + + + + - - - - + + + + + - - - - - + + + + - - - - - - - + + + + + - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_java.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_java.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_java.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,77 +1,79 @@ - - + + + - - - - - - - + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + - - - - - + + + + + + + + + - - - - - - - - - - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_just_audio.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,75 +1,77 @@ - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_key_screen.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,213 +1,215 @@ - - + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_keyboard.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_keyboard.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_keyboard.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,379 +1,381 @@ - - + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_language.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_language.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_language.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,83 +1,85 @@ - - + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_location_new.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,86 +1,88 @@ - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_map_placeholder.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,105 +1,109 @@ - - + + - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + + - - - - + + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_maps.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_maps.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_maps.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,58 +1,60 @@ - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_maps_disabled.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,60 +1,60 @@ - - + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mass_storage.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,129 +1,131 @@ - - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_media_transfer.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,60 +1,66 @@ + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - + + + - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - + \ No newline at end of file diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_meeting.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_meeting.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_meeting.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,83 +1,85 @@ - - + + - - - + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,40 +1,42 @@ - - + + + - - - - + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_group.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,42 +1,44 @@ - - + + + - - - - + + + + - - - - - + + + + + - - - - - - - + + + + + + + + + + + + - - - - + + + + + + + + - - - - - - - - - - + + @@ -82,13 +84,13 @@ - + - + @@ -137,13 +139,13 @@ - + - + @@ -203,7 +205,7 @@ - + @@ -217,4 +219,4 @@ - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_home.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,81 +1,83 @@ - - + + + - - - - + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_work.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,42 +1,44 @@ - - + + + - - - - + + + + - - - - - + + + + + - - - - - - - + + + + + + + + + + + + - - - - + + + + + + + + - - - - - - - - - - + + @@ -142,4 +144,4 @@ - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_video_call_unseen.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,175 +1,179 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - + + + + + + + + + + + + + + - - - - + + + + + - - - - + + + + + + + + + + + + + + + + - - - - - + + + + - - - - - + + + + + + + + + + - - - - - + + + + + + + + + + + - - - - - + + + + + - + + + + + + + - - - - - + + + + + + - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + - - - - + + + + + + + + + - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,58 +1,22 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - + + + + - - - - - + + + + - + - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call_unseen.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,82 +1,85 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - + + + + + + + + + + + + + + - - - - + + + + + - - - - + + + + + + + + + + + + + + + + - - - - - + + + + - - - - - + + + + + + + + + + - - - - - + + + + + + + + + + + - - - - - + + + + + - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voip_call_unseen.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,113 +1,141 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - + + + + + + + + + + + + + + - - - - + + + + + - - - - + + + + + + + + + + + + + + + + - - - - - + + + + - - - - - + + + + + + + + + + - - - - - + + + + + + + + + + + - - - - - + + + + + - + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - + + + + + + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -79,4 +80,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc_removed.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -81,4 +81,4 @@ - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,110 +1,112 @@ - - + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + + + + + - - - - - - - - - + + + + - - - - - + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile_tv.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,37 +1,39 @@ - - + + + - - - + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mono.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mono.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mono.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,50 +1,52 @@ - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mouse.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mouse.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mouse.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,96 +1,98 @@ - - + + - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,48 +1,50 @@ - - + + - - - + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_album.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,66 +1,68 @@ - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_disabled.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,50 +1,50 @@ - - + + - - - + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_empty.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,119 +1,121 @@ - - + + - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_shop.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,128 +1,130 @@ - - + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mycard.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mycard.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mycard.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,40 +1,42 @@ - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - - + + + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,44 +1,46 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network_off.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,55 +1,57 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - + + + + + + + + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network_settings.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,67 +1,69 @@ - - + + - - - - - - - - - - - + + + + + + + - - - - - - - - - + + + + - - - - + + + + + + + + + + + + + + - - - - + + + + - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_message.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,68 +1,70 @@ - - + + + - - - - + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_voice_message.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -24,32 +25,33 @@ + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_non_default.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,155 +1,159 @@ - - + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + + - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_notes.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_notes.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_notes.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,98 +1,100 @@ - - + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ok.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ok.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ok.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,18 +1,20 @@ - - + + + - - - - + + + + - - - - - + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_online.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_online.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_online.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,76 +1,78 @@ - - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + + - - - - - - - + + + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_outbox.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_outbox.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_outbox.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,46 +1,48 @@ - - + + - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - - + + - - - - + + + + - - - - + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_personalization.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_personalization.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_personalization.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -13,7 +14,7 @@ - + @@ -24,7 +25,7 @@ - + @@ -77,12 +78,12 @@ - + - + @@ -128,35 +129,36 @@ + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phone_as_modem.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,253 +1,255 @@ - - + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + - - - + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phonebook.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phonebook.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phonebook.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,64 +1,66 @@ - - + + + - - - + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - + - - - + + + - - - + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_photos.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_photos.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_photos.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,112 +1,114 @@ - - + + - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - \ No newline at end of file + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_pin_code.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,36 +1,38 @@ - - + + - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_play.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_play.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_play.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,22 +1,24 @@ - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_playlist.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_playlist.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_playlist.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,69 +1,71 @@ - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_power_management.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,109 +1,115 @@ - - + + + + - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + + + - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_presentation_player.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,125 +1,127 @@ - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_profiles.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_profiles.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_profiles.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,97 +1,99 @@ - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_psm.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_psm.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_psm.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,67 +1,69 @@ - - + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_query.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_query.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_query.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,29 +1,31 @@ - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_radio.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_radio.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_radio.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,306 +1,308 @@ - - + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - - + + + + - - - - - - + + + + - - - - - + + + + + + - - - - + + + + + - - - - - + + + + - - - - - - - + + + + + - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_received_voice_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,58 +1,22 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - + + + + + + + + - - - - - - - + - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_reset.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_reset.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_reset.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,143 +1,151 @@ - - + + - - - - - - - - - - + + + + + + - - - - - + + + + + + - - - - + + + + + - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + + + + + + - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - + + + + - - - - - + + + + + - - - - + + + + + + + + + + - - - - - + + + + - - - - + + + + + - - - - - + + + + - - - - + + + + + - - - - - - - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - + + - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ring_tone.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,141 +1,143 @@ - - + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sat.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sat.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sat.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,110 +1,112 @@ - - + + + - - - - + + + + - - - - - - - - - - + + + + + - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_search.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_search.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_search.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,58 +1,60 @@ - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_security.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_security.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_security.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,42 +1,44 @@ - - + + - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_server_locked.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,194 +1,200 @@ - - + + - - - - - + + + + + + - - - - - - - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + + - - - - + + + + - - - - - + + + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + + - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - + + + - + + - - - - - - - - - - - + + + + + + - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_settings.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_settings.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_settings.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,157 +1,159 @@ - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sim.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sim.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sim.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,85 +1,87 @@ - - + + + - - - - + + + + - - - - - - - - - - + + + + + - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sisx.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sisx.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sisx.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,62 +1,64 @@ - - + + + - - - - - - - + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + + + - - - - - - + + + + - - - - + + + + + + + - - - - - - - - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_social_media.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -23,7 +24,7 @@ - + @@ -202,13 +203,13 @@ - + - + @@ -247,17 +248,18 @@ - + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_speaker.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_speaker.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_speaker.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,95 +1,97 @@ - - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_stereo.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_stereo.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_stereo.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,91 +1,93 @@ - - + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sync.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sync.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sync.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,58 +1,60 @@ - - + + - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + + + + + + - - - - + + + + + - - - - - + + + + - - - - - - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_text.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_text.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_text.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,38 +1,40 @@ - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tip.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tip.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tip.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,38 +1,40 @@ - - + + - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_todo_alarm.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,146 +1,148 @@ - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -29,4 +30,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone_off.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -29,15 +30,16 @@ + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tv_out.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,182 +1,184 @@ - - + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_unknown.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_unknown.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_unknown.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,29 +1,31 @@ - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,84 +1,86 @@ - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - + + + + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_home.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,125 +1,127 @@ - - + + + - - - - - - - - + + + - - - - - - + + + + - - - - - + + + + + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - + + + + + + - + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_work.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,86 +1,88 @@ - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - + + + + + + - + + @@ -186,4 +188,4 @@ - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,27 +1,29 @@ - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb_memory.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,61 +1,63 @@ - - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,33 +1,35 @@ - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,42 +1,44 @@ - - + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + @@ -130,4 +132,4 @@ - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_active.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,33 +1,35 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + + @@ -121,4 +123,4 @@ - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_end.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,41 +1,45 @@ - - + + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + + @@ -129,4 +133,4 @@ - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_waiting.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,41 +1,43 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + @@ -129,4 +131,4 @@ - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_capture.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,147 +1,149 @@ - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - + + + - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - + + + + + + + + + + + - - - - + + + + + + + - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + - - - - + + + + + + + + + + + - - - - - - + + + + + + + + + - - + + + + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_collection.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,66 +1,68 @@ - - + + - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + - - + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_dialled_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,151 +1,115 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - + + + + + - - - - - - - + + - - - - - - - - - - - - - - - - - - + - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_download.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,53 +1,55 @@ - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_missed_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,151 +1,116 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - + + + + - - - - - + + + + - + - - - - - - - - - - - - - - - - - - + - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_player.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,54 +1,56 @@ - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_podcast.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,54 +1,56 @@ - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_received_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,151 +1,116 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - + + + + + + + + - - - - - - - + - - - - - - - - - - - - - - - - - - + - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_recent.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,98 +1,100 @@ - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - + + + - - - - + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + - + - - - - - + + + + + - - - - + + + + - - - - + + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_service.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,64 +1,66 @@ - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_tv.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,69 +1,71 @@ - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,40 +1,42 @@ - - + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_recorder.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,250 +1,252 @@ - - + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + - - - - - - - - + + + + - - - - - - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,71 +1,73 @@ - - + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_active.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,62 +1,64 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_end.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,70 +1,74 @@ - - + + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_hold.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,70 +1,72 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_waiting.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,70 +1,72 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_dialled_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,89 +1,77 @@ - - + + - - - - - - - - - - - - + + + + + + - - - - - - - - - + + + + + - - - - - - - - - - - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_missed_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,89 +1,78 @@ - - + + - - - - - - - - - - - - + + + + - - - - - - - - - + + + + - - - - + + + + - - - - - - - + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_received_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,89 +1,78 @@ - - + + - - - - - - - - - - - - + + + + + - - - - - - - - - + + + + + + + + - - - - - - - - - - - - + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_waiting_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,39 +1,41 @@ - - + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_warning.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_warning.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_warning.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,31 +1,33 @@ - - + + - - - + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_web_feeds.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,21 +1,23 @@ - - + + + - - - - - + + + + + - - - - - + + + + + - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_widget.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_widget.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_widget.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,94 +1,96 @@ - - + + - - - - - + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wire_connect.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -54,4 +55,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,71 +1,73 @@ - - + + + - - - - - - - - - - - - - + + + + + - - - - - - + + + + + + + - - - - - + + + + + + - - - - + + + + + + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan_off.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,82 +1,84 @@ - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + + - - - - - + + + + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_zipmgr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_zipmgr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_zipmgr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,143 +1,145 @@ - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_0_3mp.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_0_3mp.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_0_3mp.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_12mp.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_12mp.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_12mp.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_1_3mp.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_1_3mp.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_1_3mp.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_3mp.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_3mp.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_3mp.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_9mp.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_9mp.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_9mp.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_accented_characters.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_accented_characters.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_accented_characters.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_activitystream.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_activitystream.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_activitystream.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,11 @@ - - + + + - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_contact.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_contact.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_contact.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,9 @@ - - + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_calendar.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_calendar.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_calendar.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_contact.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_contact.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_contact.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_favourites.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_favourites.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_favourites.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,9 @@ - - + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_homescreen.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_homescreen.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_homescreen.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_video_collection.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_video_collection.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_video_collection.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -10,8 +10,8 @@ - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_addcity.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_addcity.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_addcity.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_inactive.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_inactive.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_inactive.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_new.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_new.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_new.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_snooze.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_snooze.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_snooze.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,4 +7,4 @@ - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alpha_mode.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alpha_mode.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alpha_mode.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_app_exit.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_app_exit.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_app_exit.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_applications_all.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_applications_all.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_applications_all.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_applications_collections.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_applications_collections.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_applications_collections.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_down.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_down.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_down.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_left.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_left.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_left.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_right.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_right.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_right.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_up.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_up.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_up.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_artists.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_artists.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_artists.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,9 @@ - - + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_natural.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_natural.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_natural.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_stretched.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_stretched.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_stretched.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,13 @@ - - + + + - - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_zoom.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_zoom.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_zoom.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_attach.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_attach.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_attach.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_audio.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_audio.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_audio.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_autoflash.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_autoflash.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_autoflash.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_automatic.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_automatic.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_automatic.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_back.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_back.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_back.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace1.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace1.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace1.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace2.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace2.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace2.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_headset.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_headset.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_headset.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_off.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_off.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_off.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bold.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bold.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bold.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_add_new.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_add_new.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_add_new.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_pair.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_pair.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_pair.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_show_all.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_show_all.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_show_all.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_show_pair.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_show_pair.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_show_pair.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_unpair.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_unpair.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_unpair.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bullet.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bullet.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bullet.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call_diverted.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call_diverted.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call_diverted.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_cam_mode_camcorder.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_cam_mode_camcorder.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,9 @@ + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_cam_mode_camera.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_cam_mode_camera.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,10 @@ + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcorder.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcorder.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcorder.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcorder_off.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcorder_off.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcorder_off.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camera.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camera.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camera.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_capture.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_capture.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_capture.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_car_itut.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_car_itut.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_car_itut.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_car_qwerty.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_car_qwerty.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_car_qwerty.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_change_cam_mode.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_change_cam_mode.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_change_cam_mode.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_ciphering_off.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_ciphering_off.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_ciphering_off.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_close_up.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_close_up.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_close_up.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_collapse.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_collapse.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_collapse.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_communication.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_communication.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_communication.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contact_all.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contact_all.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contact_all.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contacts.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contacts.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contacts.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,10 @@ - - + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_continuous_capture.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_continuous_capture.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_continuous_capture.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contrast.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contrast.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contrast.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contrast_high.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,9 @@ - - + + - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contrast_low.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,9 @@ - - + + - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_corrupted.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_corrupted.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_corrupted.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_email.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_email.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_email.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_event.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_event.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_event.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_message.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_message.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_message.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,13 @@ - - + + + - - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_day_light_saving_time.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_day_light_saving_time.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_day_light_saving_time.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_delete.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_delete.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_delete.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_details.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_details.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_details.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_dialer.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_dialer.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_dialer.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + + - - + + + - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_disconnect.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_disconnect.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_disconnect.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_drm_rights_expired.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_drm_rights_expired.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_drm_rights_expired.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_drop_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_drop_call.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_drop_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,12 @@ - - + + + - - - - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_edit.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_edit.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_edit.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,10 @@ - - + + + - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_attach.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_attach.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_attach.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - - - - - - - - \ No newline at end of file + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_context.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_context.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_context.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_multipdp.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_multipdp.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_multipdp.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_suspended.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_suspended.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_suspended.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_end_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_end_call.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_end_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_enter.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_enter.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_enter.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exit.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exit.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exit.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_expand.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_expand.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_expand.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exposure.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exposure.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exposure.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking_off.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking_off.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking_off.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - - - - - - - \ No newline at end of file + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_failed.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_failed.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_failed.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites_remove.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites_remove.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites_remove.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_filter.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_filter.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_filter.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash_charging.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash_charging.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash_charging.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash_off.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash_off.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash_off.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_folder.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_folder.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_folder.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,9 @@ - - + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward_email.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward_email.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward_email.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,10 @@ - - + + + - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward_msg.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward_msg.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward_msg.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,12 @@ - - + + + - - - - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_genres.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_genres.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_genres.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag_no_location_lock.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag_no_location_lock.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag_off.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag_off.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag_off.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_go.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_go.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_go.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_gps.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_gps.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_gps.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_gps_off.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_gps_off.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_gps_off.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_group.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_group.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_group.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,10 @@ - - + + + - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hard_disk.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hard_disk.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hard_disk.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hd.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hd.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hd.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_help_all.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_help_all.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_help_all.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_history.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_history.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_history.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hold_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hold_call.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hold_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_home.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_home.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_home.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_attach.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_attach.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_attach.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_context.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_context.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_context.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_multipdp.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_multipdp.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_multipdp.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_suspended.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_suspended.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_suspended.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - - - - - - - - \ No newline at end of file + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_img_quality.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_img_quality.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_img_quality.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_import.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_import.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_import.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_info.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_info.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_info.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_iso.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_iso.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_iso.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_italic.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_italic.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_italic.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_join_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_join_call.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_join_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,11 @@ - - + + + - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_landscape.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_landscape.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_landscape.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_last_result.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_last_result.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_last_result.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light_off.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light_off.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light_off.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location_collection.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location_collection.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location_collection.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_low_light.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_low_light.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_low_light.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lsk_horizontal.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lsk_horizontal.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lsk_horizontal.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lsk_vertical.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lsk_vertical.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lsk_vertical.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_memory_in_use.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_memory_in_use.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_memory_in_use.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mic_mute.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mic_mute.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mic_mute.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mic_unmute.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mic_unmute.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mic_unmute.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_minus.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_minus.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_minus.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_missed_call_unseen.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_missed_call_unseen.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_missed_call_unseen.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mobile.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mobile.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mobile.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_more.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_more.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_more.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_music_albums.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_music_albums.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_music_albums.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,9 @@ - - + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_new_event.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_new_event.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_new_event.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_next.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_next.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_next.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,9 @@ - - + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night_portrait.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night_portrait.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night_portrait.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_notes_all.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_notes_all.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_notes_all.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_notes_collections.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_notes_collections.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_notes_collections.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_offline.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_offline.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_offline.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_one.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_one.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_one.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_online_support.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_online_support.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_online_support.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_options_menu.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_options_menu.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_options_menu.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_organize.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_organize.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_organize.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,14 @@ - - + + - - - - - \ No newline at end of file + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_outbox.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_outbox.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_outbox.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,9 @@ - - + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pan.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pan.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,11 @@ + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pause.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pause.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pause.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_attach.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_attach.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_attach.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - - - - - - - + + + + + + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_context.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_context.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_context.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_multipdp.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_multipdp.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_multipdp.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_suspended.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_suspended.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_suspended.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - - - - - + + + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_person_activitystream.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_person_activitystream.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_person_activitystream.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,9 @@ - - + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photo_albums.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photo_albums.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photo_albums.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photos.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photos.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photos.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + - + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play_history.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play_history.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play_history.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,9 @@ - - + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_playlist.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_playlist.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_playlist.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,12 @@ - - + + - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_plus.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_plus.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_plus.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + - + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_podcast.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_podcast.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_podcast.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_portrait.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_portrait.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_portrait.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + - + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_power.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_power.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_power.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,9 @@ - - + + - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_predictive_text_off.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_predictive_text_off.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_predictive_text_off.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,10 @@ - - + + - - - + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_predictive_text_on.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_predictive_text_on.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_predictive_text_on.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,12 @@ - - + + - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_presentation.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_presentation.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_presentation.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_previous.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_previous.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_previous.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,9 @@ - - + + - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_private_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_private_call.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_private_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - - - - - - - \ No newline at end of file + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_qcif.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_qcif.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_qcif.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_radio_collections.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_radio_collections.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_radio_collections.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_radio_stations.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_radio_stations.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_radio_stations.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_recognize_song.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_recognize_song.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_recognize_song.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,9 @@ - - + + - + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_redeye.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_redeye.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_redeye.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reject_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reject_call.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reject_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_remove_from_video_collection.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_remove_from_video_collection.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_remove_from_video_collection.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,19 @@ - - + + - + - + - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat_exception.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat_exception.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat_exception.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_replace_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_replace_call.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_replace_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,12 @@ - - + + - - - - - + + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_all.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_all.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_all.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,13 @@ - - + + - - - - - + + + + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_all_email.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_all_email.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_all_email.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,11 @@ - - + + - + + - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_email.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_email.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_email.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,10 @@ - - + + - - - + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_restore_settings.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_restore_settings.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_restore_settings.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rewind.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rewind.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rewind.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rsk_horizontal.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rsk_horizontal.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rsk_horizontal.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rsk_vertical.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rsk_vertical.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rsk_vertical.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search_stop.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search_stop.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search_stop.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - - + + + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_next.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_next.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_next.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,10 @@ - - + + - - - + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_previous.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_previous.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_previous.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,10 @@ - - + + - - - + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_send.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_send.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_send.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,14 @@ - - + + - - - - - - - + + + + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_send_mycard.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_send_mycard.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_send_mycard.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,11 @@ - - + + - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_settings.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_settings.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_settings.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shake_warning.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shake_warning.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shake_warning.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share_photo.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share_photo.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share_photo.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share_photo_off.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share_photo_off.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share_photo_off.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - + + + + - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sharpness.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sharpness.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sharpness.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sharpness_hard.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sharpness_hard.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,7 @@ + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sharpness_soft.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sharpness_soft.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,7 @@ + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shift.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shift.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shift.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + - + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_show_view.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_show_view.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_show_view.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle_off.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle_off.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle_off.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_smiley.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_smiley.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_smiley.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_songs_all.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_songs_all.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_songs_all.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + - + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sort.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sort.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sort.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_itut.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_itut.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_itut.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_vkb.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_vkb.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_vkb.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker_off.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker_off.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker_off.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_special_characters_itut.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_special_characters_itut.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_special_characters_itut.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,8 +7,8 @@ - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_special_characters_qwerty.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_special_characters_qwerty.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_special_characters_qwerty.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,11 +7,11 @@ - - - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sport.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sport.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sport.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization_off.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization_off.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization_off.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - - - - - + + + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_station_scan.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_station_scan.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_station_scan.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - - - - - + + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stop.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stop.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stop.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_store.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_store.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_store.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_swap_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_swap_call.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_swap_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_itut.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_itut.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_itut.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_qwerty.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_qwerty.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_qwerty.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_qwerty_hi.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_qwerty_hi.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,9 @@ + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tab_active.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tab_active.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tab_active.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tab_passive.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tab_passive.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tab_passive.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tag.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tag.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tag.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_center.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_center.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_center.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_justify.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_justify.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_justify.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_left.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_left.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_left.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_right.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_right.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_right.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tick.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tick.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tick.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + - + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tip.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tip.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tip.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,10 @@ - - + + - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_two.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_two.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_two.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_attach.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_attach.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_attach.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - - - - - - - + + + + + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_context.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_context.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_context.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_multipdp.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_multipdp.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_multipdp.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_suspended.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_suspended.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_suspended.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - - - - - + + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unblock.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unblock.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unblock.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_underline.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_underline.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_underline.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unknown.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unknown.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unknown.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_update_existing.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_update_existing.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_update_existing.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,11 @@ - - + + + - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_usb.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_usb.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_usb.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_user_defined.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_user_defined.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_user_defined.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga_wide.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga_wide.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga_wide.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_call.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,14 @@ - - + + - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_collection.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_collection.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_collection.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - + @@ -10,9 +10,9 @@ - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_services.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_services.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_services.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_virtual_input.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_virtual_input.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_virtual_input.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_voice_mailbox.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_voice_mailbox.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_voice_mailbox.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vol_down.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vol_down.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vol_down.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vol_up.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vol_up.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vol_up.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_attach.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_attach.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_attach.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - - - - - - - + + + + + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_context.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_context.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_context.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_multipdp.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_multipdp.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_multipdp.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_suspended.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_suspended.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_suspended.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - - - - - + + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_cloudy.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_cloudy.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_cloudy.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - - - - - - + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_fluorescent.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_fluorescent.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_fluorescent.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_incandescent.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_incandescent.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_incandescent.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,10 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_sunny.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_sunny.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_sunny.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - - - - - - - + + + + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wildcard.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wildcard.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,11 @@ + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_attach.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_attach.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_attach.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,17 @@ - - + + - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_context.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_context.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_context.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_multipdp.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_multipdp.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_multipdp.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_suspended.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_suspended.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_suspended.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,14 @@ - - + + - - - - - - - - - - \ No newline at end of file + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,13 @@ - - + + - + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan_offline.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan_offline.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan_offline.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,15 @@ - - + + - - - - - - - - + + + + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_work.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_work.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_work.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_world_clock.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_world_clock.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_world_clock.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,12 @@ - - + + - - - - - + + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom_in.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom_in.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom_in.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom_out.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom_out.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom_out.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,11 +1,11 @@ - - + + - - - - + + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_add.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_add.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_add.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,19 @@ - - + + + - - + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_anniversary.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_anniversary.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_anniversary.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,56 +1,58 @@ - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_assistant.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_assistant.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_assistant.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,66 +1,68 @@ - - + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_attachment.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_attachment.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_attachment.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + + - - + + - - - - + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_authorised.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_authorised.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_authorised.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,41 +1,43 @@ - - + + + - - - - - - - - - - - - - - + + + + + + + - - - - - - - + + + + + + - - - - - - + + + + + + + - - - + + + + + + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_blocked.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_blocked.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_blocked.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,18 +1,20 @@ - - + + + - - - - + + + + - - - - + + + + - - + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bluetooth_offline.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,20 @@ - - + + + - - - - - + + + + + - - - - + + + + + + @@ -22,4 +25,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_low_battery.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,31 +1,39 @@ - - + + + - - - - - + + + + + + - - - - + + + + + + - - - - + + + + + + - - - - + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_high.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,39 +1,41 @@ - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_low.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,45 +1,47 @@ - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_medium.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,42 +1,44 @@ - - + + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_business_card.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,27 +1,29 @@ - - + + + - - - + + + - - - + + + - - - + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_calendar.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_calendar.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_calendar.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,49 +1,51 @@ - - + + - - - - + + + + + - - - + + + - - - - + + + + - - - - - + + + + + - - + + - - + + - - + + - + - - + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_car.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_car.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_car.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,77 +1,79 @@ - - + + + - + - - - + + + - + - - - - - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + - - - - + + + + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_charger.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_charger.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_charger.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,61 +1,63 @@ - - + + + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_collapse.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_collapse.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_collapse.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -13,4 +14,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_company_details.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,86 +1,88 @@ - - + + + - - - + + + - - + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connected.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connected.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connected.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,19 @@ - - + + + - + - - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connection.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connection.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connection.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,35 +1,37 @@ - - + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_corrupted.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_corrupted.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_corrupted.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,24 +1,26 @@ - - + + - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_day.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_day.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_day.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,44 +1,46 @@ - - + + + - - - - + + + + - - - - + + + + - - + + - - + + - - + + - + - - + + - + - - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_dictionary.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_dictionary.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_dictionary.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,23 @@ - - + + + - - - - + + + + - - - + + + - - - - \ No newline at end of file + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_disconnected.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_disconnected.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_disconnected.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,28 +1,30 @@ - - + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_draft.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_draft.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_draft.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,41 +1,45 @@ - - + + - - + + + - + + - - + + - + - + - - - + + + - + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_drm_rights_expired.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,30 +1,33 @@ - - + + - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + + + @@ -35,4 +38,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,19 @@ - - + + + - + - - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email_home.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,27 +1,31 @@ - - + + + - - - - + + + + - - - + + + - - - - + + + + + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email_work.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,28 +1,34 @@ - - + + + - - - - + + + + - - - - + + + - - - - + + + + + + + + - - - + + + - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_expand.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_expand.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_expand.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,18 @@ - - + + + - + - + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fail.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fail.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fail.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,18 +1,20 @@ - - + + + - - - - + + + + - - - - + + + + - - + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_family.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_family.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_family.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,38 +1,40 @@ - - + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_favorite.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_favorite.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_favorite.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + - - - + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -86,4 +87,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_home.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,100 +1,104 @@ - - + + + - - - - + + + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + - - - - - + + + + + - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_work.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,101 +1,105 @@ - - + + + - - - - + + + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + - - - - - + + + + + - - - + + + - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_flash.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_flash.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_flash.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,37 +1,39 @@ - - + + - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_folder.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_folder.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_folder.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,18 +1,20 @@ - - + + - - + + + - - - - + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_follow_up.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,27 +1,29 @@ - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_forward.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_forward.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_forward.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,18 @@ - - + + + - - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_gprs.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_gprs.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_gprs.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,21 @@ - - + + + - + - - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_homescreen.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_homescreen.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_homescreen.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,63 +1,67 @@ - - + + - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + - - - - + + + + - - - - - - + - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_offline.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,56 +1,61 @@ - - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - + + + + @@ -61,4 +66,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_widget.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,44 +1,46 @@ - - + + - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_html.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_html.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_html.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,23 +1,25 @@ - - + + - - - - + + + + + - - - - - + + + + + - - + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hwr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hwr.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hwr.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,20 +1,26 @@ - - + + + - + - - - + + + + - - - - + + + + + + - - - + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_image.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_image.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_image.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -50,4 +51,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_internet.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_internet.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_internet.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,35 +1,37 @@ - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - + - - - - + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_intranet.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_intranet.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_intranet.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,37 +1,39 @@ - - + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - + - - - - + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_itut.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_itut.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_itut.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,94 +1,96 @@ - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_java.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_java.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_java.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,26 +1,28 @@ - - + + + - - - - + + + + - - - - - - - + + + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_keyboard.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_keyboard.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_keyboard.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,102 +1,104 @@ - - + + - - - - + + + + + - - - - + + + + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,71 +1,73 @@ - - + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_home.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,82 +1,86 @@ - - + + + - - - - + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_work.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,83 +1,87 @@ - - + + + - - - - + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - + + + - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_link.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_link.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_link.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,23 +1,25 @@ - - + + + - + - - - - - - - - - + + + + + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_location.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_location.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_location.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,26 +1,28 @@ - - + + + - - - - - - - + + + + + + + - - - - - + + + + + - + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_lock.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_lock.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_lock.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,41 +1,43 @@ - - + + + - - - - - - - - - - - - - - + + + + + + + - - - - - - - + + + + + + - - - - - - + + + + + + + - - - + + + + + + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_meeting.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_meeting.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_meeting.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,47 +1,49 @@ - - + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_message.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_message.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_message.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,28 +1,30 @@ - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_missed_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,18 @@ - - + + + - - - - + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mms.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mms.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mms.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -50,6 +51,8 @@ + + @@ -65,4 +68,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,44 +1,46 @@ - - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_home.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,55 +1,59 @@ - - + + - - - - + + + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - - - - + + + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_work.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,56 +1,60 @@ - - + + - - - - + + + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - - - - - + + + + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_doc.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,12 @@ - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_pdf.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,12 @@ - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_ppt.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -10,4 +11,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_rtf.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -9,4 +10,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_xls.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -10,4 +11,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_network.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_network.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_network.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,44 +1,21 @@ - - + + - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_network_off.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,46 +1,24 @@ - - + + - - - - - - - - - - - + + + + + - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - + + + + @@ -51,4 +29,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_chat.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,21 +1,24 @@ - - + + + - - - - + + + + - - + + - - - - + + + + + + @@ -32,4 +35,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_email_event.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,20 @@ - - + + + - - - - + + + + - - - + + + + + @@ -28,4 +31,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_event.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,20 +1,22 @@ - - + + + - - - - - + + + + + - - - - - - + + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_tip.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,43 +1,46 @@ - - + + + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + + + @@ -54,4 +57,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_nfc_offline.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,22 +1,25 @@ - - + + + - - - - - - - - + + + + + + + + - - - + + + + + @@ -27,4 +30,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_no_signal.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,33 +1,35 @@ - - + + + - - - + + + - + - - - + + + - - - + + + - - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_note.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_note.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_note.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,19 @@ - - + + - - - + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_offline.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_offline.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_offline.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,21 @@ - - + + + - - - - + + + + - - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_online.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_online.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_online.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,21 +1,23 @@ - - + + + - - - - - + + + + + - - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_operator.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_operator.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_operator.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,39 +1,41 @@ - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_outbox.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_outbox.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_outbox.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,28 +1,30 @@ - - + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pager.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pager.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pager.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,40 +1,42 @@ - - + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pair.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pair.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pair.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,20 +1,22 @@ - - + + + - - - - - + + + + + - - - - - - + + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pd_wcdma.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,80 +1,33 @@ - - + + - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pd_wcdma_off.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,82 +1,36 @@ - - + + - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - + + + + @@ -87,4 +41,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_person.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_person.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_person.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,40 +1,42 @@ - - + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phone_disabled.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,46 +1,49 @@ - - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + + + @@ -51,4 +54,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phonebook.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phonebook.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phonebook.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,40 +1,42 @@ - - + + + - - - - + + + + - - - - + + + + - - + + - + - - + + - + - - + + - + - - + + - - + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_play.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_play.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_play.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_playlist.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_playlist.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_playlist.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,20 @@ - - + + - - - - + + + + + - - + + + + @@ -27,4 +30,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_presentation.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_presentation.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_presentation.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,42 +1,43 @@ - - + + + - - - - + + + + - - - + + + - + - - - + + + - - - + + + - - - + + + - - - + + + @@ -44,8 +45,9 @@ - - + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_high.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,21 @@ - - + + - - - - + + + + + - - - - - + + + + + - - + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_low.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,18 @@ - - + + + - - - - + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -24,4 +25,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected_disabled.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,10 @@ - - + + + - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected_highlight.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,30 +1,32 @@ - - + + - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -12,4 +13,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected_disabled.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,9 @@ - - + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected_highlight.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,18 +1,20 @@ - - + + - - - - + + + + + - - - - + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reboot.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reboot.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reboot.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,27 +1,29 @@ - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_received.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_received.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_received.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,18 +1,20 @@ - - + + + - - - - - + + + + + - - - - + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_record.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_record.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_record.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + + - + - + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_refresh.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_refresh.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_refresh.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,22 +1,24 @@ - - + + + - - - - + + + + - - - - + + + + - - - - - - - - \ No newline at end of file + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reminder.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reminder.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reminder.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,39 +1,41 @@ - - + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,18 +1,20 @@ - - + + + - - - - - - + + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat_exception.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,18 +1,21 @@ - - + + + - - - - + + + + - - - - - + + + + + + + @@ -23,4 +26,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + + - - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply_all.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -17,4 +18,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_rgb.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_rgb.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_rgb.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,13 +1,15 @@ - - + + + - - - + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -18,4 +19,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_disabled.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,9 @@ - - + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_highlight.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,25 +1,27 @@ - - + + + - - - + + + - - - + + + - - + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_partial.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -23,4 +24,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sent.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sent.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sent.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,19 @@ - - + + + - - - - + + + + - - - - + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_shuffle.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_shuffle.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_shuffle.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,24 +1,26 @@ - - + + - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_shuffle_off.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,26 +1,29 @@ - - + + - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + + + @@ -31,4 +34,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_good.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,27 +1,29 @@ - - + + + - - - + + + - - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_low.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,33 +1,35 @@ - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_medium.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,30 +1,32 @@ - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sisx.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sisx.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sisx.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,26 +1,28 @@ - - + + + - - - - + + + + - - - - - - - + + + + + + + - - + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_angry.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,55 +1,59 @@ - - + + + + + - - - + + + - - - - - + + + + + - + - - - + + + - - - - + + + + - + - - - + + + - - + + - - - - - + + + + + - - - - + + + + - - - - - - - - - \ No newline at end of file + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_bigsmile.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,48 +1,54 @@ - - + + - + + + + + + - - - - + + + + - - - - - - - - - - - + + + + + - - - - - + + + + + - - - - + + + + + - - - - - + + + + - - - - - + + + + + + + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_cry.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,42 +1,46 @@ - - + + + + + - - - - + + + + - - + + - + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - \ No newline at end of file + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_evil.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,34 +1,38 @@ - - + + + + - - - - - + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_eyebrows.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,65 +1,69 @@ - - + + + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_heart.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,12 +1,16 @@ - - + + + + - - - - + + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_irritated.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,22 +1,26 @@ - - + + + + + - - - - + + + + - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_kissing.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,38 +1,42 @@ - - + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_nerd.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,42 +1,46 @@ - - + + + + + - - - - + + + + - - - + + + - - - + + + - - + + - - - + + + - - + + - - - - - - - - - + + + + + + + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_neutral.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,52 +1,56 @@ - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,60 +1,64 @@ - - + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - + + - - + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic_mad.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,42 +1,46 @@ - - + + + + + - - - - + + + + - - - - - + + + + + - + - - - + + + - - - - + + + + - + - - - + + + - - - - - - + + + + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_smile.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,32 +1,36 @@ - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_surprised.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,60 +1,64 @@ - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_tongue.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,41 +1,45 @@ - - + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_unhappy.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,42 +1,46 @@ - - + + + + + - - - - + + + + - - - - - + + + + + - + - - - + + + - - - - + + + + - + - - - + + + - - - - - - + + + + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_very_cool.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,50 +1,54 @@ - - + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,37 +1,41 @@ - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink_grin.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,49 +1,53 @@ - - + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - - - - - \ No newline at end of file + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wondering.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,38 +1,42 @@ - - + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - \ No newline at end of file + + + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sound.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sound.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sound.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,15 +1,17 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_speaker.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_speaker.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_speaker.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,40 +1,42 @@ - - + + - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - + - - - - - + + + + + - - - - - - + + + + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_star_non_favourited.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,16 @@ - - + + - - - + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_swype.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_swype.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_swype.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,43 +1,49 @@ - - + + - - - - - + + + + + + + - - - - - + + + + + + - - - + + + - - - + + + - - - + + + + - - - - + + + + - - + + - - - + + + - - - \ No newline at end of file + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sync.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sync.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sync.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,23 +1,25 @@ - - + + + - - - - + + + + - - - - - - - + + + + + + + - - - - + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tag_inactive.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,21 +1,21 @@ - - + + - - - - - - - + + + + + + + - - - + + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_telephony_offline.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,26 +1,29 @@ - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - + + + + @@ -31,4 +34,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_text.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_text.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_text.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,17 +1,19 @@ - - + + - - - + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tick.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tick.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tick.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,16 @@ - - + + - - - - + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tip.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tip.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tip.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,41 +1,43 @@ - - + + + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,22 +1,24 @@ - - + + - - - - + + + + + - - + + - + - - - + + + - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo_done.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,24 +1,27 @@ - - + + - - - - + + + + + - - + + - + - - - + + + - + + + @@ -28,4 +31,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unknown.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unknown.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unknown.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,21 +1,23 @@ - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,7 @@ - - + + + @@ -12,4 +13,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected_disabled.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,8 @@ - - + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected_highlight.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,18 +1,20 @@ - - + + + - - - + + + - - - + + + - - + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_untrusted.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_untrusted.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_untrusted.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,32 +1,34 @@ - - + + - + + - - - - + + + + - + - - - - - + + + + + - + - - - - + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,40 +1,42 @@ - - + + + - - - - + + + + - + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address_home.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,52 +1,56 @@ - - + + + - - - - + + + + - + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address_work.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,53 +1,59 @@ - - + + + - - - - + + + + - + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + + + - - - - + + + + + - - - + + + - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_video.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_video.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_video.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,16 +1,17 @@ - - + + + - - - + + + - - - + + + @@ -27,4 +28,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,58 +1,60 @@ - - + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - \ No newline at end of file + + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip_home.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,70 +1,74 @@ - - + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - + + + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip_work.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,71 +1,77 @@ - - + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - + + + + - - - - + + + + + - - - + + + - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_vpn.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_vpn.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_vpn.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,35 +1,38 @@ - - + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + + + @@ -48,4 +51,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wcdma.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wcdma.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wcdma.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,41 +1,19 @@ - - + + - - - - - - - - - - - - - - - - + + + + + - - - - - + + + + + - - - - - - - - - - - - - + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wcdma_off.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,43 +1,22 @@ - - + + - - - - - - - - - - - - - - - - + + + + + - - - - - + + + + + - - - - - - - - - - - - - + + + @@ -48,4 +27,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wifi.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wifi.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wifi.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,19 +1,25 @@ - - + + + - + - + + + - - + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,25 +1,27 @@ - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_offline.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,25 +1,28 @@ - - + + + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -30,4 +33,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_secure.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,25 +1,28 @@ - - + + + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -38,4 +41,5 @@ - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_battery.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_battery.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_battery.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth_hide.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth_hide.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,6 @@ + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth_off.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth_off.svg Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,6 @@ + + + + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_egprs.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_egprs.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_egprs.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_gps.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_gps.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_gps.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_hsdpa.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_hsdpa.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_hsdpa.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,9 +1,9 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_missed_call.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_email.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_im.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,8 +1,8 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_message.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_offline.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_offline.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_offline.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 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 Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_profile_silent.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - - - \ No newline at end of file + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_psm.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_psm.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_psm.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - - \ No newline at end of file + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_signal.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_signal.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_signal.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wcdma.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wcdma.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wcdma.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wlan.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wlan.svg Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wlan.svg Thu Sep 02 20:44:51 2010 +0300 @@ -1,5 +1,5 @@ - - + + @@ -7,4 +7,4 @@ - \ No newline at end of file + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbcheckbox/hbcheckbox.css --- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbcheckbox/hbcheckbox.css Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbcheckbox/hbcheckbox.css Thu Sep 02 20:44:51 2010 +0300 @@ -28,3 +28,9 @@ bottom: 0.0un; } +HbCheckBox::spacerTop{ + size-policy-vertical: expanding; +} +HbCheckBox::spacerBottom{ + size-policy-vertical: expanding; +} \ No newline at end of file diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbcheckbox/hbcheckbox.widgetml --- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbcheckbox/hbcheckbox.widgetml Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbcheckbox/hbcheckbox.widgetml Thu Sep 02 20:44:51 2010 +0300 @@ -3,13 +3,11 @@ - - - + + + - - diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbmessageboxeditor/hbmessageboxeditor.css --- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbmessageboxeditor/hbmessageboxeditor.css Wed Aug 18 10:05:37 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -HbMessageBoxEditor::text{ - left: 0un; - right: 0un; - top: 0un; - bottom: 0un; -} \ No newline at end of file diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectiondialogcontentwidget/hbselectiondialogcontentwidget.css --- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectiondialogcontentwidget/hbselectiondialogcontentwidget.css Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectiondialogcontentwidget/hbselectiondialogcontentwidget.css Thu Sep 02 20:44:51 2010 +0300 @@ -1,10 +1,6 @@ -HbSelectionDialogContentWidget[!multiSelection]{ +HbSelectionDialogContentWidget{ layout:default; } -HbSelectionDialogContentWidget[multiSelection]{ - layout:list_with_markall; - -} \ No newline at end of file diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectiondialogcontentwidget/hbselectiondialogcontentwidget.widgetml --- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectiondialogcontentwidget/hbselectiondialogcontentwidget.widgetml Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectiondialogcontentwidget/hbselectiondialogcontentwidget.widgetml Thu Sep 02 20:44:51 2010 +0300 @@ -1,14 +1,5 @@ - - - - - - - - - diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtoolbutton/hbtoolbutton_color.css --- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtoolbutton/hbtoolbutton_color.css Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtoolbutton/hbtoolbutton_color.css Thu Sep 02 20:44:51 2010 +0300 @@ -40,7 +40,7 @@ HbToolButton[toolbutton_extension_layout]::text { -color:var(qtc_popup_grid_normal); +color:var(qtc_popup_grid_trans_normal); } HbToolButton[state = "pressed"][toolbutton_extension_layout]::text @@ -55,7 +55,7 @@ HbToolButton[toolbutton_extension_layout]::icon { -color:var(qtc_popup_grid_normal); +color:var(qtc_popup_grid_trans_normal); } HbToolButton[state = "pressed"][toolbutton_extension_layout]::icon diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/resources/themes/style/hbdefault/variables/color/hbapplicationcolorgroup.css --- a/src/hbcore/resources/themes/style/hbdefault/variables/color/hbapplicationcolorgroup.css Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/resources/themes/style/hbdefault/variables/color/hbapplicationcolorgroup.css Thu Sep 02 20:44:51 2010 +0300 @@ -20,7 +20,7 @@ qtc_cal_month_current_day:#66CCAD; /* Added 05.02.2010 */ qtc_cal_week_day:#505050; /* Added 05.02.2010 */ qtc_cal_day_preview_heading:#FFFFFF; /* Added 05.02.2010 */ -qtc_cal_day_preview_text:#FFFFFF; /* Added 05.02.2010 */ +qtc_cal_day_preview_text:#505050; /* Modified 02.08.2010 */ qtc_cal_day_hour_lines:#505050; /* Added 05.02.2010 */ qtc_cal_monthgrid_title:#FFFFFF; /* Added 05.02.2010 */ qtc_cal_meeting:#000000; /* Added 14.06.2010 */ diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstyle.cpp --- a/src/hbcore/style/hbstyle.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/style/hbstyle.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -65,6 +65,15 @@ #include "hbstyleoptionprogresssliderhandle_p.h" #include "hbstyleoptionprogressslider_p.h" + +#include +#include +#include +#include +#include +#include +#include + #include #include #include @@ -100,7 +109,6 @@ #include #include -#include #include #include "hbdeviceprofile.h" #include "hbrepeatitem_p.h" @@ -113,6 +121,7 @@ #include "hbfeaturemanager_r.h" #endif + Q_DECLARE_METATYPE(QGraphicsLayout*) //Uncomment next define(s) in order to get more debug prints. @@ -147,7 +156,6 @@ */ // TODO: margins should be defined in layout data once layout specification exists. -static const int ItemName = 0xfffe; static const QString STYLE_LOCATION = QLatin1String(":/themes/style/hbdefault/rules/widgets/%w/%w"); static const QString COLOR_STYLE_LOCATION = QLatin1String(":/themes/style/hbdefault/rules/widgets/%w/%w_color.css"); static const int TOUCHAREA_ZVALUE = 1000; @@ -203,28 +211,208 @@ delete d_ptr; } /*! - - \deprecated HbStyle::createPrimitive(HbStyle::Primitive, QGraphicsItem*) - is deprecated. This method will be made private and later replaced with new version. + Instantiates widget building blocks. The building blocks are called "primitives" and their main function is to perform the painting (e.g. drawing text). + A set of base primitives are defined in HbStyle::BasePrimitive enumeration. A widget calling this method should not cast the returned QGraphicsObject + to the actual primitive object. By following this rule the styling mechanism can be used to change the actual primitive instance to something else than the original one + instantiated by the createPrimitive() method. This enables customizing the painting of the UI without touching the widget code. + + Updating of a primitive's state is done by using HbStyle::updatePrimitive() method which uses the style primitive data classes (comparable to + Qt styleoptions) to get the state information needed for the primitive updating. + + \param primitiveType, enumeration of the base primitive + \param itemName, string which identifies a primitive in the widget (e.g. "background", or "text"). The item name matches with primitive names in widget's CSS file. + \param parent, parent for the primitive, although the default is 0 usually the widget is given as a parent for the primitive + \return QGraphicsObject, the returned primitive should be stored as a QGraphicsObject on the widget side + \sa HbStyle::updatePrimitive() + \sa HbStylePrimitiveData + \sa HbStyleTextPrimitiveData + \sa HbStyleFramePrimitiveData + \sa HbStyleIconPrimitiveData + \sa HbStyleRichTextPrimitiveData + \sa HbStyleMarqueePrimitiveData + \sa HbStyleTouchAreaPrimitiveData */ -QGraphicsItem *HbStyle::createPrimitive( HbStyle::Primitive primitive, QGraphicsItem *parent ) const +QGraphicsObject *HbStyle::createPrimitive(HbStyle::PrimitiveType primitiveType, const QString &itemName, QGraphicsObject *parent) const { - Q_UNUSED(primitive); - Q_UNUSED(parent); - return 0; - + QGraphicsObject *bp; + + switch (primitiveType) { + case PT_TextItem: + bp = new HbTextItem(parent); + break; + case PT_RichTextItem: + bp = new HbRichTextItem(parent); + break; + case PT_FrameItem: + bp = new HbFrameItem(parent); + break; + case PT_IconItem: + bp = new HbIconItem(parent); + break; + case PT_MarqueeItem: + bp = new HbMarqueeItem(parent); + break; + case PT_TouchArea: + bp = new HbTouchArea(parent); + break; + default: + bp = 0; + } + + if (bp != 0) { + setItemName(bp, itemName); + } + + return bp; } + /*! -\deprecated HbStyle::updatePrimitive(QGraphicsItem*, HbStyle::Primitive, const QStyleOption*) -is deprecated. This method will be made private and later replaced with a new version. - + This method is called by Hb widgets whenever there's a widget state change that results to a change in primitive's state. + For example if a button's text changes the button widget needs to update the button's text primitive by calling this method. + + Widgets need to use the HbStylePrimitiveData-derived classes to carry the primitive state information from the widget to the style. + These data classes enable the widget to set the primitives' state information without directly using the primitive APIs. + + Note that the updating of the primitive attributes is optimized so that if just one value from the primitive data set is updated only that one + value will be updated to the primitive on the style side. The values on primitive data classes are stored by using HbStyleValue templated class + which keeps track of whether a primitive data value was assigned or not. On the style side before calling the primitive API the HbStyleValue's + isSet()-method is called first to check if the widget did assign the primitive data value. + + + \param primitive, the primitive to be updated + \param data, primitive data needed for updating the primitive + \param parent, optionally the parent can be given + \return bool, true if correct primitive type was found from the style, false if not. + \sa HbStyle::createPrimitive() + \sa HbStylePrimitiveData + \sa HbStyleTextPrimitiveData + \sa HbStyleFramePrimitiveData + \sa HbStyleIconPrimitiveData + \sa HbStyleRichTextPrimitiveData + \sa HbStyleMarqueePrimitiveData + \sa HbStyleTouchAreaPrimitiveData */ -void HbStyle::updatePrimitive( QGraphicsItem *item, HbStyle::Primitive primitive, const QStyleOption *option ) const +bool HbStyle::updatePrimitive(QGraphicsObject *primitive, const HbStylePrimitiveData *data, QGraphicsObject *parent) const { - Q_UNUSED(item); - Q_UNUSED(primitive); - Q_UNUSED(option); + Q_UNUSED(parent); + + if (HbTextItem *textItem = qgraphicsitem_cast(primitive)) { + const HbStyleTextPrimitiveData *td = hbstyleprimitivedata_cast(data); + if (td->text.isSet()) + textItem->setText(td->text); + if (td->textColor.isSet()) + textItem->setTextColor(td->textColor); + if (td->alignment.isSet()) + textItem->setAlignment(td->alignment); + if (td->elideMode.isSet()) + textItem->setElideMode(td->elideMode); + if (td->textWrapping.isSet()) + textItem->setTextWrapping(td->textWrapping); + if (td->isTextVisible.isSet()) + textItem->setTextVisible(td->isTextVisible); + if (td->isTextClip.isSet()) + textItem->setTextClip(td->isTextClip); + if (td->geometry.isSet()) + textItem->setGeometry(td->geometry); + if (td->fadeLength.isSet()) + textItem->setFadeLength(td->fadeLength); + if (td->fadeLengths.isSet()) + textItem->setFadeLengths(td->fadeLengths); + return true; + + } else if (HbIconItem *iconItem = qgraphicsitem_cast(primitive)) { + const HbStyleIconPrimitiveData *id = hbstyleprimitivedata_cast(data); + if (id->icon.isSet()) + iconItem->setIcon(id->icon); + if (id->size.isSet()) + iconItem->setSize(id->size); + if (id->aspectRatioMode.isSet()) + iconItem->setAspectRatioMode(id->aspectRatioMode); + if (id->alignment.isSet()) + iconItem->setAlignment(id->alignment); + if (id->iconMode.isSet()) + iconItem->setMode(id->iconMode); + if (id->iconState.isSet()) + iconItem->setState(id->iconState); + if (id->iconName.isSet()) + iconItem->setIconName(id->iconName); + if (id->iconFlags.isSet()) + iconItem->setFlags(id->iconFlags); + if (id->mirroringMode.isSet()) + iconItem->setMirroringMode(id->mirroringMode); + if (id->brush.isSet()) + iconItem->setBrush(id->brush); + if (id->color.isSet()) + iconItem->setColor(id->color); + return true; + + } else if(HbFrameItem *frameItem = qgraphicsitem_cast(primitive)) { + const HbStyleFramePrimitiveData *fd = hbstyleprimitivedata_cast(data); + HbFrameDrawer *drawer = &(frameItem->frameDrawer()); + if (fd->frameGraphicsName.isSet()) + drawer->setFrameGraphicsName(fd->frameGraphicsName); + if (fd->frameType.isSet()) + drawer->setFrameType(fd->frameType); + if (fd->borderWidthLeft.isSet() || fd->borderWidthRight.isSet() || fd->borderWidthBottom.isSet() || fd->borderWidthTop.isSet()) + drawer->setBorderWidths(fd->borderWidthLeft, fd->borderWidthTop, fd->borderWidthRight, fd->borderWidthBottom); + if (fd->fillWholeRect.isSet()) + drawer->setFillWholeRect(fd->fillWholeRect); + if (fd->mirroringMode.isSet()) + drawer->setMirroringMode(fd->mirroringMode); + if (fd->fileNameSuffixList.isSet()) + drawer->setFileNameSuffixList(fd->fileNameSuffixList); + if (fd->pixmapMask.isSet()) + drawer->setMask(fd->pixmapMask); + if (fd->bitmapMask.isSet()) + drawer->setMask(fd->bitmapMask); + frameItem->setFrameDrawer(drawer); + return true; + + } else if (HbMarqueeItem *marqueeItem = qgraphicsitem_cast(primitive)) { + const HbStyleMarqueePrimitiveData *md = hbstyleprimitivedata_cast(data); + if (md->text.isSet()) + marqueeItem->setText(md->text); + if (md->textColor.isSet()) + marqueeItem->setTextColor(md->textColor); + if (md->animation.isSet()) { + if (md->animation) + marqueeItem->startAnimation(); + else + marqueeItem->stopAnimation(); + } + if (md->loopCount.isSet()) + marqueeItem->setLoopCount(md->loopCount); + return true; + + } else if (HbTouchArea *touchArea = qgraphicsitem_cast(primitive)) { + const HbStyleTouchAreaPrimitiveData *td = hbstyleprimitivedata_cast(data); + if (td->size.isSet()) + touchArea->setSize(td->size); + if (td->geometry.isSet()) + touchArea->setGeometry(td->geometry); + return true; + + } else if (HbRichTextItem *richTextItem = qgraphicsitem_cast(primitive)) { + const HbStyleRichTextPrimitiveData *rd = hbstyleprimitivedata_cast(data); + if (rd->text.isSet()) + richTextItem->setText(rd->text); + if (rd->defaultColor.isSet()) + richTextItem->setTextDefaultColor(rd->defaultColor); + if (rd->alignment.isSet()) + richTextItem->setAlignment(rd->alignment); + if (rd->textWrappingMode.isSet()) + richTextItem->setTextWrapping(rd->textWrappingMode); + if (rd->isTextVisible.isSet()) + richTextItem->setTextVisible(rd->isTextVisible); + if (rd->clipping.isSet()) + richTextItem->setTextClip(rd->clipping); + if (rd->geometry.isSet()) + richTextItem->setGeometry(rd->geometry); + return true; + } + +return false; } @@ -292,6 +480,7 @@ { HbTextItem *textItem = new HbTextItem(parent); HbStyle::setItemName(textItem, QLatin1String("text")); + textItem->setTextWrapping(Hb::TextWordWrap); return textItem; } case P_PushButton_text: @@ -820,7 +1009,7 @@ HbStyle::setItemName(n, QLatin1String("icon")); return n; } - case P_MessageBox_text:{ //deprecated + case P_MessageBox_text:{ HbTextItem *rti = new HbTextItem(parent); return rti; } @@ -969,12 +1158,14 @@ case P_InputDialog_text: { HbTextItem *n = new HbTextItem(parent); + n->setTextWrapping(Hb::TextWordWrap); HbStyle::setItemName(n, QLatin1String("label-1")); return n; } case P_InputDialog_additionaltext: { HbTextItem *n = new HbTextItem(parent); + n->setTextWrapping(Hb::TextWordWrap); HbStyle::setItemName(n, QLatin1String("label-2")); return n; } @@ -1309,7 +1500,7 @@ if (mode == QIcon::Disabled ) { frameGraphicsName = QLatin1String("qtg_fr_list_disabled"); } else { - frameGraphicsName = QLatin1String("qtg_fr_list_parent_normal"); + frameGraphicsName = QLatin1String("qtg_fr_list_normal"); } frameItem->frameDrawer().setFrameGraphicsName(frameGraphicsName); frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces); @@ -2448,13 +2639,7 @@ case P_MessageBox_text: //deprecated if (const HbStyleOptionMessageBox *opt = static_cast(option)) { HbTextItem *textItem = static_cast(item); - textItem->setAlignment(opt->textAlignment); - - if (opt->textWrapping) { - textItem->setTextWrapping(Hb::TextWrapAnywhere); - } else { - textItem->setTextWrapping(Hb::TextNoWrap); - } + textItem->setTextWrapping(Hb::TextWordWrap); textItem->setText(opt->text); } break; @@ -2717,7 +2902,6 @@ frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progslider_frame_normal")); } } - frameItem->frameDrawer().setFillWholeRect(true); //frameItem->update(); } break; @@ -2732,7 +2916,6 @@ else { frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progslider_loaded")); } - frameItem->frameDrawer().setFillWholeRect(true); frameItem->setMaximum(opt->maximum); frameItem->setMinimum(opt->minimum); frameItem->setValue(opt->progressValue); @@ -2800,14 +2983,12 @@ } else { - if(opt->pressedState) { - - repeatItem->setName(QLatin1String("qtg_graf_ratingslider_unrated_pressed")); - } - else { - - repeatItem->setName(QLatin1String("qtg_graf_ratingslider_unrated")); - } + if(opt->pressedState) { + repeatItem->setName(QLatin1String("qtg_graf_ratingslider_unrated_pressed")); + } + else { + repeatItem->setName(QLatin1String("qtg_graf_ratingslider_unrated")); + } } } repeatItem->setGeometry(opt->boundingRect); @@ -2833,14 +3014,12 @@ } else { - - if(opt->pressedState) { - - repeatItem->setName(QLatin1String("qtg_graf_ratingslider_rated_pressed")); - } - else { - repeatItem->setName(QLatin1String("qtg_graf_ratingslider_rated")); - } + if(opt->pressedState) { + repeatItem->setName(QLatin1String("qtg_graf_ratingslider_rated_pressed")); + } + else { + repeatItem->setName(QLatin1String("qtg_graf_ratingslider_rated")); + } } } repeatItem->setGeometry(opt->boundingRect); @@ -3115,7 +3294,6 @@ if(!item) { return; } - textItem->setTextWrapping(Hb::TextWrapAnywhere); textItem->setText(opt->text); } break; @@ -3126,7 +3304,6 @@ if(!item) { return; } - textItem->setTextWrapping(Hb::TextWrapAnywhere); textItem->setText(opt->additionalText); } break; @@ -4172,4 +4349,5 @@ return HbWidgetBasePrivate::d_ptr(widgetBase); } + #include "moc_hbstyle.cpp" diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstyle.h --- a/src/hbcore/style/hbstyle.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/style/hbstyle.h Thu Sep 02 20:44:51 2010 +0300 @@ -38,7 +38,8 @@ class HbStyleOption; class HbWidgetBase; class HbWidget; -class HbStyleParameters; +class HbStylePrimitiveData; + class HB_CORE_EXPORT HbStyle:public QObject { @@ -53,9 +54,19 @@ P_CustomBase = 0x0f000000 }; + enum PrimitiveType { + PT_TextItem = 1, + PT_RichTextItem = 2, + PT_FrameItem = 3, + PT_IconItem = 4, + PT_MarqueeItem = 5, + PT_TouchArea = 6, + PT_ReservedValue = 0xffff + + }; - virtual QGraphicsItem *createPrimitive( HbStyle::Primitive primitive, QGraphicsItem *parent = 0 ) const; - virtual void updatePrimitive( QGraphicsItem *item, HbStyle::Primitive primitive, const QStyleOption *option ) const; + virtual QGraphicsObject *createPrimitive(HbStyle::PrimitiveType primitiveType, const QString &itemName, QGraphicsObject *parent = 0) const; + virtual bool updatePrimitive(QGraphicsObject *primitive, const HbStylePrimitiveData *data, QGraphicsObject *parent = 0) const; static void setItemName( QGraphicsItem *item, const QString &name ); static QString itemName( const QGraphicsItem *item ); @@ -86,3 +97,4 @@ #endif // HBSTYLE_H + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstyle_p.h --- a/src/hbcore/style/hbstyle_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/style/hbstyle_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -46,12 +46,10 @@ class HbWidget; class HbWidgetBasePrivate; +static const int ItemName = 0xfffe; class HbAnchor; - - - class HB_CORE_PRIVATE_EXPORT HbStylePrivate { Q_DECLARE_PUBLIC( HbStyle ) @@ -247,7 +245,7 @@ void polishItem( const HbVector &styleRules, HbWidget *widget, - QGraphicsItem *item, + QGraphicsItem *item, const QString &name, HbDeviceProfile &profile, bool layoutDefined) const; @@ -258,7 +256,7 @@ HbDeviceProfile &profile) const; void updateThemedItems( const HbVector &styleRules, - QGraphicsItem *item, + QGraphicsItem *item, HbDeviceProfile &profile) const; void clearStyleSheetCaches(); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstyleframeprimitivedata.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/style/hbstyleframeprimitivedata.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,44 @@ +/**************************************************************************** +** +** 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 + + +/*! + @beta + @hbcore + \class HbStyleFramePrimitiveData + \brief Class to carry data needed by frame items from the widget to the style. + + \sa HbStylePrimitiveData + \sa HbStyle::updatePrimitive() + +*/ +HbStyleFramePrimitiveData::HbStyleFramePrimitiveData() : HbStylePrimitiveData(SPD_Frame) +{ + type = Type; + version = Version; +} + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstyleframeprimitivedata.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/style/hbstyleframeprimitivedata.h Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** 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 HBSTYLEFRAMEPRIMITIVEDATA_H +#define HBSTYLEFRAMEPRIMITIVEDATA_H + +#include +#include +#include +#include +#include + +class HB_CORE_EXPORT HbStyleFramePrimitiveData : public HbStylePrimitiveData +{ +public: + HbStyleFramePrimitiveData(); + + enum PrimitiveDataType { Type = SPD_Frame }; + enum PrimitiveDataVersion { Version = 1 }; + + HbStyleValue frameGraphicsName; + HbStyleValue frameType; + HbStyleValue borderWidthLeft; + HbStyleValue borderWidthTop; + HbStyleValue borderWidthRight; + HbStyleValue borderWidthBottom; + HbStyleValue fillWholeRect; + HbStyleValue mirroringMode; + HbStyleValue fileNameSuffixList; + HbStyleValue pixmapMask; + HbStyleValue bitmapMask; + HbStyleValue clipPath; +}; + +#endif // HBSTYLEFRAMEPRIMITIVEDATA_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstyleiconprimitivedata.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/style/hbstyleiconprimitivedata.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,44 @@ +/**************************************************************************** +** +** 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 + + +/*! + @beta + @hbcore + \class HbStyleIconPrimitiveData + \brief Class to carry data needed by icon items from the widget to the style. + + \sa HbStylePrimitiveData + \sa HbStyle::updatePrimitive() + +*/ +HbStyleIconPrimitiveData::HbStyleIconPrimitiveData() : HbStylePrimitiveData(SPD_Icon) +{ + type = Type; + version = Version; +} + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstyleiconprimitivedata.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/style/hbstyleiconprimitivedata.h Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** 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 HBSTYLEICONPRIMITIVEDATA_H +#define HBSTYLEICONPRIMITIVEDATA_H + +#include +#include +#include + +class HB_CORE_EXPORT HbStyleIconPrimitiveData : public HbStylePrimitiveData +{ +public: + HbStyleIconPrimitiveData(); + + enum PrimitiveDataType { Type = SPD_Icon }; + enum PrimitiveDataVersion { Version = 1 }; + + HbStyleValue icon; + HbStyleValue size; + HbStyleValue aspectRatioMode; + HbStyleValue alignment; + HbStyleValue iconMode; + HbStyleValue iconState; + HbStyleValue iconName; + HbStyleValue iconFlags; + HbStyleValue mirroringMode; + HbStyleValue brush; + HbStyleValue color; +}; + +#endif // HBSTYLEICONPRIMITIVEDATA diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstyleinterface_p.h --- a/src/hbcore/style/hbstyleinterface_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/style/hbstyleinterface_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -40,7 +40,7 @@ virtual int primitiveCount() const = 0; virtual QGraphicsItem *createPrimitive( HbStyle::Primitive primitive, QGraphicsItem *parent = 0 ) const = 0; virtual void updatePrimitive( QGraphicsItem *item, HbStyle::Primitive primitive, const QStyleOption *option ) const = 0; - virtual QString layoutPath() const = 0; + virtual QString layoutPath() const = 0; void deprecated(); }; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstylemarqueeprimitivedata.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/style/hbstylemarqueeprimitivedata.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,42 @@ +/**************************************************************************** +** +** 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 + +/*! + @beta + @hbcore + \class HbStyleMarqueePrimitiveData + \brief Class to carry data needed by marquee items from the widget to the style. + + \sa HbStylePrimitiveData + \sa HbStyle::updatePrimitive() + +*/ +HbStyleMarqueePrimitiveData::HbStyleMarqueePrimitiveData() : HbStylePrimitiveData(SPD_Marquee) +{ + type = Type; + version = Version; +} diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstylemarqueeprimitivedata.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/style/hbstylemarqueeprimitivedata.h Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,46 @@ +/**************************************************************************** +** +** 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 HBSTYLEMARQUEEPRIMITIVEDATA_H +#define HBSTYLEMARQUEEPRIMITIVEDATA_H + +#include + +class HB_CORE_EXPORT HbStyleMarqueePrimitiveData : public HbStylePrimitiveData +{ +public: + HbStyleMarqueePrimitiveData(); + + enum PrimitiveDataType { Type = SPD_Marquee }; + enum PrimitiveDataVersion { Version = 1 }; + + HbStyleValue text; + HbStyleValue textColor; + // true - starts animation, false - stops animation + HbStyleValue animation; + HbStyleValue loopCount; +}; + +#endif // HBSTYLEMARQUEEPRIMITIVEDATA_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstyleoptionbatteryindicator.cpp --- a/src/hbcore/style/hbstyleoptionbatteryindicator.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/style/hbstyleoptionbatteryindicator.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -26,7 +26,7 @@ #include "hbstyleoptionbatteryindicator_p.h" /* - + \class HbStyleOptionBatteryIndicator \brief HbStyleOptionBatteryIndicator has the style component for battery indicator */ diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstyleoptionprogressslider.cpp --- a/src/hbcore/style/hbstyleoptionprogressslider.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/style/hbstyleoptionprogressslider.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -34,8 +34,8 @@ { type = Type; version = Version; - pressedState = false; - disableState = false; + pressedState = false; + disableState = false; } HbStyleOptionProgressSlider::HbStyleOptionProgressSlider(const HbStyleOptionProgressSlider &other) : diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstyleoptionratingslider.cpp --- a/src/hbcore/style/hbstyleoptionratingslider.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/style/hbstyleoptionratingslider.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -48,7 +48,7 @@ unRatedGraphicsName(other.unRatedGraphicsName), ratedGraphicsName(other.ratedGraphicsName), disableState(false), - pressedState(false) + pressedState(false) { type = Type; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstyleoptionratingslider_p.h --- a/src/hbcore/style/hbstyleoptionratingslider_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/style/hbstyleoptionratingslider_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -32,21 +32,21 @@ class HB_CORE_PRIVATE_EXPORT HbStyleOptionRatingSlider : public HbStyleOption { public: - HbStyleOptionRatingSlider(); - HbStyleOptionRatingSlider(const HbStyleOptionRatingSlider &other); - ~HbStyleOptionRatingSlider(); + HbStyleOptionRatingSlider(); + HbStyleOptionRatingSlider(const HbStyleOptionRatingSlider &other); + ~HbStyleOptionRatingSlider(); public: enum StyleOptionType { Type = HbSO_RatingSlider }; enum StyleOptionVersion { Version = 1 }; - int progressValue; - bool inverted; - int noOfIntervals; - int noOfStars; - QString unRatedGraphicsName; - QString ratedGraphicsName; + int progressValue; + bool inverted; + int noOfIntervals; + int noOfStars; + QString unRatedGraphicsName; + QString ratedGraphicsName; bool disableState; - bool pressedState; + bool pressedState; }; #endif diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstyleoptiontoolbutton_p.h --- a/src/hbcore/style/hbstyleoptiontoolbutton_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/style/hbstyleoptiontoolbutton_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -26,6 +26,7 @@ #ifndef HBSTYLEOPTIONTOOLBUTTON_H #define HBSTYLEOPTIONTOOLBUTTON_H + #include #include diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstyleprimitivedata.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/style/hbstyleprimitivedata.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** 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 + + +/*! + @beta + @hbcore + \class HbStylePrimitiveData + \brief Base class for primitive data classes which are used for carrying + state information needed by the primitives from widget to style. HbStylePrimitiveData is given + as a parameter to HbStyle::updatePrimitive() method. Primitive data classed are meant to be used as + value classes so before calling updatePrimitive() assign the needed attributes and pass the primitive + data to the style. Style will use the HbStyleValue's isSet() method to determine whether a call to primitive + API is needed or not. + + + \sa HbStyleTextPrimitiveData + \sa HbStyleFramePrimitiveData + \sa HbStyleIconPrimitiveData + \sa HbStyleRichTextPrimitiveData + \sa HbStyleMarqueePrimitiveData + \sa HbStyleTouchAreaPrimitiveData + \sa HbStyle::updatePrimitive() +*/ +HbStylePrimitiveData::HbStylePrimitiveData(int type, int version) +{ + this->type = type; + this->version = version; +} + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstyleprimitivedata.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/style/hbstyleprimitivedata.h Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,79 @@ +/**************************************************************************** +** +** 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 HBSTYLEPRIMITIVEDATA_H +#define HBSTYLEPRIMITIVEDATA_H + +#include +#include +#include + +class HB_CORE_EXPORT HbStylePrimitiveData +{ +public: + + enum DataType { + SPD_Base = 0, + SPD_Text = 1, + SPD_RichText = 2, + SPD_Frame = 3, + SPD_Icon = 4, + SPD_Marquee = 5, + SPD_TouchArea = 6, + }; + + enum PrimitiveDataType { Type = SPD_Base }; + enum PrimitiveDataVersion { Version = 1 }; + + HbStylePrimitiveData(int type = SPD_Base, int version = 1); + + QStyle::State state; + int version; + int type; +}; + + + +template +T hbstyleprimitivedata_cast(const HbStylePrimitiveData *data) +{ + // data must be valid, version must be the same or greater, and the type must match + if (data && data->version >= static_cast(0)->Version && + (data->type == static_cast(0)->Type)) + return static_cast(data); + return 0; +} + +template +T hbstyleprimitivedata_cast(HbStylePrimitiveData *data) +{ + if (data && data->version >= static_cast(0)->Version && + (data->type == static_cast(0)->Type)) + return static_cast(data); + return 0; +} + + +#endif // HBSTYLEPRIMITIVEDATA_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstylerichtextprimitivedata.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/style/hbstylerichtextprimitivedata.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,46 @@ +/**************************************************************************** +** +** 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 + + +/*! + @beta + @hbcore + \class HbStyleRichTextPrimitiveData + \brief Class to carry data needed by rich text items from the widget to the style. + + \sa HbStylePrimitiveData + \sa HbStyle::updatePrimitive() + +*/ +HbStyleRichTextPrimitiveData::HbStyleRichTextPrimitiveData() : HbStylePrimitiveData(SPD_RichText) +{ + type = Type; + version = Version; +} + + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstylerichtextprimitivedata.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/style/hbstylerichtextprimitivedata.h Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,49 @@ +/**************************************************************************** +** +** 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 HBSTYLERICHTEXTPRIMITIVEDATA_H +#define HBSTYLERICHTEXTPRIMITIVEDATA_H + +#include +#include + +class HB_CORE_EXPORT HbStyleRichTextPrimitiveData : public HbStylePrimitiveData +{ +public: + HbStyleRichTextPrimitiveData(); + + enum PrimitiveDataType { Type = SPD_RichText }; + enum PrimitiveDataVersion { Version = 1 }; + + HbStyleValue text; + HbStyleValue defaultColor; + HbStyleValue alignment; + HbStyleValue textWrappingMode; + HbStyleValue isTextVisible; + HbStyleValue clipping; + HbStyleValue geometry; +}; + +#endif // HBSTYLETEXTPRIMITIVEDATA_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstyletextprimitivedata.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/style/hbstyletextprimitivedata.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,44 @@ +/**************************************************************************** +** +** 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 + +/*! + @beta + @hbcore + \class HbStyleTextPrimitiveData + \brief Class to carry data needed by a text item from the widget to the style. + + \sa HbStylePrimitiveData + \sa HbStyle::updatePrimitive() + +*/ +HbStyleTextPrimitiveData::HbStyleTextPrimitiveData() : HbStylePrimitiveData(SPD_Text) +{ + type = Type; + version = Version; +} + + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstyletextprimitivedata.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/style/hbstyletextprimitivedata.h Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,53 @@ +/**************************************************************************** +** +** 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 HBSTYLETEXTPRIMITIVEDATA_H +#define HBSTYLETEXTPRIMITIVEDATA_H + +#include +#include + + +class HB_CORE_EXPORT HbStyleTextPrimitiveData : public HbStylePrimitiveData +{ +public: + HbStyleTextPrimitiveData(); + + enum PrimitiveDataType { Type = SPD_Text }; + enum PrimitiveDataVersion { Version = 1 }; + + HbStyleValue text; + HbStyleValue textColor; + HbStyleValue alignment; + HbStyleValue elideMode; + HbStyleValue textWrapping; + HbStyleValue isTextVisible; + HbStyleValue isTextClip; + HbStyleValue geometry; + HbStyleValue fadeLength; + HbStyleValue fadeLengths; +}; + +#endif // HBSTYLETEXTPRIMITIVEDATA_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstyletouchareaprimitivedata.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/style/hbstyletouchareaprimitivedata.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,42 @@ +/**************************************************************************** +** +** 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 + +/*! + @beta + @hbcore + \class HbStyleTouchAreaPrimitiveData + \brief Class to carry data needed by touch areas from the widget to the style. + + \sa HbStylePrimitiveData + \sa HbStyle::updatePrimitive() + +*/ +HbStyleTouchAreaPrimitiveData::HbStyleTouchAreaPrimitiveData() : HbStylePrimitiveData(SPD_TouchArea) +{ + type = Type; + version = Version; +} diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstyletouchareaprimitivedata.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/style/hbstyletouchareaprimitivedata.h Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,43 @@ +/**************************************************************************** +** +** 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 HBSTYLETOUCHAREAPRIMITIVEDATA_H +#define HBSTYLETOUCHAREAPRIMITIVEDATA_H + +#include + +class HB_CORE_EXPORT HbStyleTouchAreaPrimitiveData : public HbStylePrimitiveData +{ +public: + HbStyleTouchAreaPrimitiveData(); + + enum PrimitiveDataType { Type = SPD_TouchArea }; + enum PrimitiveDataVersion { Version = 1 }; + + HbStyleValue size; + HbStyleValue geometry; +}; + +#endif // HBSTYLETEXTPRIMITIVEDATA_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/hbstylevalue.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/style/hbstylevalue.h Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,84 @@ +/**************************************************************************** +** +** 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 HBSTYLEVALUE_H +#define HBSTYLEVALUE_H + + +template +class HbStyleValue +{ +public: + HbStyleValue(); + ~HbStyleValue(); + + bool isSet() const; + T value() const; + operator T() const; + void operator=(const T &value); + +private: + bool mSet; + T mVal; +}; + +template +HbStyleValue::HbStyleValue() : mSet(false) +{ +} + +template +HbStyleValue::~HbStyleValue() +{ +} + +template +bool HbStyleValue::isSet() const +{ + return mSet; +} + +template +T HbStyleValue::value() const +{ + Q_ASSERT(mSet); + return mVal; +} + +template +HbStyleValue::operator T() const +{ + Q_ASSERT(mSet); + return mVal; +} + +template +void HbStyleValue::operator=(const T &value) +{ + mVal = value; + mSet = true; +} + +#endif // HBSTYLEVALUE_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/style/style.pri --- a/src/hbcore/style/style.pri Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/style/style.pri Thu Sep 02 20:44:51 2010 +0300 @@ -29,6 +29,16 @@ PUBLIC_HEADERS += $$PWD/hbstyle.h PUBLIC_HEADERS += $$PWD/hbstyleparameters.h +PUBLIC_HEADERS += $$PWD/hbstyleprimitivedata.h +PUBLIC_HEADERS += $$PWD/hbstyleiconprimitivedata.h +PUBLIC_HEADERS += $$PWD/hbstyleframeprimitivedata.h +PUBLIC_HEADERS += $$PWD/hbstyletextprimitivedata.h +PUBLIC_HEADERS += $$PWD/hbstylerichtextprimitivedata.h +PUBLIC_HEADERS += $$PWD/hbstylemarqueeprimitivedata.h +PUBLIC_HEADERS += $$PWD/hbstyletouchareaprimitivedata.h +PUBLIC_HEADERS += $$PWD/hbstylevalue.h + + PRIVATE_HEADERS += $$PWD/hbstyleoption_p.h PRIVATE_HEADERS += $$PWD/hbstyleoptionabstractviewitem_p.h PRIVATE_HEADERS += $$PWD/hbstyleoptioncheckbox_p.h @@ -108,5 +118,13 @@ SOURCES += $$PWD/hbstyleoptiongroupbox.cpp SOURCES += $$PWD/hbstyleoptioncombobox.cpp SOURCES += $$PWD/hbstyleoptioninputdialog.cpp +SOURCES += $$PWD/hbstyleprimitivedata.cpp +SOURCES += $$PWD/hbstyleiconprimitivedata.cpp +SOURCES += $$PWD/hbstyleframeprimitivedata.cpp +SOURCES += $$PWD/hbstyletextprimitivedata.cpp +SOURCES += $$PWD/hbstylerichtextprimitivedata.cpp +SOURCES += $$PWD/hbstylemarqueeprimitivedata.cpp +SOURCES += $$PWD/hbstyletouchareaprimitivedata.cpp + diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/svgext/hbnvgdecoder/hbnvgcsicon_p.h --- a/src/hbcore/svgext/hbnvgdecoder/hbnvgcsicon_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgcsicon_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -74,7 +74,7 @@ HbNvgEngine::HbNvgErrorType draw(const QSize &size) { - // TODO @ Deprecated, remove from base class + // TODO @ Deprecated, remove from base class Q_UNUSED(size); return HbNvgEngine::NvgErrNone; } @@ -98,7 +98,7 @@ void create(const QByteArray &buffer, const QSize& targetSize) { - // TODO @ Deprecated, remove from base class + // TODO @ Deprecated, remove from base class Q_UNUSED(buffer); Q_UNUSED(targetSize); } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/svgext/hbnvgdecoder/hbnvgexception_p.h --- a/src/hbcore/svgext/hbnvgdecoder/hbnvgexception_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgexception_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -35,7 +35,7 @@ : errID(id) {} qint32 errorID() const - { + { return errID; } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/theme/hbtheme.cpp --- a/src/hbcore/theme/hbtheme.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/theme/hbtheme.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -189,6 +189,11 @@ */ void HbThemePrivate::updateTheme(const QStringList &updatedFiles) { +#ifndef Q_OS_SYMBIAN + // Reload themeindex files + HbThemeUtils::loadHeapThemeIndexes(); +#endif + // Reload effects HbEffectInternal::reloadFxmlFiles(); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/theme/hbthemeclient_p.cpp --- a/src/hbcore/theme/hbthemeclient_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/theme/hbthemeclient_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -59,47 +59,48 @@ * * Returns HbIconInfo structure to the clients. This basically contains information about the shared * icon resources on server's shared memory - * - * \a iconPath - * \a size - * \a aspectRatioMode - * \a mode - * \a mirrored - * \a options - * \a color - * + */ +HbSharedIconInfo HbThemeClient::getSharedIconInfo(const IconReqInfo &reqInfo) +{ +#ifdef Q_OS_SYMBIAN + Q_D(HbThemeClient); + return d->getSharedIconInfo(reqInfo); +#else + Q_UNUSED(reqInfo); + return HbSharedIconInfo(); +#endif +} +/** + Asynchronous version. */ -HbSharedIconInfo HbThemeClient::getSharedIconInfo(const QString& iconPath , - const QSizeF &size, - Qt::AspectRatioMode aspectRatioMode, - QIcon::Mode mode, - bool mirrored, - HbIconLoader::IconLoaderOptions options, - const QColor &color, - HbRenderingMode renderMode) +void HbThemeClient::getSharedIconInfo(const IconReqInfo &reqInfo, + HbAsyncIconInfoCallback callback, + void *callbackParam) { #ifdef Q_OS_SYMBIAN Q_D(HbThemeClient); - return d->getSharedIconInfo(iconPath, - size, - aspectRatioMode, - mode, - mirrored, - options, - color, - renderMode); + d->getSharedIconInfo(reqInfo, callback, callbackParam); #else - Q_UNUSED(iconPath); - Q_UNUSED(size); - Q_UNUSED(aspectRatioMode); - Q_UNUSED(mode); - Q_UNUSED(mirrored); - Q_UNUSED(options); - Q_UNUSED(color); - Q_UNUSED(renderMode); + Q_UNUSED(reqInfo); + Q_UNUSED(callback); + Q_UNUSED(callbackParam); +#endif +} - return HbSharedIconInfo(); +/** + Cancels one or more previous async requests. All requests using the + same callback are canceled. + */ +void HbThemeClient::cancelGetSharedIconInfo(HbAsyncIconInfoCallback callback, + void *callbackParam) +{ +#ifdef Q_OS_SYMBIAN + Q_D(HbThemeClient); + d->cancelGetSharedIconInfo(callback, callbackParam); +#else + Q_UNUSED(callback); + Q_UNUSED(callbackParam); #endif } @@ -111,15 +112,16 @@ QByteArray HbThemeClient::getSharedBlob(const QString &name) { #ifdef Q_OS_SYMBIAN - HbSharedIconInfo info = getSharedIconInfo( - name, - QSizeF(), - Qt::KeepAspectRatio, - QIcon::Normal, - false, - HbIconLoader::NoOptions, - QColor(), - ESWRendering); + IconReqInfo reqInfo; + reqInfo.iconPath = name; + reqInfo.size = QSizeF(); + reqInfo.aspectRatioMode = Qt::KeepAspectRatio; + reqInfo.mode = QIcon::Normal; + reqInfo.mirrored = false; + reqInfo.options = HbIconLoader::NoOptions; + reqInfo.color = QColor(); + reqInfo.renderMode = ESWRendering; + HbSharedIconInfo info = getSharedIconInfo(reqInfo); return info.type == BLOB ? QByteArray::fromRawData(HbMemoryUtils::getAddress( HbMemoryManager::SharedMemory, @@ -344,41 +346,27 @@ /** * HbThemeClient::unloadIcon() - * - * \a iconPath - * \a size - * \a aspectRatioMode - * \a mode - * \a mirrored - * \a options - * \a color - */ -void HbThemeClient::unloadIcon(const QString& iconPath , - const QSizeF &size, - Qt::AspectRatioMode aspectRatioMode, - QIcon::Mode mode, - bool mirrored, - const QColor &color, - HbRenderingMode renderMode) +void HbThemeClient::unloadIcon(const IconReqInfo &reqInfo) { #ifdef Q_OS_SYMBIAN Q_D(HbThemeClient); - return d->unloadIcon(iconPath, - size, - aspectRatioMode, - mode, - mirrored, - color, - renderMode); + return d->unloadIcon(reqInfo); #else - Q_UNUSED(iconPath); - Q_UNUSED(size); - Q_UNUSED(aspectRatioMode); - Q_UNUSED(mode); - Q_UNUSED(mirrored); - Q_UNUSED(color); - Q_UNUSED(renderMode); + Q_UNUSED(reqInfo); +#endif +} + +/** + * HbThemeClient::batchUnloadIcon() + */ +void HbThemeClient::batchUnloadIcon(const QVector &reqInfos) +{ +#ifdef Q_OS_SYMBIAN + Q_D(HbThemeClient); + return d->batchUnloadIcon(reqInfos); +#else + Q_UNUSED(reqInfos); #endif } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/theme/hbthemeclient_p.h --- a/src/hbcore/theme/hbthemeclient_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/theme/hbthemeclient_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -45,14 +45,25 @@ public: bool connectToServer(); - HbSharedIconInfo getSharedIconInfo(const QString &iconPath, - const QSizeF &size, - Qt::AspectRatioMode aspectRatioMode, - QIcon::Mode mode, - bool mirrored, - HbIconLoader::IconLoaderOptions options, - const QColor &color, - HbRenderingMode renderMode ); + struct IconReqInfo { + QString iconPath; + QSizeF size; + Qt::AspectRatioMode aspectRatioMode; + QIcon::Mode mode; + bool mirrored; + HbIconLoader::IconLoaderOptions options; + QColor color; + HbRenderingMode renderMode; + }; + + HbSharedIconInfo getSharedIconInfo(const IconReqInfo &reqInfo); + + void getSharedIconInfo(const IconReqInfo &reqInfo, + HbAsyncIconInfoCallback callback, + void *callbackParam = 0); + + void cancelGetSharedIconInfo(HbAsyncIconInfoCallback callback, + void *callbackParam); QByteArray getSharedBlob(const QString &name); @@ -76,40 +87,36 @@ void notifyForegroundLostToServer(); - void unloadIcon(const QString &iconPath, - const QSizeF &size, - Qt::AspectRatioMode aspectRatioMode, - QIcon::Mode mode, - bool mirrored, - const QColor &color, - HbRenderingMode renderMode); + void unloadIcon(const IconReqInfo &reqInfo); - void unLoadMultiIcon(const QStringList &iconPathList, - const QVector &sizeList, - Qt::AspectRatioMode aspectRatioMode, - QIcon::Mode mode, - bool mirrored, - const QColor &color, - HbRenderingMode renderMode); + void batchUnloadIcon(const QVector &reqInfos); HbSharedIconInfo getMultiPartIconInfo(const QStringList &multiPartIconList, - const HbMultiPartSizeData &multiPartIconData, - const QSizeF &size, - Qt::AspectRatioMode aspectRatioMode, - QIcon::Mode mode, - bool mirrored, - HbIconLoader::IconLoaderOptions options, - const QColor &color, - HbRenderingMode renderMode); + const HbMultiPartSizeData &multiPartIconData, + const QSizeF &size, + Qt::AspectRatioMode aspectRatioMode, + QIcon::Mode mode, + bool mirrored, + HbIconLoader::IconLoaderOptions options, + const QColor &color, + HbRenderingMode renderMode); HbSharedIconInfoList getMultiIconInfo(const QStringList &multiPartIconList, - const QVector &sizeList, - Qt::AspectRatioMode aspectRatioMode, - QIcon::Mode mode, - bool mirrored, - HbIconLoader::IconLoaderOptions options, - const QColor &color, - HbRenderingMode renderMode); + const QVector &sizeList, + Qt::AspectRatioMode aspectRatioMode, + QIcon::Mode mode, + bool mirrored, + HbIconLoader::IconLoaderOptions options, + const QColor &color, + HbRenderingMode renderMode); + + void unLoadMultiIcon(const QStringList &iconPathList, + const QVector &sizeList, + Qt::AspectRatioMode aspectRatioMode, + QIcon::Mode mode, + bool mirrored, + const QColor &color, + HbRenderingMode renderMode); bool switchRenderingMode(HbRenderingMode renderMode); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/theme/hbthemeclient_p_p.h --- a/src/hbcore/theme/hbthemeclient_p_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/theme/hbthemeclient_p_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -27,7 +27,9 @@ #define HBTHEMECLIENT_P_P_H #include +#include #include "hbthemecommon_p.h" +#include "hbthemeclient_p.h" #include "hbiconloader_p.h" #include "hbwidgetloader_p.h" #include "hblayeredstyleloader_p.h" @@ -39,14 +41,17 @@ #ifdef HB_SGIMAGE_ICON #include #endif - #include -#endif +#endif // Q_OS_SYMBIAN +QT_BEGIN_NAMESPACE class QFileSystemWatcher; +class QSizeF; +QT_END_NAMESPACE + class CHbThemeListenerPrivate; -class QSizeF; class HbEffectFxmlData; +class QueueEntry; class HB_AUTOTEST_EXPORT HbThemeClientPrivate : #ifdef Q_OS_SYMBIAN @@ -66,14 +71,14 @@ #ifdef Q_OS_SYMBIAN bool connectToServer(); - HbSharedIconInfo getSharedIconInfo(const QString& iconPath , - const QSizeF &size, - Qt::AspectRatioMode aspectRatioMode, - QIcon::Mode mode, - bool mirrored, - HbIconLoader::IconLoaderOptions options, - const QColor &color, - HbRenderingMode renderMode); + HbSharedIconInfo getSharedIconInfo(const HbThemeClient::IconReqInfo &reqInfo); + + void getSharedIconInfo(const HbThemeClient::IconReqInfo &reqInfo, + HbAsyncIconInfoCallback callback, + void *callbackParam); + + void cancelGetSharedIconInfo(HbAsyncIconInfoCallback callback, + void *callbackParam); HbWidgetLoader::LayoutDefinition *getSharedLayoutDefs(const QString &fileName, const QString &layout, @@ -94,40 +99,38 @@ bool addSharedEffect(const QString& filePath); - void unloadIcon(const QString& iconPath , - const QSizeF &size, - Qt::AspectRatioMode aspectRatioMode, - QIcon::Mode mode, - bool mirrored, - const QColor &color, - HbRenderingMode renderMode); + void unloadIcon(const HbThemeClient::IconReqInfo &reqInfo); + + void batchUnloadIcon(const QVector &reqInfos); + + HbSharedIconInfo getMultiPartIconInfo(const QStringList &multiPartIconList, + const HbMultiPartSizeData &multiPartIconData, + const QSizeF &size, + Qt::AspectRatioMode aspectRatioMode, + QIcon::Mode mode, + bool mirrored, + HbIconLoader::IconLoaderOptions options, + const QColor &color, + HbRenderingMode renderMode); + + HbSharedIconInfoList getMultiIconInfo(const QStringList &multiPartIconList, + const QVector &sizeList , + Qt::AspectRatioMode aspectRatioMode, + QIcon::Mode mode, + bool mirrored, + HbIconLoader::IconLoaderOptions options, + const QColor &color, + HbRenderingMode renderMode); void unLoadMultiIcon(const QStringList& iconPathList, - const QVector &sizeList, - Qt::AspectRatioMode aspectRatioMode, - QIcon::Mode mode, - bool mirrored, - const QColor &color, - HbRenderingMode renderMode); - HbSharedIconInfo getMultiPartIconInfo(const QStringList &multiPartIconList, - const HbMultiPartSizeData &multiPartIconData, - const QSizeF &size, - Qt::AspectRatioMode aspectRatioMode, - QIcon::Mode mode, - bool mirrored, - HbIconLoader::IconLoaderOptions options, - const QColor &color, - HbRenderingMode renderMode); + const QVector &sizeList, + Qt::AspectRatioMode aspectRatioMode, + QIcon::Mode mode, + bool mirrored, + const QColor &color, + HbRenderingMode renderMode); - HbSharedIconInfoList getMultiIconInfo(const QStringList &multiPartIconList, - const QVector &sizeList , - Qt::AspectRatioMode aspectRatioMode, - QIcon::Mode mode, - bool mirrored, - HbIconLoader::IconLoaderOptions options, - const QColor &color, - HbRenderingMode renderMode); - + void scheduleQueueCheck(); void notifyForegroundLostToServer(); bool switchRenderingMode(HbRenderingMode renderMode); int freeSharedMemory(); @@ -137,41 +140,41 @@ void createMemoryReport() const; #endif -private: - void handleThemeChange(const QString &themeName); - -#endif // Q_OS_SYMBIAN - -public: - void setTheme(const QString &theme); - - ~HbThemeClientPrivate(); + CHbThemeListenerPrivate *themelistener; -#ifdef Q_OS_SYMBIAN -private: - TVersion Version() const; - TInt StartServer(); - TInt CreateServerProcess(); + CIdle *queueCheckInvoker; + typedef QQueue QueueType; + QueueType reqQueue; -private: - CHbThemeListenerPrivate *themelistener; - friend class CHbThemeListenerPrivate; #ifdef HB_SGIMAGE_ICON RSgDriver sgDriver; bool sgDriverInit; #endif +private: + TVersion Version() const; + TInt StartServer(); + TInt CreateServerProcess(); + void handleThemeChange(const QString &themeName); + #else + QFileSystemWatcher *iniFileWatcher; + public slots: void iniFileChanged(QString iniFile); -private: - QFileSystemWatcher *iniFileWatcher; #endif // Q_OS_SYMBIAN public: bool clientConnected; + + void setTheme(const QString &theme); + + ~HbThemeClientPrivate(); + + friend class QueueEntry; + friend class CHbThemeListenerPrivate; }; #endif // HBTHEMECLIENT_P_P_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/theme/hbthemeclient_symbian_p.cpp --- a/src/hbcore/theme/hbthemeclient_symbian_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/theme/hbthemeclient_symbian_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -43,14 +43,15 @@ HbThemeClientPrivate::HbThemeClientPrivate(): clientConnected(false) { - if(THEME_SERVER_NAME != HbMemoryUtils::getCleanAppName()) { + if (THEME_SERVER_NAME != HbMemoryUtils::getCleanAppName()) { themelistener = new CHbThemeListenerPrivate(this); } - #ifdef HB_SGIMAGE_ICON sgDriverInit = false; #endif + + queueCheckInvoker = CIdle::New(CActive::EPriorityLow); // important to set the proper prio here } /** @@ -80,7 +81,7 @@ #ifdef HB_SGIMAGE_ICON if (!error && !sgDriverInit) { error = sgDriver.Open(); - if (error == KErrNone) { + if (error == KErrNone) { sgDriverInit = true; } } @@ -102,49 +103,220 @@ KThemeServerBuildVersionNumber)); } +class QueueEntry : public CActive +{ +public: + QueueEntry(HbThemeClientPrivate *tc); + ~QueueEntry(); + + void DoCancel(); + void RunL(); + + void init(const HbThemeClient::IconReqInfo &reqInfo, + HbAsyncIconInfoCallback callback, + void *callbackParam); + + void issueRequest(); + + HbThemeClientPrivate *mTc; + TPckg *mInfoPckg; + TPckg *mParamsPckg; + void *mCallbackParam; + HbAsyncIconInfoCallback mCallback; + HbSharedIconInfo mInfo; + TIconParams mParams; + TFileName mIconPathBuf; +}; + +// Never call this directly, use scheduleQueueCheck() to have it +// invoked asynchronously when there is nothing better to do. +static TInt checkQueue(TAny *param) +{ + HbThemeClientPrivate *tc = static_cast(param); + // Only one request can be sent a time. The themeserver is single-threaded + // and has no special async support so it blocks anyway. + if (tc->reqQueue.isEmpty()) { + return 0; + } + foreach (QueueEntry *e, tc->reqQueue) { + if (e->IsActive()) { + return 0; + } + } + tc->reqQueue.head()->issueRequest(); + return 0; +} + +QueueEntry::QueueEntry(HbThemeClientPrivate *tc) + : CActive(EPriorityStandard), + mTc(tc), mInfoPckg(0), mParamsPckg(0), mCallbackParam(0) +{ + CActiveScheduler::Add(this); +} + +QueueEntry::~QueueEntry() +{ + Cancel(); + delete mParamsPckg; + delete mInfoPckg; +} + +void QueueEntry::DoCancel() +{ + // No cancel support on server-side, so complete here. This also means that + // Cancel() can only be called from the dtor. See cancelGetSharedIconInfo(). + TRequestStatus *rs = &iStatus; + User::RequestComplete(rs, KErrCancel); +} + +void QueueEntry::RunL() +{ + if (iStatus != KErrCancel) { + mTc->reqQueue.removeOne(this); + if (iStatus != KErrNone) { + mInfo.type = INVALID_FORMAT; + } + if (!mCallback || !mCallback(mInfo, mCallbackParam)) { + // Requestor is not interested, may not even exist anymore, so unload. + HbThemeClient::IconReqInfo reqInfo; + reqInfo.iconPath = QString::fromUtf16(mParams.fileName.Ptr(), mParams.fileName.Length()); + reqInfo.size = QSizeF(mParams.width, mParams.height); + reqInfo.aspectRatioMode = (Qt::AspectRatioMode) mParams.aspectRatioMode; + reqInfo.mode = (QIcon::Mode) mParams.mode; + reqInfo.mirrored = (bool) mParams.mirrored; + reqInfo.color = mParams.colorflag ? QColor(mParams.rgba) : QColor(); + reqInfo.renderMode = (HbRenderingMode) mParams.renderMode; + mTc->unloadIcon(reqInfo); + } + mTc->scheduleQueueCheck(); + delete this; + } +} + +void QueueEntry::init(const HbThemeClient::IconReqInfo &reqInfo, + HbAsyncIconInfoCallback callback, + void *callbackParam) +{ + mCallback = callback; + mCallbackParam = callbackParam; + mInfo.type = INVALID_FORMAT; + mIconPathBuf = TFileName(reqInfo.iconPath.utf16()); + mParams.fileName = mIconPathBuf; + mParams.width = reqInfo.size.width(); + mParams.height = reqInfo.size.height(); + mParams.aspectRatioMode = (TUint8) reqInfo.aspectRatioMode; + mParams.mode = (TUint8) reqInfo.mode; + mParams.options = (TUint8) reqInfo.options; + mParams.mirrored = (TBool) reqInfo.mirrored; + mParams.rgba = (TUint32) reqInfo.color.rgba(); + mParams.colorflag = reqInfo.color.isValid(); + mParams.renderMode = reqInfo.renderMode; + mInfoPckg = new TPckg(mInfo); + mParamsPckg = new TPckg(mParams); +} + +void QueueEntry::issueRequest() +{ + TIpcArgs args(mParamsPckg, mInfoPckg); + mTc->SendReceive(EIconLookup, args, iStatus); + SetActive(); +} + /** * HbThemeClientPrivate::getSharedIconInfo() * - * Returns the shared icon information + * Returns the shared icon information, asynchronous version. +*/ +void HbThemeClientPrivate::getSharedIconInfo(const HbThemeClient::IconReqInfo &reqInfo, + HbAsyncIconInfoCallback callback, + void *callbackParam) +{ + if (!clientConnected) { + HbSharedIconInfo info; + info.type = INVALID_FORMAT; + callback(info, callbackParam); + return; + } + QueueEntry *e = new QueueEntry(this); + e->init(reqInfo, callback, callbackParam); + reqQueue.enqueue(e); + scheduleQueueCheck(); +} + +void HbThemeClientPrivate::scheduleQueueCheck() +{ + if (queueCheckInvoker && !queueCheckInvoker->IsActive()) { + queueCheckInvoker->Start(TCallBack(checkQueue, this)); + } +} + +/** + * HbThemeClientPrivate::cancelGetSharedIconInfo + * + * Cancels a previous async getSharedIconInfo request. + * If callbackParam is 0 then it is ignored and only \a callback is used in the matching. + * Otherwise both \a callback and \a callbackParam must match. */ -HbSharedIconInfo HbThemeClientPrivate::getSharedIconInfo(const QString &iconPath, - const QSizeF &size, - Qt::AspectRatioMode aspectRatioMode, - QIcon::Mode mode, - bool mirrored, - HbIconLoader::IconLoaderOptions options, - const QColor &color, - HbRenderingMode renderMode) +void HbThemeClientPrivate::cancelGetSharedIconInfo(HbAsyncIconInfoCallback callback, + void *callbackParam) +{ + for (int i = 0; i < reqQueue.count(); ++i) { + QueueEntry *e = reqQueue.at(i); + if (e->mCallback == callback && (!callbackParam || callbackParam == e->mCallbackParam)) { + if (e->IsActive()) { + // There is no real cancelation support, the themeserver is busy + // and is blocked at this point, so just let it go and ignore + // the future results. Calling Cancel() would potentially result + // in a stray signal. + e->mCallback = 0; + } else { + delete e; + reqQueue.removeAt(i--); + } + } + } +} + +inline TIconParams reqInfoToParams(const HbThemeClient::IconReqInfo &reqInfo) +{ + TIconParams params; + params.fileName.Copy(TPtrC(static_cast(reqInfo.iconPath.utf16()), + reqInfo.iconPath.length())); + params.width = reqInfo.size.width(); + params.height = reqInfo.size.height(); + params.aspectRatioMode = (TUint8) reqInfo.aspectRatioMode; + params.mode = (TUint8) reqInfo.mode; + params.options = (TUint8) reqInfo.options; + params.mirrored = (TBool) reqInfo.mirrored; + params.rgba = (TUint32) reqInfo.color.rgba(); + params.colorflag = reqInfo.color.isValid(); + params.renderMode = reqInfo.renderMode; + return params; +} + +/** + * HbThemeClientPrivate::getSharedIconInfo() + * + * Returns the shared icon information, synchronous version. +*/ +HbSharedIconInfo HbThemeClientPrivate::getSharedIconInfo(const HbThemeClient::IconReqInfo &reqInfo) { HbSharedIconInfo sharedIconInfo; sharedIconInfo.type = INVALID_FORMAT; - if ( !clientConnected ) { + if (!clientConnected) { return sharedIconInfo; } - TBuf<256> buffer(iconPath.utf16()); TPckg iconInfo(sharedIconInfo); - - TIconParams params; - params.fileName = buffer; - params.width = size.width(); - params.height = size.height(); - params.aspectRatioMode = (TUint8)aspectRatioMode; - params.mode = (TUint8)mode; - params.options = (TUint8)options; - params.mirrored = (TBool)mirrored; - params.rgba = (TUint32) color.rgba(); - params.colorflag = color.isValid(); - params.renderMode = renderMode; + TIconParams params = reqInfoToParams(reqInfo); TPckg paramPckg(params); - - TIpcArgs args(¶mPckg,&iconInfo); + TIpcArgs args(¶mPckg, &iconInfo); TInt err = SendReceive(EIconLookup, args); if (KErrNone != err) { - sharedIconInfo.type = INVALID_FORMAT; + sharedIconInfo.type = INVALID_FORMAT; } return sharedIconInfo; } @@ -152,7 +324,6 @@ /** * getMultiPartIconInfo */ - HbSharedIconInfo HbThemeClientPrivate::getMultiPartIconInfo( const QStringList &multiPartIconList, const HbMultiPartSizeData &multiPartIconData, @@ -174,10 +345,10 @@ TPckg iconInfo(sharedIconInfo); TMultiIconSymbParams params; - TBuf<256> iconId(multiPartIconData.multiPartIconId.utf16()); + TFileName iconId(multiPartIconData.multiPartIconId.utf16()); params.multiPartIconId.Copy(iconId); for (int i = 0; i < multiPartIconList.length(); i++) { - TBuf<256> pieceIconId(multiPartIconList[i].utf16()); + TFileName pieceIconId(multiPartIconList[i].utf16()); params.multiPartIconList[i].Copy(pieceIconId); } int noOfPieces = 1; @@ -231,7 +402,7 @@ } HbCss::StyleSheet *styleSheet(0); - TBuf<256> fileDes(fileName.utf16()); + TFileName fileDes(fileName.utf16()); TBuf<5> layerPriority; layerPriority.AppendNum((TInt)priority); @@ -304,7 +475,7 @@ HbEffectFxmlData *fxmlData = 0; - TBuf<256> fileDes(filePath.utf16()); + TFileName fileDes(filePath.utf16()); HbSharedEffectInfo effectInfo; TPckg sharedInfo(effectInfo); @@ -351,7 +522,7 @@ return false; } - TBuf<256> fileDes(filePath.utf16()); + TFileName fileDes(filePath.utf16()); TInt retVal = KErrGeneral; TPckg sharedInfo(retVal); @@ -388,41 +559,47 @@ /** * HbThemeClientPrivate::unloadIcon() - * - * unload icon */ -void HbThemeClientPrivate::unloadIcon(const QString &iconPath, - const QSizeF &size, - Qt::AspectRatioMode aspectRatioMode, - QIcon::Mode mode, - bool mirrored, - const QColor &color, - HbRenderingMode renderMode) +void HbThemeClientPrivate::unloadIcon(const HbThemeClient::IconReqInfo &reqInfo) { - if ( !clientConnected ) { + if (!clientConnected) { return; } - TBuf<256> buffer(iconPath.utf16()); - - TIconParams params; - params.fileName = buffer; - params.width = size.width(); - params.height = size.height(); - params.aspectRatioMode = (TUint8)aspectRatioMode; - params.mode = (TUint8)mode; - params.options = (TUint8)0; - params.mirrored = (TBool)mirrored; - params.rgba = (TUint32) color.rgba(); - params.colorflag = color.isValid(); - params.renderMode = (TUint8)renderMode; + TIconParams params = reqInfoToParams(reqInfo); TPckg paramPckg(params); - TIpcArgs args(¶mPckg, 0); + TIpcArgs args(¶mPckg); SendReceive(EUnloadIcon, args); } /** + * HbThemeClientPrivate::batchUnloadIcon() +*/ +void HbThemeClientPrivate::batchUnloadIcon(const QVector &reqInfos) +{ + if (!clientConnected) { + return; + } + int idx = 0; + typedef TIconParams Params[BATCH_SIZE_LIMIT]; + Params paramList; + for (int i = 0, ie = reqInfos.count(); i != ie; ++i) { + paramList[idx++] = reqInfoToParams(reqInfos.at(i)); + if (idx == BATCH_SIZE_LIMIT || i == ie - 1) { + // There may be unused entries in the last batch. + for (int j = idx; j < BATCH_SIZE_LIMIT; ++j) { + paramList[j].fileName.Zero(); + } + idx = 0; + TPckg paramsPckg(paramList); + TIpcArgs args(¶msPckg); + SendReceive(EBatchUnloadIcon, args); + } + } +} + +/** * HbThemeClientPrivate::unLoadMultiIcon() * * unload multiple icons @@ -443,7 +620,6 @@ int noOfPieces = iconPathList.length(); for (int i = 0; i < noOfPieces; i++) { - TFileName pieceIconId(iconPathList[i].utf16()); params.iconList[i].Copy(pieceIconId); params.sizeList[i] = sizeList[i]; @@ -474,9 +650,9 @@ HbWidgetLoader::LayoutDefinition *layoutDef(0); - TBuf<256> fileDes(fileName.utf16()); - TBuf<256> layoutDes(layout.utf16()); - TBuf<256> sectionDes(section.utf16()); + TFileName fileDes(fileName.utf16()); + TFileName layoutDes(layout.utf16()); + TFileName sectionDes(section.utf16()); HbSharedWMLInfo widgetmlInfo; TPckg wmlInfo(widgetmlInfo); @@ -537,13 +713,24 @@ */ HbThemeClientPrivate::~HbThemeClientPrivate() { + // Make a copy and destroy the elements after emptying the real queue so + // checkQueue() can safely be called during the destruction of the elements. + QueueType qc = reqQueue; + reqQueue.clear(); + foreach (QueueEntry *e, qc) { + delete e; + } + delete queueCheckInvoker; // destroy only when no QueueEntries are alive + RSessionBase::Close(); + #ifdef HB_SGIMAGE_ICON if (sgDriverInit) { sgDriver.Close(); sgDriverInit = false; } #endif + delete themelistener; } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/theme/hbthemecommon_p.h --- a/src/hbcore/theme/hbthemecommon_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/theme/hbthemecommon_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -90,7 +90,7 @@ quint32 identifier; quint32 mainAllocatorOffset; quint32 subAllocatorOffset; - quint32 sharedCacheOffset; + quint32 sharedCacheOffset; // Base theme offsets quint32 baseThemePathOffset; quint32 baseThemeNameOffset; @@ -331,6 +331,7 @@ EEffectLookupFilePath, EEffectAdd, EUnloadIcon, + EBatchUnloadIcon, EUnloadMultiIcon, EMemoryGood, EFreeRam, @@ -344,7 +345,8 @@ ETotalGPUMem, ECachedSgImages, ECachedPixmapImages, - ECurrentRenderingMode + ECurrentRenderingMode, + ETotalSgImagesCost #ifdef HB_THEME_SERVER_MEMORY_REPORT ,ECreateMemoryReport #endif @@ -355,6 +357,8 @@ { int bytesToFree; bool useSwRendering; -}; +}; + +typedef bool (*HbAsyncIconInfoCallback)(const HbSharedIconInfo &, void *); #endif /* HBTHEMECOMMON_P_H */ diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/theme/hbthemecommon_symbian_p.h --- a/src/hbcore/theme/hbthemecommon_symbian_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/theme/hbthemecommon_symbian_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -28,11 +28,13 @@ #include #include + // To enable/disable debug messages for theme listener #undef THEME_LISTENER_TRACES + struct TIconParams { - TBuf<256> fileName; + TFileName fileName; TReal width; TReal height; TUint8 aspectRatioMode; @@ -46,8 +48,8 @@ struct TMultiIconSymbParams { - TBuf<256> multiPartIconId; - TBuf<256> multiPartIconList[9]; + TFileName multiPartIconId; + TFileName multiPartIconList[9]; TRect sources[9]; TRect targets[9]; TSize pixmapSizes[9]; @@ -59,11 +61,11 @@ TInt rgba; TBool colorflag; TInt renderMode; - }; +}; struct TIconListParams { - TBuf<256> iconList[9]; + TFileName iconList[9]; QSizeF sizeList[9]; TInt aspectRatioMode; TInt mode; @@ -104,6 +106,10 @@ */ const TUint32 KHbDefaultThemeCenrepKey = 0x2; +/** + * During batch unload, send up to this number of icon data in one + * batch (i.e. one server request). + */ +const int BATCH_SIZE_LIMIT = 8; #endif // HBTHEMECOMMON_SYMBIAN_P_H - diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/theme/hbthemeutils_p.cpp --- a/src/hbcore/theme/hbthemeutils_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/theme/hbthemeutils_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -321,10 +321,11 @@ */ bool HbThemeUtils::isThemeValid(const QString &themePath) { + const QString themePathFixed = QDir::fromNativeSeparators(themePath); // If the theme contains .themeindex and index.theme files // it will be assumed valid - QString indexFile = QString(themePath).replace("/icons/", QString('/')) + ".themeindex"; - return (QFile::exists(themePath + "/index.theme") && QFile::exists(indexFile)); + QString indexFile = QString(themePathFixed).replace("/icons/", QString('/')) + ".themeindex"; + return (QFile::exists(themePathFixed + "/index.theme") && QFile::exists(indexFile)); } HbThemeIndexInfo HbThemeUtils::getThemeIndexInfo(const HbThemeType &type) diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/utils/hbfontspec.cpp --- a/src/hbcore/utils/hbfontspec.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/utils/hbfontspec.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -190,15 +190,15 @@ if (mRole != HbFontSpec::Undefined) { tInfo->roleToTypeface(mRole, typefaceFamily, weight); - mFontName = typefaceFamily; - } else if (!tInfo->containsFamily(typefaceFamily)) { - QString aliasFamily; - if (tInfo->tryGetFamilyFromAliasName(typefaceFamily, aliasFamily, weight)) { - typefaceFamily = aliasFamily; - } - } else { - weight = tInfo->getWeight(typefaceFamily); - } + mFontName = typefaceFamily; + } else if (!tInfo->containsFamily(typefaceFamily)) { + QString aliasFamily; + if (tInfo->tryGetFamilyFromAliasName(typefaceFamily, aliasFamily, weight)) { + typefaceFamily = aliasFamily; + } + } else { + weight = tInfo->getWeight(typefaceFamily); + } QFont font(typefaceFamily); font.setWeight(weight); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/utils/hbfontspec.h --- a/src/hbcore/utils/hbfontspec.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/utils/hbfontspec.h Thu Sep 02 20:44:51 2010 +0300 @@ -53,7 +53,7 @@ explicit HbFontSpec(HbFontSpec::Role role); HbFontSpec(const HbFontSpec &other); - HbFontSpec(const QString fontName); + HbFontSpec(const QString fontName); HbFontSpec &operator=(const HbFontSpec &other); ~HbFontSpec(); @@ -72,8 +72,8 @@ bool operator==(const HbFontSpec &other) const; bool operator!=(const HbFontSpec &other) const; - QString typefaceFamily() const; - void setTypefaceFamily(QString fontName); + QString typefaceFamily() const; + void setTypefaceFamily(QString fontName); private: HbFontSpecPrivate *d; }; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/utils/hbtextmeasurementutility.cpp --- a/src/hbcore/utils/hbtextmeasurementutility.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/utils/hbtextmeasurementutility.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -244,11 +244,11 @@ return; #else QList mainWindows; - if (mWindow) { - mainWindows.append(mWindow); - } else { - mainWindows = hbInstance->allMainWindows(); - } + if (mWindow) { + mainWindows.append(mWindow); + } else { + mainWindows = hbInstance->allMainWindows(); + } foreach (HbMainWindow* mainWindow, mainWindows ) { QGraphicsScene* scene = mainWindow->scene(); //krazy:exclude=qclasses QList sceneItems = scene->items(); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/utils/hbtextutils_p.cpp --- a/src/hbcore/utils/hbtextutils_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/utils/hbtextutils_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -45,7 +45,7 @@ \param length Length of the text. \param found If non-null, returns true if the directionality could be determined from \a text. -\return \c true if the directionality is right to left. If the directionality +\return \c true if the directionality is right to left. If the directionality cannot be determined solely from this text, \c false is returned. This is the implicit directionality of text that is composed entirely of neutrals. */ @@ -55,34 +55,34 @@ if (found) { *found = true; } - - qint32 lastUtf16 = 0; - const ushort* end = text + length; + + qint32 lastUtf16 = 0; + const ushort* end = text + length; - while (text != end && *text) - { - qint32 code = *text++; - if ((code & 0xFFFFFC00) == 0xD800 && + while (text != end && *text) + { + qint32 code = *text++; + if ((code & 0xFFFFFC00) == 0xD800 && (lastUtf16 & 0xFFFFFC00) == 0xDC00) - { - code = (code << 10) + (lastUtf16 & 0x3FF) - + (0x10000 - 0xD800*0x400); - } - lastUtf16 = code; - QChar c(code); - switch(c.direction()) - { - case QChar::DirL: - return false; - case QChar::DirR: - case QChar::DirAL: - return true; - default: - break; - } - } - if (found) { - *found = false; + { + code = (code << 10) + (lastUtf16 & 0x3FF) + + (0x10000 - 0xD800*0x400); + } + lastUtf16 = code; + QChar c(code); + switch(c.direction()) + { + case QChar::DirL: + return false; + case QChar::DirR: + case QChar::DirAL: + return true; + default: + break; + } + } + if (found) { + *found = false; } - return false; + return false; } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/utils/hbtypefaceinfo.cpp --- a/src/hbcore/utils/hbtypefaceinfo.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/utils/hbtypefaceinfo.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -67,7 +67,7 @@ if ( !mTypefaceVector ) { HbTypefaceInfoDatabase *heapDatabase = HbTypefaceInfoDatabase::instance( HbMemoryManager::HeapMemory ); - if ( heapDatabase ){ + if ( heapDatabase ){ mTypefaceVector = HbMemoryUtils::getAddress(HbMemoryManager::HeapMemory, heapDatabase->typefaceInfoVectorOffset()); } @@ -97,7 +97,7 @@ : QObject( parent ), d( new HbTypefaceInfoPrivate ) { - d->initialize(); + d->initialize(); } @@ -114,7 +114,7 @@ } for( int i = 0; i < mTypefaceVector->size(); i++ ) { if (mTypefaceVector->at(i).mRoleEnum == role && - mTypefaceVector->at(i).mIsAlias == false) { + mTypefaceVector->at(i).mIsAlias == false) { index = i; return true; } @@ -139,97 +139,97 @@ } bool HbTypefaceInfo::containsFamily(const QString &typefaceFamily) const { - int dummy; - return d->containsFamily(typefaceFamily, dummy); + int dummy; + return d->containsFamily(typefaceFamily, dummy); } bool HbTypefaceInfo::tryGetFamilyFromAliasName( - const QString &aliasFamily, - QString &typefaceFamily, - int &weight) const + const QString &aliasFamily, + QString &typefaceFamily, + int &weight) const { for (int i = 0; i < d->mTypefaceVector->size(); i++) { if (d->mTypefaceVector->at(i).mIsAlias == true && !aliasFamily.compare(d->mTypefaceVector->at(i).mAliasedFamily, Qt::CaseInsensitive)) { typefaceFamily = d->mTypefaceVector->at(i).mFamily ; - weight = d->mTypefaceVector->at(i).mIsBold ? QFont::Bold : QFont::Normal; - return true; + weight = d->mTypefaceVector->at(i).mIsBold ? QFont::Bold : QFont::Normal; + return true; } } - return false; + return false; } int HbTypefaceInfo::getWeight(const QString &typefaceFamily) const { - int index, weight; - if (d->containsFamily( typefaceFamily, index)) { - weight = d->mTypefaceVector->at(index).mIsBold ? QFont::Bold : QFont::Normal; - } - else { - weight = QFont::Normal; - } - return weight; + int index, weight; + if (d->containsFamily( typefaceFamily, index)) { + weight = d->mTypefaceVector->at(index).mIsBold ? QFont::Bold : QFont::Normal; + } + else { + weight = QFont::Normal; + } + return weight; } void HbTypefaceInfo::roleToTypeface(HbFontSpec::Role role, QString& typefaceFamily, int& weight) const { int index; - bool validRole = d->containsRole( role, index ); - if (!validRole) { - role = HbFontSpec::Undefined; - validRole = d->containsRole( role, index ); - if( !validRole ) { - qWarning( "HbTypefaceInfo: cannot find corresponding font role %d, line %d", role, __LINE__ ); - return; - } - } + bool validRole = d->containsRole( role, index ); + if (!validRole) { + role = HbFontSpec::Undefined; + validRole = d->containsRole( role, index ); + if( !validRole ) { + qWarning( "HbTypefaceInfo: cannot find corresponding font role %d, line %d", role, __LINE__ ); + return; + } + } - typefaceFamily = d->mTypefaceVector->at( index ).mFamily; - weight = d->mTypefaceVector->at( index ).mIsBold ? QFont::Bold : QFont::Normal; + typefaceFamily = d->mTypefaceVector->at( index ).mFamily; + weight = d->mTypefaceVector->at( index ).mIsBold ? QFont::Bold : QFont::Normal; - return; + return; } int HbTypefaceInfo::textHeightToSizeInPixels( - const QString& typefaceFamily, - int weight, - qreal textHeight) const + const QString& typefaceFamily, + int weight, + qreal textHeight) const { - Q_UNUSED(weight); - int index; - int heightIndex; + Q_UNUSED(weight); + int index; + int heightIndex; - if (! d->containsFamily( typefaceFamily, index )) { - // need to generate on server size, not supported yet - qWarning( "HbTypefaceInfo:textHeightToSizeInPixels no font family %s, line %d", typefaceFamily.toLatin1().data(), __LINE__ ); - return 1; - } + if (! d->containsFamily( typefaceFamily, index )) { + // need to generate on server size, not supported yet + qWarning( "HbTypefaceInfo:textHeightToSizeInPixels no font family %s, line %d", typefaceFamily.toLatin1().data(), __LINE__ ); + return 1; + } - HbTypefaceInfoItem *item = &( d->mTypefaceVector->at( index ) ); + HbTypefaceInfoItem *item = &( d->mTypefaceVector->at( index ) ); - int size(-1); + int size(-1); - int flooredPaneHeight = qRound(textHeight-0.5); - if ( item->tableContainsHeight( flooredPaneHeight, heightIndex ) ) { - size = item->mDownSizeTable.at( heightIndex ).pixelSize; - } else if ( textHeight < item->mLowestExtent ) { // Assumed that downsize info goes quite low, below really usable fonts - size = qRound( textHeight ); - } else if ( textHeight < item->mHighestExtent ) { // interpolate. May fail and leave size unset. - int indexLowerB = -1; - int indexUpperB = -1; - int lowerBValue = 0xffffff; - int upperBValue = 0xffffff; - for( int i = 0; i < item->mDownSizeTable.size(); i++ ) { - int current = item->mDownSizeTable.at( i ).textHeight; - if( ( current < lowerBValue ) && ( current >= flooredPaneHeight ) ) { - lowerBValue = current; - indexLowerB = i; - } + int flooredPaneHeight = qRound(textHeight-0.5); + if ( item->tableContainsHeight( flooredPaneHeight, heightIndex ) ) { + size = item->mDownSizeTable.at( heightIndex ).pixelSize; + } else if ( textHeight < item->mLowestExtent ) { // Assumed that downsize info goes quite low, below really usable fonts + size = qRound( textHeight ); + } else if ( textHeight < item->mHighestExtent ) { // interpolate. May fail and leave size unset. + int indexLowerB = -1; + int indexUpperB = -1; + int lowerBValue = 0xffffff; + int upperBValue = 0xffffff; + for( int i = 0; i < item->mDownSizeTable.size(); i++ ) { + int current = item->mDownSizeTable.at( i ).textHeight; + if( ( current < lowerBValue ) && ( current >= flooredPaneHeight ) ) { + lowerBValue = current; + indexLowerB = i; + } if( ( current < upperBValue ) && ( current > flooredPaneHeight ) ) { upperBValue = current; indexUpperB = i; } - } + } - if( ( indexUpperB != -1 ) && ( indexLowerB != -1 ) ) { + if( ( indexUpperB != -1 ) && ( indexLowerB != -1 ) ) { int k1 = lowerBValue; int v1 = item->mDownSizeTable.at( indexLowerB ).pixelSize; int k2 = upperBValue; @@ -238,27 +238,27 @@ if (diff > 0) { size = qRound(v1 + (flooredPaneHeight - k1)*(v2 - v1)/diff); } - } - } - // Come here for text heights that are too large for the table, or for failure of interpolation - if (size == -1) { - int highestExtentIndex; - if( ! item->tableContainsHeight( item->mHighestExtent, highestExtentIndex ) ) { - qWarning( "HbTypefaceInfo:textHeightToSizeInPixels something wrong with downsize table, line %d", __LINE__ ); - return 1; - } + } + } + // Come here for text heights that are too large for the table, or for failure of interpolation + if (size == -1) { + int highestExtentIndex; + if( ! item->tableContainsHeight( item->mHighestExtent, highestExtentIndex ) ) { + qWarning( "HbTypefaceInfo:textHeightToSizeInPixels something wrong with downsize table, line %d", __LINE__ ); + return 1; + } - size = qRound( textHeight - * item->mDownSizeTable.at( highestExtentIndex ).pixelSize - / item->mHighestExtent); - } + size = qRound( textHeight + * item->mDownSizeTable.at( highestExtentIndex ).pixelSize + / item->mHighestExtent); + } // If the caller intends non-zero size, and zero would be returned by downsizing, then return 1. // This avoids QFont's special treatment of zero size. if(textHeight > 0 && size <= 0) { size = 1; } - return size; + return size; } #include "hbtypefaceinfo.moc" diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/utils/hbtypefaceinfo_p.h --- a/src/hbcore/utils/hbtypefaceinfo_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/utils/hbtypefaceinfo_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -40,11 +40,11 @@ HbTypefaceInfo(QObject *parent = 0); ~HbTypefaceInfo(); - void roleToTypeface(HbFontSpec::Role role, QString &typefaceFamily, int &weight) const; - int textHeightToSizeInPixels(const QString &typefaceFamily, int weight, qreal textHeight) const; - bool tryGetFamilyFromAliasName(const QString &aliasFamily, QString &typefaceFamily, int &weight) const; - bool containsFamily(const QString& typefaceFamily) const; - int getWeight(const QString& typefaceFamily) const; + void roleToTypeface(HbFontSpec::Role role, QString &typefaceFamily, int &weight) const; + int textHeightToSizeInPixels(const QString &typefaceFamily, int weight, qreal textHeight) const; + bool tryGetFamilyFromAliasName(const QString &aliasFamily, QString &typefaceFamily, int &weight) const; + bool containsFamily(const QString& typefaceFamily) const; + int getWeight(const QString& typefaceFamily) const; private: mutable HbTypefaceInfoPrivate *d; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/utils/hbtypefaceinfodatabase_p.cpp --- a/src/hbcore/utils/hbtypefaceinfodatabase_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/utils/hbtypefaceinfodatabase_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -36,11 +36,11 @@ #ifdef Q_OS_SYMBIAN - #define HB_FONTS_WRITABLE_PATH QString("c:\\hb\\fonts") + #define HB_FONTS_WRITABLE_PATH QString("c:\\hb\\fonts") #else - #ifndef Q_OS_UNIX - #define HB_FONTS_WRITABLE_PATH QString("c:\\Hb\\lib") - #endif + #ifndef Q_OS_UNIX + #define HB_FONTS_WRITABLE_PATH QString("c:\\Hb\\lib") + #endif #endif // Recognized texts for values of role strings @@ -94,12 +94,12 @@ static bool isAliasRole(const QString &roleName) { - bool alias(false); // return value + bool alias(false); // return value QString name = roleName.toLower(); if (name == ALIAS_STRING) { alias = true; } - return alias; + return alias; } /*! Returns path to a writable location that should be used as a base storage folder for @@ -113,11 +113,11 @@ if (QString(HB_BUILD_DIR) == QString(HB_INSTALL_DIR)) { // This is local build so also use local writable path. return QString(HB_INSTALL_DIR) + QDir::separator() + QString(".hb") - + QDir::separator() + QString("fonts"); + + QDir::separator() + QString("fonts"); } else { #ifdef Q_OS_UNIX return QDir::homePath() + QDir::separator() + QString(".hb") - + QDir::separator() + QString("fonts"); + + QDir::separator() + QString("fonts"); #else return HB_FONTS_WRITABLE_PATH ; #endif @@ -184,16 +184,16 @@ item.mRoleEnum = roleEnum; item.mFamily = family; item.mIsBold = isBold; - item.mIsAlias = false; + item.mIsAlias = false; mTypefaceInfoVector->append( item ); } else if (isAliasRole(role)) { - item.mRoleEnum = HbFontSpec::Undefined; - item.mFamily = aliasFamily; - item.mAliasedFamily = family; - item.mIsBold = isBold; - item.mIsAlias = true; - mTypefaceInfoVector->append( item ); + item.mRoleEnum = HbFontSpec::Undefined; + item.mFamily = aliasFamily; + item.mAliasedFamily = family; + item.mIsBold = isBold; + item.mIsAlias = true; + mTypefaceInfoVector->append( item ); } } @@ -243,36 +243,36 @@ bool HbTypefaceInfoDatabase::readTypefaceMetricsFile( HbTypefaceXmlParser *parser, - HbTypefaceInfoItem *typeFaceInfoItem ) + HbTypefaceInfoItem *typeFaceInfoItem ) { - Q_ASSERT (parser && typeFaceInfoItem); + Q_ASSERT (parser && typeFaceInfoItem); - int numPoints(0); - QString typefaceMetricsFileName; + int numPoints(0); + QString typefaceMetricsFileName; - typefaceMetricsFileName.append(TYPEFACE_RESOURCE_FOLDER); - typefaceMetricsFileName.append(QDir::separator()); - typefaceMetricsFileName.append(TYPEFACE_METRICS_FILE_STEM); + typefaceMetricsFileName.append(TYPEFACE_RESOURCE_FOLDER); + typefaceMetricsFileName.append(QDir::separator()); + typefaceMetricsFileName.append(TYPEFACE_METRICS_FILE_STEM); - // replace whitespace with underscores and append + // replace whitespace with underscores and append QString temp = typeFaceInfoItem->mFamily; temp = temp.toLower().replace(QRegExp("\\s+"), QString("_")); typefaceMetricsFileName.append( temp ); typefaceMetricsFileName.append(".xml"); - QFile *file = new QFile(typefaceMetricsFileName); - if( !(file && file->exists()) ) { - typefaceMetricsFileName = writablePath(); - typefaceMetricsFileName.append(QDir::separator()); - typefaceMetricsFileName.append(TYPEFACE_METRICS_FILE_STEM); + QFile *file = new QFile(typefaceMetricsFileName); + if( !(file && file->exists()) ) { + typefaceMetricsFileName = writablePath(); + typefaceMetricsFileName.append(QDir::separator()); + typefaceMetricsFileName.append(TYPEFACE_METRICS_FILE_STEM); typefaceMetricsFileName.append( temp ); typefaceMetricsFileName.append(".xml"); - } - delete file; + } + delete file; #ifdef HBTYPEFACEINFO_DEBUG_ENABLE qDebug("HbDownsizeInfo::readTypefaceMetricsFile: typeface metric filename: %s", - typefaceMetricsFileName.toAscii().constData()); + typefaceMetricsFileName.toAscii().constData()); #endif parser->setFilePath(typefaceMetricsFileName); @@ -365,10 +365,10 @@ void HbTypefaceInfoDatabase::outputMetrics( HbTypefaceInfoItem *typeFaceInfoItem ) const { QString filePath = writablePath(); - QDir dir(filePath); - if(!dir.exists()) { - dir.mkpath(filePath + QDir::separator() ); - } + QDir dir(filePath); + if(!dir.exists()) { + dir.mkpath(filePath + QDir::separator() ); + } filePath.append(QDir::separator()); filePath.append("typeface_metrics_"); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/utils/hbtypefaceinfodatabase_p.h --- a/src/hbcore/utils/hbtypefaceinfodatabase_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/utils/hbtypefaceinfodatabase_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -36,8 +36,8 @@ HbFontSpec::Role mRoleEnum; HbString mFamily; bool mIsBold; - bool mIsAlias; - HbString mAliasedFamily; + bool mIsAlias; + HbString mAliasedFamily; struct HbTypefaceMeasureInfoStruct { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/utils/hbtypefacexmlparser.cpp --- a/src/hbcore/utils/hbtypefacexmlparser.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/utils/hbtypefacexmlparser.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -73,10 +73,10 @@ */ HbTypefaceXmlParser::~HbTypefaceXmlParser() { - if (mFile) { - delete mFile; + if (mFile) { + delete mFile; mFile = 0; - } + } } /*! @@ -86,7 +86,7 @@ */ void HbTypefaceXmlParser::setFilePath(const QString& path) { - mFilePath = path; + mFilePath = path; } /*! @@ -98,63 +98,63 @@ */ bool HbTypefaceXmlParser::init() { - QString filePath(":typefaces.xml"); + QString filePath(":typefaces.xml"); - // If one has been set by API - if ( !mFilePath.isEmpty() ) { - filePath = mFilePath; - } - else { - // Check if resource directory has got the typefaces.xml file. - // If yes, then use the one present in the resource directory - QString resourceFilePath(TYPEFACE_RESOURCE_FOLDER); - resourceFilePath.append(QDir::separator()); - resourceFilePath.append("typefaces.xml"); + // If one has been set by API + if ( !mFilePath.isEmpty() ) { + filePath = mFilePath; + } + else { + // Check if resource directory has got the typefaces.xml file. + // If yes, then use the one present in the resource directory + QString resourceFilePath(TYPEFACE_RESOURCE_FOLDER); + resourceFilePath.append(QDir::separator()); + resourceFilePath.append("typefaces.xml"); - QFile *file = new QFile(resourceFilePath); - if( file && file->exists() ) { - filePath = resourceFilePath; - } - delete file; - } - - if (mFile){ - delete mFile; - } + QFile *file = new QFile(resourceFilePath); + if( file && file->exists() ) { + filePath = resourceFilePath; + } + delete file; + } + + if (mFile){ + delete mFile; + } - mFile = new QFile(filePath); - // Trying to see if the absolute path can be determined - QString name2 = mFile->fileName(); + mFile = new QFile(filePath); + // Trying to see if the absolute path can be determined + QString name2 = mFile->fileName(); - if( !mFile->exists() ) { - qWarning("HbTypefaceXmlParser Warning: XML-file at %s does not exist", qPrintable(filePath)); - return false; - } + if( !mFile->exists() ) { + qWarning("HbTypefaceXmlParser Warning: XML-file at %s does not exist", qPrintable(filePath)); + return false; + } - // not yet parsed, parse and add data - if (!mFile->open(QFile::ReadOnly | QFile::Text)) { - qWarning("HbEffect Warning: XML-file at %s opening failed", qPrintable(filePath)); - return false; - } + // not yet parsed, parse and add data + if (!mFile->open(QFile::ReadOnly | QFile::Text)) { + qWarning("HbEffect Warning: XML-file at %s opening failed", qPrintable(filePath)); + return false; + } - setDevice(mFile); - bool positioned(false); - while (!atEnd() && !positioned) { - QXmlStreamReader::TokenType type = readNext(); + setDevice(mFile); + bool positioned(false); + while (!atEnd() && !positioned) { + QXmlStreamReader::TokenType type = readNext(); if(type == QXmlStreamReader::Invalid) break; - if (isStartElement()) { - if (name() == TYPEFACE_INFO) { - positioned = true; - } - else { - raiseError("HbTypefaceXmlParser::read The document is not a valid typeface information xml file."); - } - } - } + if (isStartElement()) { + if (name() == TYPEFACE_INFO) { + positioned = true; + } + else { + raiseError("HbTypefaceXmlParser::read The document is not a valid typeface information xml file."); + } + } + } - return !error() && positioned; + return !error() && positioned; } /*! @@ -162,21 +162,21 @@ */ bool HbTypefaceXmlParser::readAndPositionTypefaceSet() { - Q_ASSERT(isStartElement() && name() == TYPEFACE_INFO); - bool positioned(false); - while (!atEnd() && !positioned) { - QXmlStreamReader::TokenType type = readNext(); + Q_ASSERT(isStartElement() && name() == TYPEFACE_INFO); + bool positioned(false); + while (!atEnd() && !positioned) { + QXmlStreamReader::TokenType type = readNext(); if(type == QXmlStreamReader::Invalid) break; - if (isStartElement()) { - if (name() == TYPEFACE_SET) { - // find the correct language and country - positioned = matchLanguageAndCountry(); - } - } - } - return positioned; + if (isStartElement()) { + if (name() == TYPEFACE_SET) { + // find the correct language and country + positioned = matchLanguageAndCountry(); + } + } + } + return positioned; } /* @@ -184,49 +184,49 @@ */ bool HbTypefaceXmlParser::matchLanguageAndCountry() const { - Q_ASSERT(isStartElement() && name() == TYPEFACE_SET); - QString language, country; - bool positioned(false); + Q_ASSERT(isStartElement() && name() == TYPEFACE_SET); + QString language, country; + bool positioned(false); - HbExtendedLocale systemLocale = HbExtendedLocale::system(); - QString attrName, typefaceLocaleName, systemLocaleName; - QXmlStreamAttributes attrs = attributes(); + HbExtendedLocale systemLocale = HbExtendedLocale::system(); + QString attrName, typefaceLocaleName, systemLocaleName; + QXmlStreamAttributes attrs = attributes(); - foreach (const QXmlStreamAttribute &attr, attrs) { - attrName = attr.name().toString(); + foreach (const QXmlStreamAttribute &attr, attrs) { + attrName = attr.name().toString(); - if (attrName == TYPEFACE_LANGUAGE_ATT) { - language = attr.value().toString().toLower(); - } - else if (attrName == TYPEFACE_COUNTRY_ATT) { - country = attr.value().toString().toUpper(); - } - else { - qDebug("Unrecognized attribute"); - } - } - + if (attrName == TYPEFACE_LANGUAGE_ATT) { + language = attr.value().toString().toLower(); + } + else if (attrName == TYPEFACE_COUNTRY_ATT) { + country = attr.value().toString().toUpper(); + } + else { + qDebug("Unrecognized attribute"); + } + } + - // Construct the locale with the typeface locale info - if (!language.isEmpty()) { - if (!country.isEmpty()) { - typefaceLocaleName = language + '_' + country; - systemLocaleName = systemLocale.name(); - } - else { - typefaceLocaleName = language; - // Language is a lowercase, two-letter, ISO 639 language code - systemLocaleName = systemLocale.name().left(2); - } - } - else { - positioned = true; - } + // Construct the locale with the typeface locale info + if (!language.isEmpty()) { + if (!country.isEmpty()) { + typefaceLocaleName = language + '_' + country; + systemLocaleName = systemLocale.name(); + } + else { + typefaceLocaleName = language; + // Language is a lowercase, two-letter, ISO 639 language code + systemLocaleName = systemLocale.name().left(2); + } + } + else { + positioned = true; + } - if (!positioned && typefaceLocaleName.compare(systemLocaleName, Qt::CaseInsensitive) == 0) { - positioned = true; - } - return positioned; + if (!positioned && typefaceLocaleName.compare(systemLocaleName, Qt::CaseInsensitive) == 0) { + positioned = true; + } + return positioned; } /*! @@ -236,41 +236,41 @@ */ HbTypefaceXmlParser::StartElement HbTypefaceXmlParser::readToStartElement() { - StartElement startElement(NoStartElement); + StartElement startElement(NoStartElement); - bool atEnd(false); + bool atEnd(false); while (!atEnd && startElement == NoStartElement) { - QXmlStreamReader::TokenType type = readNext(); + QXmlStreamReader::TokenType type = readNext(); if(type == QXmlStreamReader::Invalid) break; - if (isStartElement()) { + if (isStartElement()) { - if (name() == TYPEFACE_METRICS) { - startElement = TypefaceMetrics; - // Grab the typeface name as "current" - QXmlStreamAttributes attrs = attributes(); - foreach (const QXmlStreamAttribute &attr, attrs) { + if (name() == TYPEFACE_METRICS) { + startElement = TypefaceMetrics; + // Grab the typeface name as "current" + QXmlStreamAttributes attrs = attributes(); + foreach (const QXmlStreamAttribute &attr, attrs) { - if (attr.name().toString() == TYPEFACE_FAMILY_ATT) { - mCurrentFamily = attr.value().toString(); - if (!mCurrentFamily.isEmpty()) { - startElement = TypefaceMetrics; // Now we have a workable start element - } - } - } + if (attr.name().toString() == TYPEFACE_FAMILY_ATT) { + mCurrentFamily = attr.value().toString(); + if (!mCurrentFamily.isEmpty()) { + startElement = TypefaceMetrics; // Now we have a workable start element + } + } + } - } - else if ( name() == TYPEFACE_SET) { - startElement = TypefaceSet; - } - } + } + else if ( name() == TYPEFACE_SET) { + startElement = TypefaceSet; + } + } - else { - // Nothing. Some other type of element; - } + else { + // Nothing. Some other type of element; + } } return startElement; @@ -284,7 +284,7 @@ name to a typeface family. The mapping also indicates if the typeface should be bold by default - \sa init() + \sa init() \param role The name of the role mapped from \param family The typeface family name mapped to the role \param bold true if typeface is to be used bold by default @@ -292,28 +292,28 @@ */ bool HbTypefaceXmlParser::readMapping(QString &role, QString &family, QString &aliasFamily, bool &bold) { - bool atEnd(false); - bool success(false); + bool atEnd(false); + bool success(false); while (!atEnd && !success ) { - QXmlStreamReader::TokenType type = readNext(); + QXmlStreamReader::TokenType type = readNext(); if(type == QXmlStreamReader::Invalid) break; - if (isEndElement()) { - if(name() == TYPEFACE_SET) { - atEnd = true; - } - } - else if (isStartElement()) { - if (name() == TYPEFACE_MAPPING) { - success = readMapItem(role, family, aliasFamily, bold); - } - } + if (isEndElement()) { + if(name() == TYPEFACE_SET) { + atEnd = true; + } + } + else if (isStartElement()) { + if (name() == TYPEFACE_MAPPING) { + success = readMapItem(role, family, aliasFamily, bold); + } + } - else { - // Nothing. Some other type of element; - } + else { + // Nothing. Some other type of element; + } } return success; @@ -330,33 +330,33 @@ bool haveFamily(false); QString attrName; - QXmlStreamAttributes attrs = attributes(); + QXmlStreamAttributes attrs = attributes(); - foreach (const QXmlStreamAttribute &attr, attrs) { - attrName = attr.name().toString(); + foreach (const QXmlStreamAttribute &attr, attrs) { + attrName = attr.name().toString(); - if (attrName == TYPEFACE_ROLE_ATT) { - role = attr.value().toString(); + if (attrName == TYPEFACE_ROLE_ATT) { + role = attr.value().toString(); if (!role.isEmpty()) { - haveRole = true; + haveRole = true; } - } - else if (attrName == TYPEFACE_FAMILY_ATT) { - family = attr.value().toString(); + } + else if (attrName == TYPEFACE_FAMILY_ATT) { + family = attr.value().toString(); if (!role.isEmpty()) { - haveFamily = true; + haveFamily = true; } - } - else if (attrName == TYPEFACE_WEIGHT_ATT) { - if (attr.value().toString() == TYPEFACE_ATT_VAL_BOLD) - isBold = true; - } - else if (attrName == TYPEFACE_ALIASFAMILY_ATT) { - aliasFamily = attr.value().toString(); - } - else { - qDebug("Unrecognized attribute"); - } + } + else if (attrName == TYPEFACE_WEIGHT_ATT) { + if (attr.value().toString() == TYPEFACE_ATT_VAL_BOLD) + isBold = true; + } + else if (attrName == TYPEFACE_ALIASFAMILY_ATT) { + aliasFamily = attr.value().toString(); + } + else { + qDebug("Unrecognized attribute"); + } } return haveRole && haveFamily; @@ -375,31 +375,31 @@ */ bool HbTypefaceXmlParser::readMetric(int &textHeight, int &size, int&baseline) { - bool atEnd(false); - bool success(false); + bool atEnd(false); + bool success(false); - textHeight = -1; - size = -1; - baseline = -1; + textHeight = -1; + size = -1; + baseline = -1; while (!atEnd && !success) { - QXmlStreamReader::TokenType type = readNext(); + QXmlStreamReader::TokenType type = readNext(); if(type == QXmlStreamReader::Invalid) break; - if (isEndElement()) { - if(name() == TYPEFACE_METRICS) { - atEnd = true; - } - } - else if (isStartElement()) { - if (name() == TYPEFACE_METRICS_POINT) { - success = readMetricItem(textHeight, size, baseline); - } - } - else { - // Nothing. Some other type of element; - } + if (isEndElement()) { + if(name() == TYPEFACE_METRICS) { + atEnd = true; + } + } + else if (isStartElement()) { + if (name() == TYPEFACE_METRICS_POINT) { + success = readMetricItem(textHeight, size, baseline); + } + } + else { + // Nothing. Some other type of element; + } } return success; @@ -415,24 +415,24 @@ QString attrName; QString attrValue; - QXmlStreamAttributes attrs = attributes(); + QXmlStreamAttributes attrs = attributes(); - foreach (const QXmlStreamAttribute &attr, attrs) { - attrName = attr.name().toString(); - attrValue = attr.value().toString(); + foreach (const QXmlStreamAttribute &attr, attrs) { + attrName = attr.name().toString(); + attrValue = attr.value().toString(); - if (attrName == TYPEFACE_TEXTHEIGHT_ATT) { - textHeight = attrValue.toInt(); - } - else if (attrName == TYPEFACE_SIZE_ATT) { - size = attrValue.toInt(); - } - else if (attrName == TYPEFACE_BASELINE_ATT) { - baseline = attrValue.toInt(); - } - else { - qDebug() << "Unrecognized attribute: " << attrName; - } + if (attrName == TYPEFACE_TEXTHEIGHT_ATT) { + textHeight = attrValue.toInt(); + } + else if (attrName == TYPEFACE_SIZE_ATT) { + size = attrValue.toInt(); + } + else if (attrName == TYPEFACE_BASELINE_ATT) { + baseline = attrValue.toInt(); + } + else { + qDebug() << "Unrecognized attribute: " << attrName; + } } return (textHeight>0 && size>0); @@ -443,10 +443,10 @@ */ void HbTypefaceXmlParser::close() { - clear(); - if (mFile && mFile->isOpen()) { - mFile->close(); // Device is owned externally from streamreader - } + clear(); + if (mFile && mFile->isOpen()) { + mFile->close(); // Device is owned externally from streamreader + } } /*! @@ -456,7 +456,7 @@ */ const QString HbTypefaceXmlParser::metricsTypefaceFamily() const { - return mCurrentFamily; + return mCurrentFamily; } // End of File diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/utils/hbtypefacexmlparser_p.h --- a/src/hbcore/utils/hbtypefacexmlparser_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/utils/hbtypefacexmlparser_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -37,10 +37,10 @@ class QIODevice; QT_END_NAMESPACE -#ifdef Q_OS_SYMBIAN - #define TYPEFACE_RESOURCE_FOLDER "z:\\resource\\fonts" +#ifdef Q_OS_SYMBIAN + #define TYPEFACE_RESOURCE_FOLDER "z:\\resource\\fonts" #else - #define TYPEFACE_RESOURCE_FOLDER HB_RESOURCES_DIR + #define TYPEFACE_RESOURCE_FOLDER HB_RESOURCES_DIR #endif class HB_AUTOTEST_EXPORT HbTypefaceXmlParser : public QXmlStreamReader @@ -65,18 +65,18 @@ bool readMapping(QString &role, QString &family, QString &aliasFamily, bool &isBold); bool readMetric(int &textHeight, int &size, int &baseline); const QString metricsTypefaceFamily() const; - bool readAndPositionTypefaceSet(); + bool readAndPositionTypefaceSet(); void close(); private: bool readMapItem(QString &role, QString &family, QString &aliasFamily, bool &isBold); bool readMetricItem(int &textHeight, int &size, int &baseline); - bool matchLanguageAndCountry() const; + bool matchLanguageAndCountry() const; private: - QString mFilePath; - QFile *mFile; - QString mCurrentFamily; + QString mFilePath; + QFile *mFile; + QString mCurrentFamily; }; #endif // HBTYPEFACEXMLPARSER_P_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/utils/hbwidgetloader.cpp --- a/src/hbcore/utils/hbwidgetloader.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/utils/hbwidgetloader.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -334,20 +334,20 @@ //qDebug() << "Cached layout currently contains" << HbWidgetLoaderActions::mCacheLayout.count() << "items"; #endif bool cacheHit = (name == staticCacheName - && section == staticCacheSection - && fileName == staticCacheFileName - && info.lastModified() == staticCacheModified); - + && section == staticCacheSection + && fileName == staticCacheFileName + && info.lastModified() == staticCacheModified); + if (cacheHit){ #ifdef HB_WIDGETLOADER_DEBUG qDebug() << "Cache hit."; #endif layoutDef = staticCacheLayout; - return true; + return true; } #ifdef HB_WIDGETLOADER_DEBUG - qDebug() << "Cache miss, reloading cache data"; + qDebug() << "Cache miss, reloading cache data"; #endif QFile file(fileName); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/utils/hbwidgetloadersyntax_p.cpp --- a/src/hbcore/utils/hbwidgetloadersyntax_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/utils/hbwidgetloadersyntax_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -248,7 +248,7 @@ // Construct layout from layout definition retVal = mActions->createAnchorLayout(QString(), false); for (int i = 0; retVal && i < layoutDef->anchorItems.count(); i++){ - const HbWidgetLoader::AnchorItem &item = layoutDef->anchorItems.at(i); + const HbWidgetLoader::AnchorItem &item = layoutDef->anchorItems.at(i); HbXmlLengthValue minLength, prefLength, maxLength; minLength.mType = item.minType; minLength.mValue = item.minVal; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/utils/hbxmlloaderabstractsyntax_p.h --- a/src/hbcore/utils/hbxmlloaderabstractsyntax_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/utils/hbxmlloaderabstractsyntax_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -188,7 +188,7 @@ ATTR_VERTICALPOLICY, ATTR_HORIZONTALSTRETCH, ATTR_VERTICALSTRETCH, - ATTR_COMMENT, + ATTR_COMMENT, ATTR_WIDGET, ATTR_VERSION, ATTR_FONTSPECROLE, diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/utils/hbxmlloaderbaseactions_p.cpp --- a/src/hbcore/utils/hbxmlloaderbaseactions_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/utils/hbxmlloaderbaseactions_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -303,17 +303,17 @@ if( ! mContext.isEmpty() ) { QByteArray contextUtf8(mContext.toUtf8()); QByteArray valueUtf8(value.toUtf8()); - - if (comment.isEmpty()) { - return QCoreApplication::translate( - contextUtf8.data(), valueUtf8.data(), - 0, QCoreApplication::UnicodeUTF8 ); - } else { - QByteArray commentUtf8(comment.toUtf8()); - return QCoreApplication::translate( - contextUtf8.data(), valueUtf8.data(), - commentUtf8.data(), QCoreApplication::UnicodeUTF8 ); - } + + if (comment.isEmpty()) { + return QCoreApplication::translate( + contextUtf8.data(), valueUtf8.data(), + 0, QCoreApplication::UnicodeUTF8 ); + } else { + QByteArray commentUtf8(comment.toUtf8()); + return QCoreApplication::translate( + contextUtf8.data(), valueUtf8.data(), + commentUtf8.data(), QCoreApplication::UnicodeUTF8 ); + } } else { return value; } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/utils/hbxmlloaderbaseactions_p.h --- a/src/hbcore/utils/hbxmlloaderbaseactions_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/utils/hbxmlloaderbaseactions_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -77,7 +77,7 @@ QGraphicsWidget* findWidget(const QString &name); QObject* findObject(const QString &name); - public: + public: virtual bool pushDocument(const QString& context); virtual bool pop(const HbXml::ElementType type); @@ -96,7 +96,7 @@ bool toPixels(const HbXmlLengthValue &lengthVal, qreal& result) const; QString translate(const QString &value, const QString &comment); Hb::Edge getAnchorOppositeEdge( Hb::Edge edge ) const; - + protected: QString mContext; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/utils/hbxmlloaderbasesyntax_p.cpp --- a/src/hbcore/utils/hbxmlloaderbasesyntax_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/utils/hbxmlloaderbasesyntax_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -463,7 +463,7 @@ bool HbXmlLoaderBaseSyntax::readContainerStartItem() { - qWarning() << "Internal error, wrong container type, line " << mReader.lineNumber(); + qWarning() << "Internal error, wrong container type, line " << mReader.lineNumber(); return false; } @@ -479,7 +479,7 @@ bool HbXmlLoaderBaseSyntax::readLayoutStartItem() { - qWarning() << "Internal error, wrong layout type, line " << mReader.lineNumber(); + qWarning() << "Internal error, wrong layout type, line " << mReader.lineNumber(); return false; } @@ -716,13 +716,13 @@ bool HbXmlLoaderBaseSyntax::processLayout() { - qWarning() << "Unknown layout type, line " << mReader.lineNumber(); + qWarning() << "Unknown layout type, line " << mReader.lineNumber(); return false; } bool HbXmlLoaderBaseSyntax::processContainer() { - qWarning() << "Unknown container type, line " << mReader.lineNumber(); + qWarning() << "Unknown container type, line " << mReader.lineNumber(); return false; } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/vkbhosts/hbabstractvkbhost.cpp --- a/src/hbcore/vkbhosts/hbabstractvkbhost.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/vkbhosts/hbabstractvkbhost.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -249,7 +249,7 @@ // move the container up when hiding the title and status bars if (isTitleOrStatusBarVisible) { - mContainerMovementVector.setY(visibleArea.top() - currentView->sceneBoundingRect().top()); + mContainerMovementVector.setY(visibleArea.top() - currentView->sceneBoundingRect().top()); } if (visibleArea.contains(containerArea)) { @@ -274,7 +274,7 @@ QRectF editorGeometry = mInputMethod->focusObject()->editorGeometry(); editorGeometry.adjust(0.0, -HbCursorLineMargin, 0.0, HbCursorLineMargin); - // calculate the new editor position after hiding the title bars + // calculate the new editor position after hiding the title bars editorGeometry.translate(mContainerMovementVector); // Then see if the editor is already inside the visible area. @@ -312,7 +312,7 @@ // calculate the new cursor position after hiding the title bars microFocus.translate(mContainerMovementVector); - + // Check whether the cursor rectangle is inside visible area. if (!visibleArea.contains(microFocus)) { QRectF realEditorGeometry = editorGeometry; @@ -339,12 +339,12 @@ } } else { mContainerMovementVector += QPointF(0.0, visibleArea.bottom() - microFocus.bottom()); - } + } return true; } if (adjustContainer && adjustContainerPosition()) { return true; - } + } } else { // It is going to be closed or minimized. mContainerMovementVector = mOriginalContainerPosition - mContainerMovementStartingPoint; @@ -464,7 +464,7 @@ mCallback->aboutToClose(q_ptr); if (prepareAnimations(HbVkbHost::HbVkbStatusClosed)) { - // show the title bar and status bar when closing the vkb + // show the title bar and status bar when closing the vkb setTitleAndStatusBarVisible(true); mKeypadStatus = HbVkbHost::HbVkbStatusClosed; @@ -479,7 +479,7 @@ mCallback->aboutToClose(q_ptr); if (mContainerWidget->widgetObject()) { if (prepareAnimations(HbVkbHost::HbVkbStatusMinimized)) { - //show the title bar and status bar when minimizing the vkb + //show the title bar and status bar when minimizing the vkb setTitleAndStatusBarVisible(true); mKeypadStatus = HbVkbHost::HbVkbStatusMinimized; @@ -503,7 +503,7 @@ q_ptr->resizeKeyboard(); // Make sure that the keyboard doesn't exceed given boundaries. } if (prepareAnimations(HbVkbHost::HbVkbStatusOpened)) { - // hide the title bar and status bar when opening the vkb + // hide the title bar and status bar when opening the vkb setTitleAndStatusBarVisible(false); if (!disableCursorShift()) { @@ -672,6 +672,12 @@ } void HbAbstractVkbHostPrivate::setTitleAndStatusBarVisible(bool visible) { + // should not change the title bar and status bar visibility when the keypad is opened from a popup + HbPopup *popup = qobject_cast(mContainerWidget->widgetObject()); + if (popup) { + return; + } + HbMainWindow *mainWin = mainWindow(); HbView *currentView; @@ -690,7 +696,7 @@ } if (mTitleBarHiddenByVkbHost || mStatusBarHiddenByVkbHost) { setFlags |= HbView::ViewDisableRelayout; - } + } currentView->setViewFlags(flags | setFlags); } else { if ((flags & HbView::ViewDisableRelayout) && (mTitleBarHiddenByVkbHost || @@ -716,7 +722,7 @@ if (!mInputMethod || !mInputMethod->focusObject()) { return result; } - // Calculate the area that remains visible when the keypad is open. + // Calculate the area that remains visible when the keypad is open. QRectF visibleArea = QRectF(0.0, 0.0, mScreenSize.width(), mScreenSize.height() - mKeypad->size().height()); QRectF microFocus = mInputMethod->focusObject()->microFocus(); microFocus.adjust(0.0, -HbEditorExtraMargin, 0.0, HbEditorExtraMargin); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/vkbhosts/hbabstractvkbhost_p.h --- a/src/hbcore/vkbhosts/hbabstractvkbhost_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/vkbhosts/hbabstractvkbhost_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -90,7 +90,7 @@ QSizeF screenSize() const; bool disableCursorShift(); void setTitleAndStatusBarVisible(bool visible); - virtual bool adjustContainerPosition(); + virtual bool adjustContainerPosition(); public: HbAbstractVkbHost *q_ptr; HbVirtualKeyboard *mCallback; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbfeedback/player/hbcontinuousfeedback.cpp --- a/src/hbfeedback/player/hbcontinuousfeedback.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbfeedback/player/hbcontinuousfeedback.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -121,7 +121,7 @@ /*! Returns the timeout value of the feedback in milliseconds. The continuous feedback is automatically stopped if it is not updated within the timeout - (by subsequent calls to play()). + (by subsequent calls to play()). \sa setTimeout(), play() */ @@ -182,8 +182,8 @@ Sets the timeout value in milliseconds. The continuous feedback is automatically stopped if the continuous feedback is not updated within the timeout (by subsequent calls to play()). This is a safety mechanism - to prevent situations in which the client fails to explicitly stop() - a continuous feedback effect. The default timeout value is + to prevent situations in which the client fails to explicitly stop() + a continuous feedback effect. The default timeout value is HbFeedback::StandardFeedbackTimeout. \sa timeout() @@ -212,8 +212,8 @@ /*! Starts/updates the currently set continuous feedback effect. The feedback effect will be played until the timeout is reached - or a call to stop() is made. - + or a call to stop() is made. + \sa stop() */ void HbContinuousFeedback::play() diff -r 4633027730f5 -r e6ad4ef83b23 src/hbfeedback/player/hbfeedbackplayer_symbian.cpp --- a/src/hbfeedback/player/hbfeedbackplayer_symbian.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbfeedback/player/hbfeedbackplayer_symbian.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -58,7 +58,7 @@ inline TTacticonType convertTacticonToSymbian(HbFeedback::InstantEffect effect); inline TTouchContinuousFeedback convertToSymbian(HbFeedback::ContinuousEffect effect); inline TTouchFeedbackType convertToSymbian(HbFeedback::Modalities modalities); - + public: MTouchFeedback *iFeedback; RTacticon iTacticon; @@ -184,7 +184,7 @@ case HbFeedback::BasicKeypad: instantFeedbackSymbian = ETouchFeedbackBasicKeypad; break; - case HbFeedback::MultitouchActivate: + case HbFeedback::AdvancedGestureActivate: instantFeedbackSymbian = ETouchFeedbackMultitouchActivate; break; case HbFeedback::RotateStep: diff -r 4633027730f5 -r e6ad4ef83b23 src/hbinput/defs/bwins/HbInputu.def --- a/src/hbinput/defs/bwins/HbInputu.def Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbinput/defs/bwins/HbInputu.def Thu Sep 02 20:44:51 2010 +0300 @@ -2,7 +2,7 @@ ?trUtf8@HbCandidateList@@SA?AVQString@@PBD0@Z @ 1 NONAME ; class QString HbCandidateList::trUtf8(char const *, char const *) ?trUtf8@HbCandidateList@@SA?AVQString@@PBD0H@Z @ 2 NONAME ; class QString HbCandidateList::trUtf8(char const *, char const *, int) ??1HbInputCnListPreSymbolModel@@UAE@XZ @ 3 NONAME ABSENT ; HbInputCnListPreSymbolModel::~HbInputCnListPreSymbolModel(void) - ?staticMetaObject@HbInputVirtualRocker@@2UQMetaObject@@B @ 4 NONAME ; struct QMetaObject const HbInputVirtualRocker::staticMetaObject + ?staticMetaObject@HbInputVirtualRocker@@2UQMetaObject@@B @ 4 NONAME ABSENT ; struct QMetaObject const HbInputVirtualRocker::staticMetaObject ??1HbInputCnKeypad@@UAE@XZ @ 5 NONAME ABSENT ; HbInputCnKeypad::~HbInputCnKeypad(void) ?setFade@HbTouchKeypadButton@@QAEX_N@Z @ 6 NONAME ABSENT ; void HbTouchKeypadButton::setFade(bool) ?itemVerticalSpacing@HbInputCnListView@@QBEMXZ @ 7 NONAME ABSENT ; float HbInputCnListView::itemVerticalSpacing(void) const @@ -57,7 +57,7 @@ ??_EHbInputUsedSymbolPane@@UAE@I@Z @ 56 NONAME ABSENT ; HbInputUsedSymbolPane::~HbInputUsedSymbolPane(unsigned int) ?enableLongKeyPressEvents@HbInputSctLandscape@@UAEXAAV?$QList@H@@@Z @ 57 NONAME ABSENT ; void HbInputSctLandscape::enableLongKeyPressEvents(class QList &) ?tr@HbRangeBar@@SA?AVQString@@PBD0H@Z @ 58 NONAME ABSENT ; class QString HbRangeBar::tr(char const *, char const *, int) - ?getStaticMetaObject@HbInputVirtualRocker@@SAABUQMetaObject@@XZ @ 59 NONAME ; struct QMetaObject const & HbInputVirtualRocker::getStaticMetaObject(void) + ?getStaticMetaObject@HbInputVirtualRocker@@SAABUQMetaObject@@XZ @ 59 NONAME ABSENT ; struct QMetaObject const & HbInputVirtualRocker::getStaticMetaObject(void) ??1HbInputTabBar@@UAE@XZ @ 60 NONAME ABSENT ; HbInputTabBar::~HbInputTabBar(void) ?setExpandedRowCount@HbInputCnListView@@QAEXH@Z @ 61 NONAME ABSENT ; void HbInputCnListView::setExpandedRowCount(int) ?trUtf8@HbInputModeIndicator@@SA?AVQString@@PBD0H@Z @ 62 NONAME ; class QString HbInputModeIndicator::trUtf8(char const *, char const *, int) @@ -66,7 +66,7 @@ ?currentCandidate@HbCandidateList@@QAE?AVQString@@XZ @ 65 NONAME ; class QString HbCandidateList::currentCandidate(void) ?keypadLayout@HbInputVkbWidget@@MAEPAVQGraphicsLayout@@XZ @ 66 NONAME ABSENT ; class QGraphicsLayout * HbInputVkbWidget::keypadLayout(void) ?staticMetaObject@HbWritingBox@@2UQMetaObject@@B @ 67 NONAME ABSENT ; struct QMetaObject const HbWritingBox::staticMetaObject - ?selectionMode@HbInputVirtualRocker@@QBE?AW4RockerSelectionMode@1@XZ @ 68 NONAME ; enum HbInputVirtualRocker::RockerSelectionMode HbInputVirtualRocker::selectionMode(void) const + ?selectionMode@HbInputVirtualRocker@@QBE?AW4RockerSelectionMode@1@XZ @ 68 NONAME ABSENT ; enum HbInputVirtualRocker::RockerSelectionMode HbInputVirtualRocker::selectionMode(void) const ?staticMetaObject@HbInputTabBar@@2UQMetaObject@@B @ 69 NONAME ABSENT ; struct QMetaObject const HbInputTabBar::staticMetaObject ??1HbTouchKeypadButton@@UAE@XZ @ 70 NONAME ABSENT ; HbTouchKeypadButton::~HbTouchKeypadButton(void) ?d_func@HbInputCnListModel@@AAEPAVHbInputCnListModelPrivate@@XZ @ 71 NONAME ABSENT ; class HbInputCnListModelPrivate * HbInputCnListModel::d_func(void) @@ -128,7 +128,7 @@ ?setText@HbExactWordPopup@@QAEXABVQString@@@Z @ 127 NONAME ; void HbExactWordPopup::setText(class QString const &) ?trUtf8@HbInputCnScrollKeypad@@SA?AVQString@@PBD0@Z @ 128 NONAME ABSENT ; class QString HbInputCnScrollKeypad::trUtf8(char const *, char const *) ?listModel@HbInputCnListCompositior@@IAEPAVHbInputCnListModel@@XZ @ 129 NONAME ABSENT ; class HbInputCnListModel * HbInputCnListCompositior::listModel(void) - ?d_func@HbInputVirtualRocker@@AAEPAVHbInputVirtualRockerPrivate@@XZ @ 130 NONAME ; class HbInputVirtualRockerPrivate * HbInputVirtualRocker::d_func(void) + ?d_func@HbInputVirtualRocker@@AAEPAVHbInputVirtualRockerPrivate@@XZ @ 130 NONAME ABSENT ; class HbInputVirtualRockerPrivate * HbInputVirtualRocker::d_func(void) ?tr@HbInputCnListView@@SA?AVQString@@PBD0@Z @ 131 NONAME ABSENT ; class QString HbInputCnListView::tr(char const *, char const *) ?trUtf8@HbTouchKeypadButton@@SA?AVQString@@PBD0H@Z @ 132 NONAME ABSENT ; class QString HbTouchKeypadButton::trUtf8(char const *, char const *, int) ??0HbInputCustomButtonList@@QAE@AAV?$QList@PAVHbAction@@@@PAVHbInputVkbWidget@@PAVQGraphicsWidget@@@Z @ 133 NONAME ABSENT ; HbInputCustomButtonList::HbInputCustomButtonList(class QList &, class HbInputVkbWidget *, class QGraphicsWidget *) @@ -156,7 +156,7 @@ ?text@HbExactWordPopup@@QAE?AVQString@@XZ @ 155 NONAME ; class QString HbExactWordPopup::text(void) ?setPenWidth@HbWritingBox@@QAEXH@Z @ 156 NONAME ABSENT ; void HbWritingBox::setPenWidth(int) ?metaObject@HbInputCnListView@@UBEPBUQMetaObject@@XZ @ 157 NONAME ABSENT ; struct QMetaObject const * HbInputCnListView::metaObject(void) const - ?tr@HbInputVirtualRocker@@SA?AVQString@@PBD0@Z @ 158 NONAME ; class QString HbInputVirtualRocker::tr(char const *, char const *) + ?tr@HbInputVirtualRocker@@SA?AVQString@@PBD0@Z @ 158 NONAME ABSENT ; class QString HbInputVirtualRocker::tr(char const *, char const *) ?setOwner@HbInputCnListCompositior@@QAEXPAVHbInputCnListView@@@Z @ 159 NONAME ABSENT ; void HbInputCnListCompositior::setOwner(class HbInputCnListView *) ?getStaticMetaObject@HbCharPreviewPane@@SAABUQMetaObject@@XZ @ 160 NONAME ABSENT ; struct QMetaObject const & HbCharPreviewPane::getStaticMetaObject(void) ?executeMethodDialog@HbInputVkbWidget@@QAEXXZ @ 161 NONAME ; void HbInputVkbWidget::executeMethodDialog(void) @@ -194,7 +194,7 @@ ??_EHbInputCnListPreSymbolModel@@UAE@I@Z @ 193 NONAME ABSENT ; HbInputCnListPreSymbolModel::~HbInputCnListPreSymbolModel(unsigned int) ?sctCharacterSelected@HbInputUsedSymbolPane@@IAEXVQChar@@@Z @ 194 NONAME ABSENT ; void HbInputUsedSymbolPane::sctCharacterSelected(class QChar) ?d_func@HbInputCnTchButton@@AAEPAVHbInputCnTchButtonPrivate@@XZ @ 195 NONAME ABSENT ; class HbInputCnTchButtonPrivate * HbInputCnTchButton::d_func(void) - ?mousePressEvent@HbInputVirtualRocker@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 196 NONAME ; void HbInputVirtualRocker::mousePressEvent(class QGraphicsSceneMouseEvent *) + ?mousePressEvent@HbInputVirtualRocker@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 196 NONAME ABSENT ; void HbInputVirtualRocker::mousePressEvent(class QGraphicsSceneMouseEvent *) ?tr@HbInputSpell@@SA?AVQString@@PBD0@Z @ 197 NONAME ABSENT ; class QString HbInputSpell::tr(char const *, char const *) ?elideMode@HbInputSpell@@QBE?AW4TextElideMode@Qt@@XZ @ 198 NONAME ABSENT ; enum Qt::TextElideMode HbInputSpell::elideMode(void) const ?primaryLanguageChanged@HbInputSettingDialog@@QAEXH@Z @ 199 NONAME ABSENT ; void HbInputSettingDialog::primaryLanguageChanged(int) @@ -218,7 +218,7 @@ ?qt_metacast@HbInputCnTchButton@@UAEPAXPBD@Z @ 217 NONAME ABSENT ; void * HbInputCnTchButton::qt_metacast(char const *) ?trUtf8@HbInputCnListView@@SA?AVQString@@PBD0H@Z @ 218 NONAME ABSENT ; class QString HbInputCnListView::trUtf8(char const *, char const *, int) ?mousePressEvent@HbInputSpell@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 219 NONAME ABSENT ; void HbInputSpell::mousePressEvent(class QGraphicsSceneMouseEvent *) - ?qt_metacast@HbInputVirtualRocker@@UAEPAXPBD@Z @ 220 NONAME ; void * HbInputVirtualRocker::qt_metacast(char const *) + ?qt_metacast@HbInputVirtualRocker@@UAEPAXPBD@Z @ 220 NONAME ABSENT ; void * HbInputVirtualRocker::qt_metacast(char const *) ?tr@HbInputSctLandscape@@SA?AVQString@@PBD0H@Z @ 221 NONAME ABSENT ; class QString HbInputSctLandscape::tr(char const *, char const *, int) ?qt_metacast@HbInputCnListModel@@UAEPAXPBD@Z @ 222 NONAME ABSENT ; void * HbInputCnListModel::qt_metacast(char const *) ?expandedRowCount@HbInputCnListView@@QBEHXZ @ 223 NONAME ABSENT ; int HbInputCnListView::expandedRowCount(void) const @@ -246,7 +246,7 @@ ?listDrawInfoByPages@HbInputCnListCompositior@@QAE?AV?$QVector@VHbCnListCandiDrawInfo@@@@HH@Z @ 245 NONAME ABSENT ; class QVector HbInputCnListCompositior::listDrawInfoByPages(int, int) ?enteredInNonStickyRegion@HbTouchKeypadButton@@IAEXXZ @ 246 NONAME ABSENT ; void HbTouchKeypadButton::enteredInNonStickyRegion(void) ?text@HbInputSpell@@QBEABVQString@@XZ @ 247 NONAME ABSENT ; class QString const & HbInputSpell::text(void) const - ?isRockerVisible@HbInputVkbWidget@@UBE_NXZ @ 248 NONAME ; bool HbInputVkbWidget::isRockerVisible(void) const + ?isRockerVisible@HbInputVkbWidget@@UBE_NXZ @ 248 NONAME ABSENT ; bool HbInputVkbWidget::isRockerVisible(void) const ?sendKeypadEvent@HbInputCnScrollKeypad@@AAEXW4HbCnWidgetEventType@@HVQChar@@@Z @ 249 NONAME ABSENT ; void HbInputCnScrollKeypad::sendKeypadEvent(enum HbCnWidgetEventType, int, class QChar) ?inputMode@HbInputCnModel@@QAE?AV?$QFlags@W4HbInputModeTypeFlag@@@@XZ @ 250 NONAME ABSENT ; class QFlags HbInputCnModel::inputMode(void) ?candsListFromPredictEng@HbInputCnModel@@QAEXHHAAVQStringList@@@Z @ 251 NONAME ABSENT ; void HbInputCnModel::candsListFromPredictEng(int, int, class QStringList &) @@ -265,12 +265,12 @@ ??0HbInputTabBar@@QAE@PAVHbInputVkbWidget@@PAVQGraphicsItem@@@Z @ 264 NONAME ABSENT ; HbInputTabBar::HbInputTabBar(class HbInputVkbWidget *, class QGraphicsItem *) ?asGraphicsWidget@HbInputVkbWidget@@UAEPAVQGraphicsWidget@@XZ @ 265 NONAME ; class QGraphicsWidget * HbInputVkbWidget::asGraphicsWidget(void) ??0HbInputCnListModel@@IAE@AAVHbInputCnListModelPrivate@@@Z @ 266 NONAME ABSENT ; HbInputCnListModel::HbInputCnListModel(class HbInputCnListModelPrivate &) - ?qt_metacall@HbInputVirtualRocker@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 267 NONAME ; int HbInputVirtualRocker::qt_metacall(enum QMetaObject::Call, int, void * *) + ?qt_metacall@HbInputVirtualRocker@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 267 NONAME ABSENT ; int HbInputVirtualRocker::qt_metacall(enum QMetaObject::Call, int, void * *) ?characterFinished@HbWritingBox@@QAEXXZ @ 268 NONAME ABSENT ; void HbWritingBox::characterFinished(void) ??_EHbInputCnScrollKeypad@@UAE@I@Z @ 269 NONAME ABSENT ; HbInputCnScrollKeypad::~HbInputCnScrollKeypad(unsigned int) ?notifyDataUpdated@HbInputCnListCandModel@@UAEX_N@Z @ 270 NONAME ABSENT ; void HbInputCnListCandModel::notifyDataUpdated(bool) ??1Hb12KeyTouchKeypad@@UAE@XZ @ 271 NONAME ABSENT ; Hb12KeyTouchKeypad::~Hb12KeyTouchKeypad(void) - ?rockerDirection@HbInputVirtualRocker@@IAEXHW4RockerSelectionMode@1@@Z @ 272 NONAME ; void HbInputVirtualRocker::rockerDirection(int, enum HbInputVirtualRocker::RockerSelectionMode) + ?rockerDirection@HbInputVirtualRocker@@IAEXHW4RockerSelectionMode@1@@Z @ 272 NONAME ABSENT ; void HbInputVirtualRocker::rockerDirection(int, enum HbInputVirtualRocker::RockerSelectionMode) ?getStaticMetaObject@HbInputSettingDialog@@SAABUQMetaObject@@XZ @ 273 NONAME ABSENT ; struct QMetaObject const & HbInputSettingDialog::getStaticMetaObject(void) ?virtualButtonReleased@HbInputCnKeypad@@QAEXH@Z @ 274 NONAME ABSENT ; void HbInputCnKeypad::virtualButtonReleased(int) ??1HbInputSctLandscape@@UAE@XZ @ 275 NONAME ABSENT ; HbInputSctLandscape::~HbInputSctLandscape(void) @@ -289,7 +289,7 @@ ?getStaticMetaObject@HbInputSpell@@SAABUQMetaObject@@XZ @ 288 NONAME ABSENT ; struct QMetaObject const & HbInputSpell::getStaticMetaObject(void) ?setFade@HbRange@@QAEX_N@Z @ 289 NONAME ABSENT ; void HbRange::setFade(bool) ?releaseButton@HbInputCnTchButton@@QAEX_N@Z @ 290 NONAME ABSENT ; void HbInputCnTchButton::releaseButton(bool) - ?setRockerVisible@HbInputVkbWidget@@UAEX_N@Z @ 291 NONAME ; void HbInputVkbWidget::setRockerVisible(bool) + ?setRockerVisible@HbInputVkbWidget@@UAEX_N@Z @ 291 NONAME ABSENT ; void HbInputVkbWidget::setRockerVisible(bool) ?qt_metacall@HbInputCnTchButton@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 292 NONAME ABSENT ; int HbInputCnTchButton::qt_metacall(enum QMetaObject::Call, int, void * *) ?hoverEnterEvent@HbInputSpell@@MAEXPAVQGraphicsSceneHoverEvent@@@Z @ 293 NONAME ABSENT ; void HbInputSpell::hoverEnterEvent(class QGraphicsSceneHoverEvent *) ?tr@HbInputCnListView@@SA?AVQString@@PBD0H@Z @ 294 NONAME ABSENT ; class QString HbInputCnListView::tr(char const *, char const *, int) @@ -314,16 +314,16 @@ ?selectACand@HbInputCnModel@@QAE_NH@Z @ 313 NONAME ABSENT ; bool HbInputCnModel::selectACand(int) ?updateIndicator@HbInputModeIndicator@@QAEXXZ @ 314 NONAME ; void HbInputModeIndicator::updateIndicator(void) ??_EHbInputCnListView@@UAE@I@Z @ 315 NONAME ABSENT ; HbInputCnListView::~HbInputCnListView(unsigned int) - ??1HbInputVirtualRocker@@UAE@XZ @ 316 NONAME ; HbInputVirtualRocker::~HbInputVirtualRocker(void) + ??1HbInputVirtualRocker@@UAE@XZ @ 316 NONAME ABSENT ; HbInputVirtualRocker::~HbInputVirtualRocker(void) ??0HbInputCnListVItutCompositior@@QAE@PAVHbInputCnListModel@@@Z @ 317 NONAME ABSENT ; HbInputCnListVItutCompositior::HbInputCnListVItutCompositior(class HbInputCnListModel *) ?d_func@HbInputCnModel@@ABEPBVHbInputCnModelPrivate@@XZ @ 318 NONAME ABSENT ; class HbInputCnModelPrivate const * HbInputCnModel::d_func(void) const ?shrinkList@HbInputCnTouchListView@@QAEXXZ @ 319 NONAME ABSENT ; void HbInputCnTouchListView::shrinkList(void) ?resizeEvent@HbTouchKeypadButton@@MAEXPAVQGraphicsSceneResizeEvent@@@Z @ 320 NONAME ABSENT ; void HbTouchKeypadButton::resizeEvent(class QGraphicsSceneResizeEvent *) - ??0HbInputVirtualRocker@@IAE@AAVHbInputVirtualRockerPrivate@@PAVQGraphicsWidget@@@Z @ 321 NONAME ; HbInputVirtualRocker::HbInputVirtualRocker(class HbInputVirtualRockerPrivate &, class QGraphicsWidget *) + ??0HbInputVirtualRocker@@IAE@AAVHbInputVirtualRockerPrivate@@PAVQGraphicsWidget@@@Z @ 321 NONAME ABSENT ; HbInputVirtualRocker::HbInputVirtualRocker(class HbInputVirtualRockerPrivate &, class QGraphicsWidget *) ?qt_metacall@HbInputSpell@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 322 NONAME ABSENT ; int HbInputSpell::qt_metacall(enum QMetaObject::Call, int, void * *) ?instance@HbInputCnModel@@SAPAV1@XZ @ 323 NONAME ABSENT ; class HbInputCnModel * HbInputCnModel::instance(void) ?getStaticMetaObject@HbTouchKeypadButton@@SAABUQMetaObject@@XZ @ 324 NONAME ABSENT ; struct QMetaObject const & HbTouchKeypadButton::getStaticMetaObject(void) - ?d_func@HbInputVirtualRocker@@ABEPBVHbInputVirtualRockerPrivate@@XZ @ 325 NONAME ; class HbInputVirtualRockerPrivate const * HbInputVirtualRocker::d_func(void) const + ?d_func@HbInputVirtualRocker@@ABEPBVHbInputVirtualRockerPrivate@@XZ @ 325 NONAME ABSENT ; class HbInputVirtualRockerPrivate const * HbInputVirtualRocker::d_func(void) const ?staticMetaObject@HbInputSpell@@2UQMetaObject@@B @ 326 NONAME ABSENT ; struct QMetaObject const HbInputSpell::staticMetaObject ?mouseReleaseEvent@HbTouchKeypadButton@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 327 NONAME ABSENT ; void HbTouchKeypadButton::mouseReleaseEvent(class QGraphicsSceneMouseEvent *) ?pageDown@HbInputCnListCompositior@@QAEXH@Z @ 328 NONAME ABSENT ; void HbInputCnListCompositior::pageDown(int) @@ -347,7 +347,7 @@ ?setLanguageToPredictEng@HbInputCnModel@@QAEXABVHbInputLanguage@@V?$QFlags@W4HbInputModeTypeFlag@@@@@Z @ 346 NONAME ABSENT ; void HbInputCnModel::setLanguageToPredictEng(class HbInputLanguage const &, class QFlags) ??1HbInputCnListHwrPredictCandModel@@UAE@XZ @ 347 NONAME ABSENT ; HbInputCnListHwrPredictCandModel::~HbInputCnListHwrPredictCandModel(void) ?dataList@HbInputCnListModel@@IAEPAV?$QList@VQVariant@@@@XZ @ 348 NONAME ABSENT ; class QList * HbInputCnListModel::dataList(void) - ?trUtf8@HbInputVirtualRocker@@SA?AVQString@@PBD0@Z @ 349 NONAME ; class QString HbInputVirtualRocker::trUtf8(char const *, char const *) + ?trUtf8@HbInputVirtualRocker@@SA?AVQString@@PBD0@Z @ 349 NONAME ABSENT ; class QString HbInputVirtualRocker::trUtf8(char const *, char const *) ?notifyDataUpdated@HbInputCnListPreCandModel@@UAEX_N@Z @ 350 NONAME ABSENT ; void HbInputCnListPreCandModel::notifyDataUpdated(bool) ?rectInfoList@HbInputCnListCompositior@@QAEPAV?$QVector@VHbCnListCandiDrawInfo@@@@XZ @ 351 NONAME ABSENT ; class QVector * HbInputCnListCompositior::rectInfoList(void) ?mousePressEvent@HbPreviewLabel@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 352 NONAME ABSENT ; void HbPreviewLabel::mousePressEvent(class QGraphicsSceneMouseEvent *) @@ -360,7 +360,7 @@ ?tr@HbInputUsedSymbolPane@@SA?AVQString@@PBD0@Z @ 359 NONAME ABSENT ; class QString HbInputUsedSymbolPane::tr(char const *, char const *) ?qt_metacall@HbQwertyKeyboard@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 360 NONAME ABSENT ; int HbQwertyKeyboard::qt_metacall(enum QMetaObject::Call, int, void * *) ?mousePressEvent@HbInputUsedSymbolPane@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 361 NONAME ABSENT ; void HbInputUsedSymbolPane::mousePressEvent(class QGraphicsSceneMouseEvent *) - ?tr@HbInputVirtualRocker@@SA?AVQString@@PBD0H@Z @ 362 NONAME ; class QString HbInputVirtualRocker::tr(char const *, char const *, int) + ?tr@HbInputVirtualRocker@@SA?AVQString@@PBD0H@Z @ 362 NONAME ABSENT ; class QString HbInputVirtualRocker::tr(char const *, char const *, int) ?tr@HbInputSettingDialog@@SA?AVQString@@PBD0@Z @ 363 NONAME ABSENT ; class QString HbInputSettingDialog::tr(char const *, char const *) ?preferredKeyboardSize@HbQwertyKeyboard@@UAE?AVQSizeF@@XZ @ 364 NONAME ABSENT ; class QSizeF HbQwertyKeyboard::preferredKeyboardSize(void) ?hideText@HbExactWordPopup@@QAEXXZ @ 365 NONAME ; void HbExactWordPopup::hideText(void) @@ -383,7 +383,7 @@ ??1HbQwertyKeyboard@@UAE@XZ @ 382 NONAME ABSENT ; HbQwertyKeyboard::~HbQwertyKeyboard(void) ??0HbInputVkbWidget@@IAE@AAVHbInputVkbWidgetPrivate@@PAVQGraphicsItem@@@Z @ 383 NONAME ; HbInputVkbWidget::HbInputVkbWidget(class HbInputVkbWidgetPrivate &, class QGraphicsItem *) ?tr@HbInputUsedSymbolPane@@SA?AVQString@@PBD0H@Z @ 384 NONAME ABSENT ; class QString HbInputUsedSymbolPane::tr(char const *, char const *, int) - ?rockerDirection@HbInputVkbWidget@@IAEXHW4RockerSelectionMode@HbInputVirtualRocker@@@Z @ 385 NONAME ; void HbInputVkbWidget::rockerDirection(int, enum HbInputVirtualRocker::RockerSelectionMode) + ?rockerDirection@HbInputVkbWidget@@IAEXHW4RockerSelectionMode@HbInputVirtualRocker@@@Z @ 385 NONAME ABSENT ; void HbInputVkbWidget::rockerDirection(int, enum HbInputVirtualRocker::RockerSelectionMode) ?isButtonRepeatEnabled@HbInputCnKeypad@@QAE_NH@Z @ 386 NONAME ABSENT ; bool HbInputCnKeypad::isButtonRepeatEnabled(int) ?tr@HbCandidateList@@SA?AVQString@@PBD0@Z @ 387 NONAME ; class QString HbCandidateList::tr(char const *, char const *) ??0HbInputCnListHwrPredictCandModel@@QAE@PAVQObject@@H@Z @ 388 NONAME ABSENT ; HbInputCnListHwrPredictCandModel::HbInputCnListHwrPredictCandModel(class QObject *, int) @@ -449,7 +449,7 @@ ?sendKeypadEvent@HbInputCnKeypad@@QAEXW4HbCnWidgetEventType@@HVQChar@@@Z @ 448 NONAME ABSENT ; void HbInputCnKeypad::sendKeypadEvent(enum HbCnWidgetEventType, int, class QChar) ?aboutToOpen@HbQwertyKeyboard@@UAEXPAVHbVkbHost@@@Z @ 449 NONAME ABSENT ; void HbQwertyKeyboard::aboutToOpen(class HbVkbHost *) ?qt_metacast@HbRangeBar@@UAEPAXPBD@Z @ 450 NONAME ABSENT ; void * HbRangeBar::qt_metacast(char const *) - ??0HbInputVirtualRocker@@QAE@PAVHbInputVkbWidget@@@Z @ 451 NONAME ; HbInputVirtualRocker::HbInputVirtualRocker(class HbInputVkbWidget *) + ??0HbInputVirtualRocker@@QAE@PAVHbInputVkbWidget@@@Z @ 451 NONAME ABSENT ; HbInputVirtualRocker::HbInputVirtualRocker(class HbInputVkbWidget *) ?owner@HbInputCnListCompositior@@QBEPAVHbInputCnListView@@XZ @ 452 NONAME ABSENT ; class HbInputCnListView * HbInputCnListCompositior::owner(void) const ??1HbInputSctPortrait@@UAE@XZ @ 453 NONAME ABSENT ; HbInputSctPortrait::~HbInputSctPortrait(void) ?metaObject@HbWritingBox@@UBEPBUQMetaObject@@XZ @ 454 NONAME ABSENT ; struct QMetaObject const * HbWritingBox::metaObject(void) const @@ -574,7 +574,7 @@ ??0HbInputCnScrollKeypad@@IAE@AAVHbInputCnScrollKeypadPrivate@@ABUHbCnKeypadConfigure@@PAVQGraphicsItem@@@Z @ 573 NONAME ABSENT ; HbInputCnScrollKeypad::HbInputCnScrollKeypad(class HbInputCnScrollKeypadPrivate &, struct HbCnKeypadConfigure const &, class QGraphicsItem *) ?enableAutoKeyRepeatEvents@HbInputSctLandscape@@UAEXAAV?$QList@H@@@Z @ 574 NONAME ABSENT ; void HbInputSctLandscape::enableAutoKeyRepeatEvents(class QList &) ??_EHbRangeBar@@UAE@I@Z @ 575 NONAME ABSENT ; HbRangeBar::~HbRangeBar(unsigned int) - ?trUtf8@HbInputVirtualRocker@@SA?AVQString@@PBD0H@Z @ 576 NONAME ; class QString HbInputVirtualRocker::trUtf8(char const *, char const *, int) + ?trUtf8@HbInputVirtualRocker@@SA?AVQString@@PBD0H@Z @ 576 NONAME ABSENT ; class QString HbInputVirtualRocker::trUtf8(char const *, char const *, int) ?d_func@Hb12KeyTouchKeypad@@AAEPAVHb12KeyTouchKeypadPrivate@@XZ @ 577 NONAME ABSENT ; class Hb12KeyTouchKeypadPrivate * Hb12KeyTouchKeypad::d_func(void) ?secondaryLanguageChanged@HbInputSettingDialog@@QAEXH@Z @ 578 NONAME ABSENT ; void HbInputSettingDialog::secondaryLanguageChanged(int) ?getStaticMetaObject@HbInputTabBar@@SAABUQMetaObject@@XZ @ 579 NONAME ABSENT ; struct QMetaObject const & HbInputTabBar::getStaticMetaObject(void) @@ -644,7 +644,7 @@ ?qt_metacast@HbCharPreviewPane@@UAEPAXPBD@Z @ 643 NONAME ABSENT ; void * HbCharPreviewPane::qt_metacast(char const *) ?strokeEndMark@HbWritingBox@@QBE?AVQPointF@@XZ @ 644 NONAME ABSENT ; class QPointF HbWritingBox::strokeEndMark(void) const ?qt_metacast@HbInputCnTouchListView@@UAEPAXPBD@Z @ 645 NONAME ABSENT ; void * HbInputCnTouchListView::qt_metacast(char const *) - ?mouseDoubleClickEvent@HbInputVirtualRocker@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 646 NONAME ; void HbInputVirtualRocker::mouseDoubleClickEvent(class QGraphicsSceneMouseEvent *) + ?mouseDoubleClickEvent@HbInputVirtualRocker@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 646 NONAME ABSENT ; void HbInputVirtualRocker::mouseDoubleClickEvent(class QGraphicsSceneMouseEvent *) ?staticMetaObject@HbQwertyKeyboard@@2UQMetaObject@@B @ 647 NONAME ABSENT ; struct QMetaObject const HbQwertyKeyboard::staticMetaObject ?setBgColor@HbWritingBox@@QAEXVQColor@@@Z @ 648 NONAME ABSENT ; void HbWritingBox::setBgColor(class QColor) ?setCharSet@HbInputSctPortrait@@QAEXABVQString@@PAVHbInputFilter@@@Z @ 649 NONAME ABSENT ; void HbInputSctPortrait::setCharSet(class QString const &, class HbInputFilter *) @@ -720,7 +720,7 @@ ?pageDownButtonClicked@HbInputCnTouchListView@@AAEXXZ @ 719 NONAME ABSENT ; void HbInputCnTouchListView::pageDownButtonClicked(void) ??_EHbCandidateList@@UAE@I@Z @ 720 NONAME ; HbCandidateList::~HbCandidateList(unsigned int) ?exactWordSelected@HbExactWordPopup@@IAEXXZ @ 721 NONAME ; void HbExactWordPopup::exactWordSelected(void) - ?mouseMoveEvent@HbInputVirtualRocker@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 722 NONAME ; void HbInputVirtualRocker::mouseMoveEvent(class QGraphicsSceneMouseEvent *) + ?mouseMoveEvent@HbInputVirtualRocker@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 722 NONAME ABSENT ; void HbInputVirtualRocker::mouseMoveEvent(class QGraphicsSceneMouseEvent *) ?trUtf8@HbInputSctPortrait@@SA?AVQString@@PBD0H@Z @ 723 NONAME ABSENT ; class QString HbInputSctPortrait::trUtf8(char const *, char const *, int) ?timerFlag@HbInputCnTchButton@@QAEHXZ @ 724 NONAME ABSENT ; int HbInputCnTchButton::timerFlag(void) ?onRepeatLongTimeOut@HbWritingBox@@QAEXXZ @ 725 NONAME ABSENT ; void HbWritingBox::onRepeatLongTimeOut(void) @@ -745,10 +745,10 @@ ?updateModel@HbInputCnListView@@QAEXXZ @ 744 NONAME ABSENT ; void HbInputCnListView::updateModel(void) ?tr@HbQwertyKeyboard@@SA?AVQString@@PBD0H@Z @ 745 NONAME ABSENT ; class QString HbQwertyKeyboard::tr(char const *, char const *, int) ?setPredictionBase@HbInputCnModel@@QAE_NVQString@@@Z @ 746 NONAME ABSENT ; bool HbInputCnModel::setPredictionBase(class QString) - ?mouseReleaseEvent@HbInputVirtualRocker@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 747 NONAME ; void HbInputVirtualRocker::mouseReleaseEvent(class QGraphicsSceneMouseEvent *) + ?mouseReleaseEvent@HbInputVirtualRocker@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 747 NONAME ABSENT ; void HbInputVirtualRocker::mouseReleaseEvent(class QGraphicsSceneMouseEvent *) ?tr@HbWritingBox@@SA?AVQString@@PBD0@Z @ 748 NONAME ABSENT ; class QString HbWritingBox::tr(char const *, char const *) ?settingItemDisplayed@HbInputSettingDialog@@QAEXABVQModelIndex@@@Z @ 749 NONAME ABSENT ; void HbInputSettingDialog::settingItemDisplayed(class QModelIndex const &) - ?metaObject@HbInputVirtualRocker@@UBEPBUQMetaObject@@XZ @ 750 NONAME ; struct QMetaObject const * HbInputVirtualRocker::metaObject(void) const + ?metaObject@HbInputVirtualRocker@@UBEPBUQMetaObject@@XZ @ 750 NONAME ABSENT ; struct QMetaObject const * HbInputVirtualRocker::metaObject(void) const ?constructIconRanges@HbRangeBar@@QAEXABV?$QList@UHbIconRangePair@@@@@Z @ 751 NONAME ABSENT ; void HbRangeBar::constructIconRanges(class QList const &) ??1HbExactWordPopup@@UAE@XZ @ 752 NONAME ; HbExactWordPopup::~HbExactWordPopup(void) ??0HbInputSctLandscape@@IAE@AAVHbInputSctLandscapePrivate@@PAVQGraphicsItem@@@Z @ 753 NONAME ABSENT ; HbInputSctLandscape::HbInputSctLandscape(class HbInputSctLandscapePrivate &, class QGraphicsItem *) @@ -764,21 +764,21 @@ ?mappedKeyClick@HbQwertyKeyboard@@AAEXH@Z @ 763 NONAME ABSENT ; void HbQwertyKeyboard::mappedKeyClick(int) ?trUtf8@HbInputUsedSymbolPane@@SA?AVQString@@PBD0H@Z @ 764 NONAME ABSENT ; class QString HbInputUsedSymbolPane::trUtf8(char const *, char const *, int) ?tr@HbInputTabBar@@SA?AVQString@@PBD0H@Z @ 765 NONAME ABSENT ; class QString HbInputTabBar::tr(char const *, char const *, int) - ?paint@HbInputVirtualRocker@@MAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 766 NONAME ; void HbInputVirtualRocker::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *) + ?paint@HbInputVirtualRocker@@MAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 766 NONAME ABSENT ; void HbInputVirtualRocker::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *) ?onModelUpdated@HbInputCnTouchListView@@AAEXXZ @ 767 NONAME ABSENT ; void HbInputCnTouchListView::onModelUpdated(void) ?trUtf8@HbInputSettingDialog@@SA?AVQString@@PBD0H@Z @ 768 NONAME ABSENT ; class QString HbInputSettingDialog::trUtf8(char const *, char const *, int) ??1HbInputCnModel@@UAE@XZ @ 769 NONAME ABSENT ; HbInputCnModel::~HbInputCnModel(void) ?setPropertiesForKeys@HbInputCnScrollKeypad@@QAEXABV?$QList@UHbCnVirtualKey@@@@@Z @ 770 NONAME ABSENT ; void HbInputCnScrollKeypad::setPropertiesForKeys(class QList const &) ?setBackground@HbTouchKeypadButton@@IAEXVQString@@@Z @ 771 NONAME ABSENT ; void HbTouchKeypadButton::setBackground(class QString) ?qt_metacast@HbInputCnKeypad@@UAEPAXPBD@Z @ 772 NONAME ABSENT ; void * HbInputCnKeypad::qt_metacast(char const *) - ??_EHbInputVirtualRocker@@UAE@I@Z @ 773 NONAME ; HbInputVirtualRocker::~HbInputVirtualRocker(unsigned int) + ??_EHbInputVirtualRocker@@UAE@I@Z @ 773 NONAME ABSENT ; HbInputVirtualRocker::~HbInputVirtualRocker(unsigned int) ?aboutToClose@HbQwertyKeyboard@@UAEXPAVHbVkbHost@@@Z @ 774 NONAME ABSENT ; void HbQwertyKeyboard::aboutToClose(class HbVkbHost *) ??0HbInputCnListPreSymbolModel@@QAE@PAVQObject@@H@Z @ 775 NONAME ABSENT ; HbInputCnListPreSymbolModel::HbInputCnListPreSymbolModel(class QObject *, int) ?itemList@HbInputCnListModel@@QBE?AV?$QList@VQVariant@@@@XZ @ 776 NONAME ABSENT ; class QList HbInputCnListModel::itemList(void) const ?qt_metacast@HbInputSpell@@UAEPAXPBD@Z @ 777 NONAME ABSENT ; void * HbInputSpell::qt_metacast(char const *) ?charInterval@HbWritingBox@@QBEHXZ @ 778 NONAME ABSENT ; int HbWritingBox::charInterval(void) const ?supportsKeyboardType@HbInputCnModel@@QAE_NABVHbInputLanguage@@V?$QFlags@W4HbKeyboardTypeFlag@@@@@Z @ 779 NONAME ABSENT ; bool HbInputCnModel::supportsKeyboardType(class HbInputLanguage const &, class QFlags) - ?type@HbInputVirtualRocker@@UBEHXZ @ 780 NONAME ; int HbInputVirtualRocker::type(void) const + ?type@HbInputVirtualRocker@@UBEHXZ @ 780 NONAME ABSENT ; int HbInputVirtualRocker::type(void) const ??0HbInputSettingDialog@@QAE@V?$QFlags@W4HbSettingItem@HbInputSettingDialog@@@@PAVQGraphicsWidget@@@Z @ 781 NONAME ABSENT ; HbInputSettingDialog::HbInputSettingDialog(class QFlags, class QGraphicsWidget *) ?supportedLanguages@HbInputCnModel@@QBE?AV?$QList@VHbInputLanguage@@@@XZ @ 782 NONAME ABSENT ; class QList HbInputCnModel::supportedLanguages(void) const ?qt_metacast@HbStackedRange@@UAEPAXPBD@Z @ 783 NONAME ABSENT ; void * HbStackedRange::qt_metacast(char const *) @@ -1083,7 +1083,7 @@ ?sizeHint@HbInputVkbWidget@@MBE?AVQSizeF@@W4SizeHint@Qt@@ABV2@@Z @ 1082 NONAME ; class QSizeF HbInputVkbWidget::sizeHint(enum Qt::SizeHint, class QSizeF const &) const ?d_func@HbInputSettingList@@ABEPBVHbInputSettingListPrivate@@XZ @ 1083 NONAME ; class HbInputSettingListPrivate const * HbInputSettingList::d_func(void) const ?getStaticMetaObject@HbInputSettingList@@SAABUQMetaObject@@XZ @ 1084 NONAME ; struct QMetaObject const & HbInputSettingList::getStaticMetaObject(void) - ?closeSettingList@HbInputVkbWidget@@QAEXXZ @ 1085 NONAME ; void HbInputVkbWidget::closeSettingList(void) + ?closeSettingList@HbInputVkbWidget@@QAEXXZ @ 1085 NONAME ABSENT ; void HbInputVkbWidget::closeSettingList(void) ?setKeyCode@HbTouchKeypadButton@@QAEXH@Z @ 1086 NONAME ABSENT ; void HbTouchKeypadButton::setKeyCode(int) ?keypadLanguageChangeFinished@HbInputVkbWidget@@QAEXXZ @ 1087 NONAME ; void HbInputVkbWidget::keypadLanguageChangeFinished(void) ?metaObject@HbInputSettingList@@UBEPBUQMetaObject@@XZ @ 1088 NONAME ; struct QMetaObject const * HbInputSettingList::metaObject(void) const @@ -1144,7 +1144,7 @@ ?trUtf8@HbInputCheckBoxList@@SA?AVQString@@PBD0H@Z @ 1143 NONAME ; class QString HbInputCheckBoxList::trUtf8(char const *, char const *, int) ?metaObject@HbInputSettingWidget@@UBEPBUQMetaObject@@XZ @ 1144 NONAME ; struct QMetaObject const * HbInputSettingWidget::metaObject(void) const ?updateAutocompletionState@HbInputSettingWidget@@QAEXV?$QFlags@W4HbKeyboardSettingFlag@@@@_N@Z @ 1145 NONAME ; void HbInputSettingWidget::updateAutocompletionState(class QFlags, bool) - ?gestureEvent@HbInputVirtualRocker@@MAEXPAVQGestureEvent@@@Z @ 1146 NONAME ; void HbInputVirtualRocker::gestureEvent(class QGestureEvent *) + ?gestureEvent@HbInputVirtualRocker@@MAEXPAVQGestureEvent@@@Z @ 1146 NONAME ABSENT ; void HbInputVirtualRocker::gestureEvent(class QGestureEvent *) ?canSetModelIndex@HbInputCheckBoxList@@UBE_NABVQModelIndex@@@Z @ 1147 NONAME ; bool HbInputCheckBoxList::canSetModelIndex(class QModelIndex const &) const ?d_func@HbInputCheckBoxList@@AAEPAVHbInputCheckBoxListPrivate@@XZ @ 1148 NONAME ; class HbInputCheckBoxListPrivate * HbInputCheckBoxList::d_func(void) ?setKeypressTimeoutValue@HbInputSettingWidget@@QAEXH@Z @ 1149 NONAME ; void HbInputSettingWidget::setKeypressTimeoutValue(int) @@ -1368,7 +1368,7 @@ ?showInputMethodSelectionDialog@HbInputVkbWidgetPrivate@@QAEXXZ @ 1367 NONAME ABSENT ; void HbInputVkbWidgetPrivate::showInputMethodSelectionDialog(void) ?aboutToActivateCustomAction@HbInputButtonGroup@@IAEXPAVHbAction@@@Z @ 1368 NONAME ; void HbInputButtonGroup::aboutToActivateCustomAction(class HbAction *) ?aboutToActivateCustomAction@HbInputVkbWidget@@IAEXPAVHbAction@@@Z @ 1369 NONAME ; void HbInputVkbWidget::aboutToActivateCustomAction(class HbAction *) - ?rockerPosition@HbInputVkbWidget@@MAE?AVQPointF@@XZ @ 1370 NONAME ; class QPointF HbInputVkbWidget::rockerPosition(void) + ?rockerPosition@HbInputVkbWidget@@MAE?AVQPointF@@XZ @ 1370 NONAME ABSENT; class QPointF HbInputVkbWidget::rockerPosition(void) ?_q_handleRockerChange@HbInputVkbWidgetPrivate@@QAEXHW4RockerSelectionMode@HbInputVirtualRocker@@@Z @ 1371 NONAME ABSENT ; void HbInputVkbWidgetPrivate::_q_handleRockerChange(int, enum HbInputVirtualRocker::RockerSelectionMode) ?layoutTextLine@HbInputButtonGroupPrivate@@MAEXW4HbInputButtonTextType@HbInputButtonGroup@@PBVHbInputButton@@ABVQSizeF@@AAVQTextLine@@2@Z @ 1372 NONAME ; void HbInputButtonGroupPrivate::layoutTextLine(enum HbInputButtonGroup::HbInputButtonTextType, class HbInputButton const *, class QSizeF const &, class QTextLine &, class QSizeF const &) ?fontSize@HbInputButtonGroupPrivate@@MAEMW4HbInputButtonTextType@HbInputButtonGroup@@@Z @ 1373 NONAME ; float HbInputButtonGroupPrivate::fontSize(enum HbInputButtonGroup::HbInputButtonTextType) @@ -1401,7 +1401,7 @@ ?setLandscapeInputMethod@HbInputSettingWidget@@QAEXH@Z @ 1400 NONAME ; void HbInputSettingWidget::setLandscapeInputMethod(int) ?setHwrSpeed@HbInputSettingWidget@@QAEXH@Z @ 1401 NONAME ; void HbInputSettingWidget::setHwrSpeed(int) ?setPortraitInputMethod@HbInputSettingWidget@@QAEXH@Z @ 1402 NONAME ; void HbInputSettingWidget::setPortraitInputMethod(int) - ?resetChineseInputMode@HbInputSettingWidget@@QAEXXZ @ 1403 NONAME ; void HbInputSettingWidget::resetChineseInputMode(void) + ?resetChineseInputMode@HbInputSettingWidget@@QAEXXZ @ 1403 NONAME ABSENT ; void HbInputSettingWidget::resetChineseInputMode(void) ?_q_smileyPickerClosed@HbInputVkbWidgetPrivate@@QAEXXZ @ 1404 NONAME ; void HbInputVkbWidgetPrivate::_q_smileyPickerClosed(void) ?layoutSecondaryText@HbInputButtonGroupPrivate@@MAEXHPAVHbInputButton@@AAVQFontMetricsF@@ABVQSizeF@@W4HbInputButtonTextIndex@2@W4HbInputButtonIconIndex@2@34W4HbInputButtonTextType@HbInputButtonGroup@@@Z @ 1405 NONAME ; void HbInputButtonGroupPrivate::layoutSecondaryText(int, class HbInputButton *, class QFontMetricsF &, class QSizeF const &, enum HbInputButton::HbInputButtonTextIndex, enum HbInputButton::HbInputButtonIconIndex, enum HbInputButton::HbInputButtonTextIndex, enum HbInputButton::HbInputButtonIconIndex, enum HbInputButtonGroup::HbInputButtonTextType) ?setFontSize@HbInputButtonGroupPrivate@@MAEXW4HbInputButtonTextType@HbInputButtonGroup@@M@Z @ 1406 NONAME ; void HbInputButtonGroupPrivate::setFontSize(enum HbInputButtonGroup::HbInputButtonTextType, float) @@ -1417,4 +1417,8 @@ ?keyAtIndex@HbSctKeyboardPrivate@@QAEHH@Z @ 1416 NONAME ; int HbSctKeyboardPrivate::keyAtIndex(int) ?countActiveKeys@HbSctKeyboardPrivate@@QAEHXZ @ 1417 NONAME ; int HbSctKeyboardPrivate::countActiveKeys(void) ?applyEditorConstraints@HbSctKeyboardPrivate@@QAEXPAVHbInputFocusObject@@PAVHbInputButtonGroup@@@Z @ 1418 NONAME ; void HbSctKeyboardPrivate::applyEditorConstraints(class HbInputFocusObject *, class HbInputButtonGroup *) + ?closeSettingList@HbInputVkbWidget@@UAEXXZ @ 1419 NONAME ; void HbInputVkbWidget::closeSettingList(void) + ?iconDrawer@HbInputVkbWidget@@IAEPAVHbFrameDrawer@@XZ @ 1420 NONAME ; class HbFrameDrawer * HbInputVkbWidget::iconDrawer(void) + ?setDefaultLanguageForKeyboardInput@HbInputSettingWidget@@QAEXH@Z @ 1421 NONAME ; void HbInputSettingWidget::setDefaultLanguageForKeyboardInput(int) + ?resetChineseInputMode@HbInputSettingWidget@@QAEXVHbInputLanguage@@@Z @ 1422 NONAME ; void HbInputSettingWidget::resetChineseInputMode(class HbInputLanguage) diff -r 4633027730f5 -r e6ad4ef83b23 src/hbinput/defs/eabi/HbInputu.def --- a/src/hbinput/defs/eabi/HbInputu.def Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbinput/defs/eabi/HbInputu.def Thu Sep 02 20:44:51 2010 +0300 @@ -197,10 +197,10 @@ _ZN16HbInputVkbWidget14mappedKeyPressEi @ 196 NONAME ABSENT _ZN16HbInputVkbWidget14settingsClosedEv @ 197 NONAME _ZN16HbInputVkbWidget15mousePressEventEP24QGraphicsSceneMouseEvent @ 198 NONAME ABSENT - _ZN16HbInputVkbWidget15rockerDirectionEiN20HbInputVirtualRocker19RockerSelectionModeE @ 199 NONAME + _ZN16HbInputVkbWidget15rockerDirectionEiN20HbInputVirtualRocker19RockerSelectionModeE @ 199 NONAME ABSENT _ZN16HbInputVkbWidget16asGraphicsWidgetEv @ 200 NONAME _ZN16HbInputVkbWidget16mappedKeyReleaseEi @ 201 NONAME ABSENT - _ZN16HbInputVkbWidget16setRockerVisibleEb @ 202 NONAME + _ZN16HbInputVkbWidget16setRockerVisibleEb @ 202 NONAME ABSENT _ZN16HbInputVkbWidget16setupToolClusterEv @ 203 NONAME ABSENT _ZN16HbInputVkbWidget16staticMetaObjectE @ 204 NONAME DATA 16 _ZN16HbInputVkbWidget17keyboardMinimizedEP9HbVkbHost @ 205 NONAME @@ -454,23 +454,23 @@ _ZN20HbInputSettingDialogD0Ev @ 453 NONAME ABSENT _ZN20HbInputSettingDialogD1Ev @ 454 NONAME ABSENT _ZN20HbInputSettingDialogD2Ev @ 455 NONAME ABSENT - _ZN20HbInputVirtualRocker11qt_metacallEN11QMetaObject4CallEiPPv @ 456 NONAME - _ZN20HbInputVirtualRocker11qt_metacastEPKc @ 457 NONAME - _ZN20HbInputVirtualRocker14mouseMoveEventEP24QGraphicsSceneMouseEvent @ 458 NONAME - _ZN20HbInputVirtualRocker15mousePressEventEP24QGraphicsSceneMouseEvent @ 459 NONAME - _ZN20HbInputVirtualRocker15rockerDirectionEiNS_19RockerSelectionModeE @ 460 NONAME - _ZN20HbInputVirtualRocker16staticMetaObjectE @ 461 NONAME DATA 16 - _ZN20HbInputVirtualRocker17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 462 NONAME - _ZN20HbInputVirtualRocker19getStaticMetaObjectEv @ 463 NONAME - _ZN20HbInputVirtualRocker21mouseDoubleClickEventEP24QGraphicsSceneMouseEvent @ 464 NONAME - _ZN20HbInputVirtualRocker5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 465 NONAME - _ZN20HbInputVirtualRockerC1EP16HbInputVkbWidget @ 466 NONAME - _ZN20HbInputVirtualRockerC1ER27HbInputVirtualRockerPrivateP15QGraphicsWidget @ 467 NONAME - _ZN20HbInputVirtualRockerC2EP16HbInputVkbWidget @ 468 NONAME - _ZN20HbInputVirtualRockerC2ER27HbInputVirtualRockerPrivateP15QGraphicsWidget @ 469 NONAME - _ZN20HbInputVirtualRockerD0Ev @ 470 NONAME - _ZN20HbInputVirtualRockerD1Ev @ 471 NONAME - _ZN20HbInputVirtualRockerD2Ev @ 472 NONAME + _ZN20HbInputVirtualRocker11qt_metacallEN11QMetaObject4CallEiPPv @ 456 NONAME ABSENT + _ZN20HbInputVirtualRocker11qt_metacastEPKc @ 457 NONAME ABSENT + _ZN20HbInputVirtualRocker14mouseMoveEventEP24QGraphicsSceneMouseEvent @ 458 NONAME ABSENT + _ZN20HbInputVirtualRocker15mousePressEventEP24QGraphicsSceneMouseEvent @ 459 NONAME ABSENT + _ZN20HbInputVirtualRocker15rockerDirectionEiNS_19RockerSelectionModeE @ 460 NONAME ABSENT + _ZN20HbInputVirtualRocker16staticMetaObjectE @ 461 NONAME DATA 16 ABSENT + _ZN20HbInputVirtualRocker17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 462 NONAME ABSENT + _ZN20HbInputVirtualRocker19getStaticMetaObjectEv @ 463 NONAME ABSENT + _ZN20HbInputVirtualRocker21mouseDoubleClickEventEP24QGraphicsSceneMouseEvent @ 464 NONAME ABSENT + _ZN20HbInputVirtualRocker5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 465 NONAME ABSENT + _ZN20HbInputVirtualRockerC1EP16HbInputVkbWidget @ 466 NONAME ABSENT + _ZN20HbInputVirtualRockerC1ER27HbInputVirtualRockerPrivateP15QGraphicsWidget @ 467 NONAME ABSENT + _ZN20HbInputVirtualRockerC2EP16HbInputVkbWidget @ 468 NONAME ABSENT + _ZN20HbInputVirtualRockerC2ER27HbInputVirtualRockerPrivateP15QGraphicsWidget @ 469 NONAME ABSENT + _ZN20HbInputVirtualRockerD0Ev @ 470 NONAME ABSENT + _ZN20HbInputVirtualRockerD1Ev @ 471 NONAME ABSENT + _ZN20HbInputVirtualRockerD2Ev @ 472 NONAME ABSENT _ZN21HbInputCnScrollKeypad11keyPositionEi @ 473 NONAME ABSENT _ZN21HbInputCnScrollKeypad11keypadEventE19HbCnWidgetEventType8QVariant @ 474 NONAME ABSENT _ZN21HbInputCnScrollKeypad11qt_metacallEN11QMetaObject4CallEiPPv @ 475 NONAME ABSENT @@ -639,7 +639,7 @@ _ZNK15HbInputCnKeypad10metaObjectEv @ 638 NONAME ABSENT _ZNK16HbExactWordPopup10metaObjectEv @ 639 NONAME _ZNK16HbInputVkbWidget10metaObjectEv @ 640 NONAME - _ZNK16HbInputVkbWidget15isRockerVisibleEv @ 641 NONAME + _ZNK16HbInputVkbWidget15isRockerVisibleEv @ 641 NONAME ABSENT _ZNK16HbInputVkbWidget4modeEv @ 642 NONAME _ZNK16HbInputVkbWidget5shapeEv @ 643 NONAME _ZNK16HbQwertyKeyboard10metaObjectEv @ 644 NONAME ABSENT @@ -683,8 +683,8 @@ _ZNK19HbTouchKeypadButton9isLatchedEv @ 682 NONAME ABSENT _ZNK20HbInputModeIndicator10metaObjectEv @ 683 NONAME _ZNK20HbInputSettingDialog10metaObjectEv @ 684 NONAME ABSENT - _ZNK20HbInputVirtualRocker10metaObjectEv @ 685 NONAME - _ZNK20HbInputVirtualRocker13selectionModeEv @ 686 NONAME + _ZNK20HbInputVirtualRocker10metaObjectEv @ 685 NONAME ABSENT + _ZNK20HbInputVirtualRocker13selectionModeEv @ 686 NONAME ABSENT _ZNK21HbInputCnScrollKeypad10metaObjectEv @ 687 NONAME ABSENT _ZNK21HbInputCnScrollKeypad5shapeEv @ 688 NONAME ABSENT _ZNK21HbInputUsedSymbolPane10metaObjectEv @ 689 NONAME ABSENT @@ -720,7 +720,7 @@ _ZTI19HbTouchKeypadButton @ 719 NONAME ABSENT _ZTI20HbInputModeIndicator @ 720 NONAME _ZTI20HbInputSettingDialog @ 721 NONAME ABSENT - _ZTI20HbInputVirtualRocker @ 722 NONAME + _ZTI20HbInputVirtualRocker @ 722 NONAME ABSENT _ZTI21HbInputCnScrollKeypad @ 723 NONAME ABSENT _ZTI21HbInputUsedSymbolPane @ 724 NONAME ABSENT _ZTI22HbInputCnListCandModel @ 725 NONAME ABSENT @@ -755,7 +755,7 @@ _ZTV19HbTouchKeypadButton @ 754 NONAME ABSENT _ZTV20HbInputModeIndicator @ 755 NONAME _ZTV20HbInputSettingDialog @ 756 NONAME ABSENT - _ZTV20HbInputVirtualRocker @ 757 NONAME + _ZTV20HbInputVirtualRocker @ 757 NONAME ABSENT _ZTV21HbInputCnScrollKeypad @ 758 NONAME ABSENT _ZTV21HbInputUsedSymbolPane @ 759 NONAME ABSENT _ZTV22HbInputCnListCandModel @ 760 NONAME ABSENT @@ -802,8 +802,8 @@ _ZThn16_N19HbTouchKeypadButtonD1Ev @ 801 NONAME ABSENT _ZThn16_N20HbInputSettingDialogD0Ev @ 802 NONAME ABSENT _ZThn16_N20HbInputSettingDialogD1Ev @ 803 NONAME ABSENT - _ZThn16_N20HbInputVirtualRockerD0Ev @ 804 NONAME - _ZThn16_N20HbInputVirtualRockerD1Ev @ 805 NONAME + _ZThn16_N20HbInputVirtualRockerD0Ev @ 804 NONAME ABSENT + _ZThn16_N20HbInputVirtualRockerD1Ev @ 805 NONAME ABSENT _ZThn16_N21HbInputCnScrollKeypadD0Ev @ 806 NONAME ABSENT _ZThn16_N21HbInputCnScrollKeypadD1Ev @ 807 NONAME ABSENT _ZThn16_N21HbInputUsedSymbolPaneD0Ev @ 808 NONAME ABSENT @@ -902,13 +902,13 @@ _ZThn8_N19HbTouchKeypadButtonD1Ev @ 901 NONAME ABSENT _ZThn8_N20HbInputSettingDialogD0Ev @ 902 NONAME ABSENT _ZThn8_N20HbInputSettingDialogD1Ev @ 903 NONAME ABSENT - _ZThn8_N20HbInputVirtualRocker14mouseMoveEventEP24QGraphicsSceneMouseEvent @ 904 NONAME - _ZThn8_N20HbInputVirtualRocker15mousePressEventEP24QGraphicsSceneMouseEvent @ 905 NONAME - _ZThn8_N20HbInputVirtualRocker17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 906 NONAME - _ZThn8_N20HbInputVirtualRocker21mouseDoubleClickEventEP24QGraphicsSceneMouseEvent @ 907 NONAME - _ZThn8_N20HbInputVirtualRocker5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 908 NONAME - _ZThn8_N20HbInputVirtualRockerD0Ev @ 909 NONAME - _ZThn8_N20HbInputVirtualRockerD1Ev @ 910 NONAME + _ZThn8_N20HbInputVirtualRocker14mouseMoveEventEP24QGraphicsSceneMouseEvent @ 904 NONAME ABSENT + _ZThn8_N20HbInputVirtualRocker15mousePressEventEP24QGraphicsSceneMouseEvent @ 905 NONAME ABSENT + _ZThn8_N20HbInputVirtualRocker17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 906 NONAME ABSENT + _ZThn8_N20HbInputVirtualRocker21mouseDoubleClickEventEP24QGraphicsSceneMouseEvent @ 907 NONAME ABSENT + _ZThn8_N20HbInputVirtualRocker5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 908 NONAME ABSENT + _ZThn8_N20HbInputVirtualRockerD0Ev @ 909 NONAME ABSENT + _ZThn8_N20HbInputVirtualRockerD1Ev @ 910 NONAME ABSENT _ZThn8_N21HbInputCnScrollKeypad16sceneEventFilterEP13QGraphicsItemP6QEvent @ 911 NONAME ABSENT _ZThn8_N21HbInputCnScrollKeypadD0Ev @ 912 NONAME ABSENT _ZThn8_N21HbInputCnScrollKeypadD1Ev @ 913 NONAME ABSENT @@ -1392,7 +1392,7 @@ _ZN20HbInputSettingWidgetD0Ev @ 1391 NONAME _ZN20HbInputSettingWidgetD1Ev @ 1392 NONAME _ZN20HbInputSettingWidgetD2Ev @ 1393 NONAME - _ZN20HbInputVirtualRocker12gestureEventEP13QGestureEvent @ 1394 NONAME + _ZN20HbInputVirtualRocker12gestureEventEP13QGestureEvent @ 1394 NONAME ABSENT _ZN25Hb12KeyTouchKeypadPrivate22getAllowedSctCharctersER7QString @ 1395 NONAME ABSENT _ZNK19HbInputCheckBoxList10metaObjectEv @ 1396 NONAME _ZNK19HbInputCheckBoxList16canSetModelIndexERK11QModelIndex @ 1397 NONAME @@ -1607,7 +1607,7 @@ _ZN16HbInputVkbWidget27aboutToActivateCustomActionEP8HbAction @ 1606 NONAME _ZN18HbInputButtonGroup27aboutToActivateCustomActionEP8HbAction @ 1607 NONAME _ZN23HbInputVkbWidgetPrivate21_q_handleRockerChangeEiN20HbInputVirtualRocker19RockerSelectionModeE @ 1608 NONAME ABSENT - _ZN16HbInputVkbWidget14rockerPositionEv @ 1609 NONAME + _ZN16HbInputVkbWidget14rockerPositionEv @ 1609 NONAME ABSENT _ZN18HbInputButtonGroup8fontSizeENS_21HbInputButtonTextTypeE @ 1610 NONAME _ZN25HbInputButtonGroupPrivate14layoutTextLineEN18HbInputButtonGroup21HbInputButtonTextTypeEPK13HbInputButtonRK6QSizeFR9QTextLineS7_ @ 1611 NONAME _ZN25HbInputButtonGroupPrivate8fontSizeEN18HbInputButtonGroup21HbInputButtonTextTypeE @ 1612 NONAME @@ -1638,7 +1638,7 @@ _ZN18HbInputSettingList13closeSettingsERK23HbInputMethodDescriptorRK10QByteArray @ 1637 NONAME _ZN18HbInputSettingList19inputMethodSelectedERK23HbInputMethodDescriptorRK10QByteArray @ 1638 NONAME _ZN20HbInputSettingWidget14setCangjieModeEi @ 1639 NONAME - _ZN20HbInputSettingWidget21resetChineseInputModeEv @ 1640 NONAME + _ZN20HbInputSettingWidget21resetChineseInputModeEv @ 1640 NONAME ABSENT _ZN20HbInputSettingWidget22setPortraitInputMethodEi @ 1641 NONAME _ZN20HbInputSettingWidget23setLandscapeInputMethodEi @ 1642 NONAME _ZN20HbInputSettingWidget11setHwrSpeedEi @ 1643 NONAME @@ -1657,4 +1657,7 @@ _ZN20HbSctKeyboardPrivate10keyAtIndexEi @ 1656 NONAME _ZN20HbSctKeyboardPrivate15countActiveKeysEv @ 1657 NONAME _ZN20HbSctKeyboardPrivate22applyEditorConstraintsEP18HbInputFocusObjectP18HbInputButtonGroup @ 1658 NONAME + _ZN16HbInputVkbWidget10iconDrawerEv @ 1659 NONAME + _ZN20HbInputSettingWidget34setDefaultLanguageForKeyboardInputEi @ 1660 NONAME + _ZN20HbInputSettingWidget21resetChineseInputModeE15HbInputLanguage @ 1661 NONAME diff -r 4633027730f5 -r e6ad4ef83b23 src/hbinput/inputwidgets/hbinputbuttongroup.cpp --- a/src/hbinput/inputwidgets/hbinputbuttongroup.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbinput/inputwidgets/hbinputbuttongroup.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -42,6 +42,7 @@ #include #include #include +#include #include "hbframedrawerpool_p.h" #include "hbinputbutton.h" @@ -72,6 +73,7 @@ const QString HbButtonPreviewColor("qtc_input_preview_normal"); const QString HbCharacterSelectionPreviewColor("qtc_input_button_accented_normal"); +const QString HbHwrSctKeyboard("hwr_symbol_keypad"); const int HbLongPressTimeout = 600; const int HbAutoRepeatTimeout = 100; @@ -347,6 +349,11 @@ qreal cellWidth = q->boundingRect().width() / mGridSize.width(); qreal cellHeight = q->boundingRect().height() / mGridSize.height(); + Qt::Orientation orientation = Qt::Horizontal; + if (q->mainWindow()) { + orientation = q->mainWindow()->orientation(); + } + // Calculate text size QFont font = HbFontSpec(HbFontSpec::Primary).font(); font.setPixelSize(int(group->fontSize(HbInputButtonGroup::ButtonTextTypeLabel))); @@ -368,6 +375,11 @@ x = q->boundingRect().width() - width; } qreal y = item->position().y() * cellHeight - height; + if (y < 0 && + orientation == Qt::Horizontal && + q->objectName() == HbHwrSctKeyboard) { + y = (item->position().y() + 1)* cellHeight; + } group->setGeometry(QRectF(q->mapToScene(x, y), QSizeF(width, height))); if (q->parentItem()) { group->setZValue(q->parentItem()->zValue() + 1); @@ -1140,9 +1152,6 @@ resetFontSizes(); setAcceptedMouseButtons(Qt::LeftButton); - - setFlag(QGraphicsItem::ItemIsPanel, true); - setActive(false); } /*! diff -r 4633027730f5 -r e6ad4ef83b23 src/hbinput/inputwidgets/hbinputcandidatelist.cpp --- a/src/hbinput/inputwidgets/hbinputcandidatelist.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbinput/inputwidgets/hbinputcandidatelist.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -197,12 +197,12 @@ void HbCandidateList::populateList(const QStringList &candidates, bool addSpellQuery) { Q_D(HbCandidateList); - // Only for the first time when we launch candidate list its not setting a layout, - // Mostly the problem is form Qt side, for the time being to resolve issue related to candidate list - // making visible property true. + // Only for the first time when we launch candidate list its not setting a layout, + // Mostly the problem is form Qt side, for the time being to resolve issue related to candidate list + // making visible property true. setVisible(true); - QEvent event(QEvent::Polish); - QApplication::sendEvent(this, &event); + QEvent event(QEvent::Polish); + QApplication::sendEvent(this, &event); setContentWidget(d->mList); d->setPriority(HbPopupPrivate::VirtualKeyboard + 1); // Should be shown on top of virtual keyboard. diff -r 4633027730f5 -r e6ad4ef83b23 src/hbinput/inputwidgets/hbinputmethodselectionlist.cpp --- a/src/hbinput/inputwidgets/hbinputmethodselectionlist.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbinput/inputwidgets/hbinputmethodselectionlist.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -68,8 +68,9 @@ mList->setItemRecycling(false); HbInputSettingProxy *proxy = HbInputSettingProxy::instance(); - HbInputMethodDescriptor descriptor = proxy->preferredInputMethod(); - QByteArray customData = proxy->preferredInputMethodCustomData(q->mainWindow()->orientation()); + Qt::Orientation orientation = q->mainWindow()->orientation(); + HbInputMethodDescriptor descriptor = proxy->preferredInputMethod(orientation); + QByteArray customData = proxy->preferredInputMethodCustomData(orientation); QList methodList = HbInputMethod::listCustomInputMethods(q->mainWindow()->orientation(), proxy->globalInputLanguage()); methodList.insert(0, HbInputMethod::defaultInputMethod(q->mainWindow()->orientation())); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbinput/inputwidgets/hbinputsctkeyboard.cpp --- a/src/hbinput/inputwidgets/hbinputsctkeyboard.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbinput/inputwidgets/hbinputsctkeyboard.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -34,6 +34,7 @@ #include #include #include +#include #include "hbinputbuttongroup.h" #include "hbinputbutton.h" @@ -156,7 +157,12 @@ HbInputVkbWidgetPrivate::init(); - if (HbInputSettingProxy::instance()->activeKeyboard() & HbQwertyKeyboardMask) { + Qt::Orientation orientation = Qt::Horizontal; + if (q->mainWindow()) { + orientation = q->mainWindow()->orientation(); + } + + if (HbInputSettingProxy::instance()->activeKeyboard(orientation) & HbQwertyKeyboardMask) { mType = HbKeyboardSctLandscape; } else { mType = HbKeyboardSctPortrait; @@ -193,7 +199,7 @@ } else if (keyCode(i) == HbInputButton::ButtonKeyCodeAlphabet) { // Button that is used to return to normal keypad should be shown as latched item->setState(HbInputButton::ButtonStateLatched); - if (mType == HbKeyboardSctPortrait || mType == HbKeyboardSctEmail || mType == HbKeyboardSctUrl ) { + if (mType == HbKeyboardSctPortrait || mType == HbKeyboardSctEmail || mType == HbKeyboardSctUrl ) { // Portrait SCT has different symbol icon from the default one item->setIcon(HbIcon(HbInputButtonIconSymbol2), HbInputButton::ButtonIconIndexPrimary); } @@ -275,16 +281,24 @@ void HbSctKeyboardPrivate::updateKeyCodes() { Q_Q(HbSctKeyboard); + HbInputFocusObject *focusedObject = mOwner->focusObject(); if (!focusedObject) { return; } - if (HbInputSettingProxy::instance()->activeKeyboard() & HbQwertyKeyboardMask){ + Qt::Orientation orientation = Qt::Horizontal; + if (q->mainWindow()) { + orientation = q->mainWindow()->orientation(); + } + + if (HbInputSettingProxy::instance()->activeKeyboard(orientation) & HbQwertyKeyboardMask){ mType = HbKeyboardSctLandscape; - } else if (focusedObject && focusedObject->editorInterface().editorClass() == HbInputEditorClassEmail) { + } else if (focusedObject && focusedObject->editorInterface().editorClass() == HbInputEditorClassEmail && + mKeymap->keyboard(HbKeyboardSctEmail)) { mType = HbKeyboardSctEmail; - } else if (focusedObject && focusedObject->editorInterface().editorClass() == HbInputEditorClassUrl) { + } else if (focusedObject && focusedObject->editorInterface().editorClass() == HbInputEditorClassUrl && + mKeymap->keyboard(HbKeyboardSctUrl)) { mType = HbKeyboardSctUrl; } else { mType = HbKeyboardSctPortrait; @@ -309,13 +323,13 @@ if (keyboardMap && key < keyboardMap->keys.count()) { // Replace space and enter markers with correct keycodes if (focusedObject->characterAllowedInEditor(keyboardMap->keys.at(key)->characters(HbModifierNone).at(0)) || mType == HbKeyboardSctLandscape){ - if (keyboardMap->keys.at(key)->keycode.unicode() == HbSctSpaceMarker) { - item->setKeyCode(HbInputButton::ButtonKeyCodeSpace); - } else if (keyboardMap->keys.at(key)->keycode.unicode() == HbSctEnterMarker) { - item->setKeyCode(HbInputButton::ButtonKeyCodeEnter); - } else { - item->setKeyCode(keyboardMap->keys.at(key)->keycode.unicode()); - } + if (keyboardMap->keys.at(key)->keycode.unicode() == HbSctSpaceMarker) { + item->setKeyCode(HbInputButton::ButtonKeyCodeSpace); + } else if (keyboardMap->keys.at(key)->keycode.unicode() == HbSctEnterMarker) { + item->setKeyCode(HbInputButton::ButtonKeyCodeEnter); + } else { + item->setKeyCode(keyboardMap->keys.at(key)->keycode.unicode()); + } } else { i--; } @@ -390,7 +404,7 @@ if (keyboardMap && totalKeys < keyboardMap->keys.count()) { while (index){ if (focusedObject->characterAllowedInEditor(keyboardMap->keys.at(totalKeys)->characters(HbModifierNone).at(0))){ - index--; + index--; } totalKeys++; } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbinput/inputwidgets/hbinputsettinglist.cpp --- a/src/hbinput/inputwidgets/hbinputsettinglist.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbinput/inputwidgets/hbinputsettinglist.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -305,7 +305,7 @@ bool langSupportsPrediction = (predFactory->predictionEngineForLanguage(d->mPrimaryLanguage) != NULL); HbInputSettingProxy::instance()->setGlobalSecondaryInputLanguage(d->mSecondaryLanguage); - bool predictionStatus = settings->predictiveInputStatusForActiveKeyboard(); + bool predictionStatus = settings->predictiveInputStatusForActiveKeyboard(); if (!langSupportsPrediction && predictionStatus) { d->mIsPredictionDisabled = true; settings->setPredictiveInputStatusForActiveKeyboard(false); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbinput/inputwidgets/hbinputsettingwidget.cpp --- a/src/hbinput/inputwidgets/hbinputsettingwidget.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbinput/inputwidgets/hbinputsettingwidget.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -34,10 +34,14 @@ #include #include #include +#include +#include #include "hbinputcheckboxlist_p.h" #include "hbinputsettingproxy_p.h" #include +#include +#include const QString statusOff = QObject::tr("Off"); const QString statusOn = QObject::tr("On"); @@ -53,11 +57,18 @@ const QString KCangjieEasyName("CangjieEasy"); const QString KCangjieAdvancedName("CangjieAdvanced"); const QString KHwrName("Handwriting"); -const QString KHwrVerySlowName("VerySlow"); +const QString KHwrVerySlowName("Very Slow"); const QString KHwrSlowName("Slow"); const QString KHwrNormalName("Normal"); const QString KHwrFastName("Fast"); -const QString KHwrVeryFastName("VeryFast"); +const QString KHwrVeryFastName("Very Fast"); + +// strings used for default language +const QString KDefaultChineseName("Chinese"); +const QString KDefaultEnglishName("English"); + +// hwr speed index are exactly saming as enum HbHwrWritingSpeed +const int KHwrSpeedCount = 5; // strings used for represent cangjie const QString KCangjieGeneralName("Cangjie"); @@ -75,36 +86,22 @@ const int KCangjieAdvancedMode = 5; const int KHwrMode = 6; -// define chinese input plugin name -#ifdef Q_OS_WIN -const QString KCnHwrPluginName("HbChineseHwrd.dll"); -#else -#ifdef Q_OS_SYMBIAN -const QString KCnHwrPluginName("HbChineseHwr.qtplugin"); -#else -const QString KCnHwrPluginName("HbChineseHwr.dll"); -#endif -#endif +class HbCnInputModeMap +{ +public: + int mMode; + QString mModeName; +}; -#ifdef Q_OS_WIN -const QString KCnVItutPluginName("HbChineseVItutd.dll"); -#else -#ifdef Q_OS_SYMBIAN -const QString KCnVItutPluginName("HbChineseVItut.qtplugin"); -#else -const QString KCnVItutPluginName("HbChineseVItut.dll"); -#endif -#endif - -#ifdef Q_OS_WIN -const QString KCnVkbPluginName("HbChineseVkbd.dll"); -#else -#ifdef Q_OS_SYMBIAN -const QString KCnVkbPluginName("HbChineseVkb.qtplugin"); -#else -const QString KCnVkbPluginName("HbChineseVkb.dll"); -#endif -#endif +const HbCnInputModeMap modesMap[] = { + {KPinyinMode, KPinyinName}, + {KStrokeMode, KStrokeName}, + {KZhuyinMode, KZhuyinName}, + {KCangjieNormalMode, KCangjieNormalName}, + {KCangjieEasyMode, KCangjieEasyName}, + {KCangjieAdvancedMode, KCangjieAdvancedName}, + {KHwrMode, KHwrName} +}; class HbInputSettingWidgetPrivate { @@ -120,15 +117,16 @@ HbInputLanguage indexToLanguage(int index, const QList &languageList); void createSecondaryLanguageList(); void updateContentWidgetData(); + // following API used by chinese int inputModeToIndex(const int &inputMode, const QList &inputModeList); int indexToInputmode(int index, const QList &inputModeList); void createChineseSettingGroup(HbDataFormModel *model); + void createValidModesList(QStringList &imModeNames, QList &imModeList); + QString inputModeName(int mode) const; + int inputModeByGivenName(const QString& imName) const; + int defaultModeByGivenLang(const HbInputLanguage &lang) const; - QInputContextPlugin *pluginInstance(const QString &pluginFileName) const; - HbInputMethodDescriptor findInputMethodDescriptor(const QString &inputMethodString); - void setInputMethodVar(Qt::Orientation orientation, QString &inputMethodString, QByteArray &num); - QByteArray createHwrSpeedData(QByteArray preferredCustomData, int index); -public: +public: HbDataForm *mForm; HbDataFormModelItem *mPrimaryLanguageItem; HbDataFormModelItem *mSecondaryLanguageItem; @@ -164,7 +162,7 @@ int mCnLandscapeInputMode; int mCnCangjieInputMode; - int mHwrSpeed; + HbHwrWritingSpeed mHwrSpeed; QList mCnPortraitInputModeList; QList mCnLandscapeInputModeList; QList mCangjieInputModeList; @@ -172,6 +170,8 @@ QStringList mCnLandscapeInputModeNames; QStringList mCnCangjieInputModeNames; QStringList mHwrSpeedNames; + QStringList mCnDefaultLanguageNames; + HbDataFormModelItem *mCnDefaultLanguageItem; }; /*! @@ -190,11 +190,14 @@ q_ptr(0), mModel(0), mLanguageGroup(0), - mChineseInputGroup(0), + mChineseInputGroup(0), mPortraitInputMethodItem(0), mLandscapeInputMethodItem(0), mHwrSpeedItem(0), - mCangjieItem(0) + mCangjieItem(0), + mCnCangjieInputMode(KCangjieNormalMode), + mCnDefaultLanguageItem(0) + { } @@ -224,7 +227,7 @@ // simply update the settings dependant content widget data of all the items updateContentWidgetData(); //make sure that the items are not expanded - QModelIndex index = mModel->indexFromItem(mSecondaryLanguageItem->parent()); + QModelIndex index = mModel->indexFromItem(mSecondaryLanguageItem ? mSecondaryLanguageItem->parent(): mPrimaryLanguageItem->parent()); mForm->setExpanded(index, false); index = mModel->indexFromItem(mKeypressTimeoutItem->parent()); mForm->setExpanded(index, false); @@ -233,88 +236,111 @@ } } -void HbInputSettingWidgetPrivate::createChineseSettingGroup(HbDataFormModel *model) -{ - Q_Q(HbInputSettingWidget); - int imMode = KChineseInputModeNone; - QByteArray ba = HbInputSettingProxy::instance()->preferredInputMethodCustomData(Qt::Vertical); - QString portraitCustomData(ba); - QString imName = portraitCustomData.split(" ").at(0); - HbInputLanguage lang = HbInputSettingProxy::instance()->globalInputLanguage(); +void HbInputSettingWidgetPrivate::createValidModesList(QStringList &imModeNames, QList &imModeList) +{ + Qt::Orientation orientation = Qt::Horizontal; + if (mForm) { + orientation = mForm->mainWindow()->orientation(); + } - if (imName == KPinyinName) { - imMode = KPinyinMode; - } else if (imName == KStrokeName) { - imMode = KStrokeMode; - } else if (imName == KZhuyinName) { - imMode = KZhuyinMode; - } else if (imName == KHwrName) { - imMode = KHwrMode; - } else { - if (lang.variant() == QLocale::China) { - imMode = KPinyinMode; - } else if (lang.variant() == QLocale::HongKong) { - imMode = KStrokeMode; - } else if (lang.variant() == QLocale::Taiwan) { - imMode = KZhuyinMode; + QList methodList = HbInputMethod::listCustomInputMethods(orientation, + HbInputSettingProxy::instance()->globalInputLanguage()); + methodList.insert(0, HbInputMethod::defaultInputMethod(orientation)); + + foreach(const HbInputMethodDescriptor &des, methodList) { + QStringList displayNames = des.displayNames(); + if (!displayNames.isEmpty()) { + imModeNames += displayNames; + } else { + QString displayName = des.displayName(); + imModeNames.append(displayName); } } - mCnPortraitInputMode = imMode; + imModeNames.removeDuplicates(); + // filter out the input mode that not valid to current screen orientation + if (imModeNames.contains(KCangjieGeneralName)) { + imModeNames.removeOne(KCangjieGeneralName); + } - ba = HbInputSettingProxy::instance()->preferredInputMethodCustomData(Qt::Horizontal); - QString landscapeCustomData(ba); - imName = landscapeCustomData.split(" ").at(0); + for (int i = 0; i < imModeNames.count(); ++i) { + imModeList.append(inputModeByGivenName(imModeNames.at(i))); + } +} + +QString HbInputSettingWidgetPrivate::inputModeName(int mode) const +{ + int cnImCnts = sizeof(modesMap) / sizeof(modesMap[0]); + if (mode >= 0 && mode < cnImCnts) { + return modesMap[mode].mModeName; + } + + return QString(); +} - mCnCangjieInputMode = KCangjieNormalMode; - if (imName == KPinyinName) { - mCnLandscapeInputMode = KPinyinMode; - } else if (imName == KStrokeName) { - mCnLandscapeInputMode = KStrokeMode; - } else if (imName == KZhuyinName) { - mCnLandscapeInputMode = KZhuyinMode; - } else if (imName == KCangjieNormalName) { - mCnLandscapeInputMode = KCangjieNormalMode; - mCnCangjieInputMode = KCangjieNormalMode; - } else if (imName == KCangjieEasyName) { - mCnLandscapeInputMode = KCangjieNormalMode; - mCnCangjieInputMode = KCangjieEasyMode; - } else if (imName == KCangjieAdvancedName) { - mCnLandscapeInputMode = KCangjieNormalMode; - mCnCangjieInputMode = KCangjieAdvancedMode; - } else if (imName == KHwrName) { - mCnLandscapeInputMode = KHwrMode; +int HbInputSettingWidgetPrivate::inputModeByGivenName(const QString& imName) const +{ + int cnMode = KChineseInputModeNone; + + if (imName == KCangjieGeneralName) { + HbCangjieDetailMode cjDetail = HbInputSettingProxy::instance()->detailedCangjieMode(); + switch (cjDetail) { + case HbCangjieEasy: { + cnMode = KCangjieEasyMode; + } + break; + case HbCangjieAdvanced: { + cnMode = KCangjieAdvancedMode; + } + break; + case HbCangjieNormal: + default: { + cnMode = KCangjieNormalMode; + } + break; + } } else { - if (lang.variant() == QLocale::China) { - mCnLandscapeInputMode = KPinyinMode; - } else if (lang.variant() == QLocale::HongKong) { - mCnLandscapeInputMode = KStrokeMode; - } else if (lang.variant() == QLocale::Taiwan) { - mCnLandscapeInputMode = KZhuyinMode; + int cnImCnts = sizeof(modesMap) / sizeof(modesMap[0]); + for (int i = 0; i < cnImCnts; ++i) { + if (modesMap[i].mModeName == imName) { + cnMode = modesMap[i].mMode; + } } } - Qt::Orientation orientation = HbInputSettingProxy::instance()->screenOrientation(); - ba = HbInputSettingProxy::instance()->preferredInputMethodCustomData(orientation); - QString customData(ba); - if (customData.split(" ").count() > 1) { - imName = customData.split(" ").at(1); - if (imName == KHwrVerySlowName) { - mHwrSpeed = 0; - } else if (imName == KHwrSlowName) { - mHwrSpeed = 1; - } else if (imName == KHwrNormalName) { - mHwrSpeed = 2; - } else if (imName == KHwrFastName) { - mHwrSpeed = 3; - } else if (imName == KHwrVeryFastName) { - mHwrSpeed = 4; - } else { - mHwrSpeed = 2; - } - } else { - mHwrSpeed = 2; + if (KChineseInputModeNone == cnMode) { + HbInputLanguage lang = HbInputSettingProxy::instance()->globalInputLanguage(); + cnMode = defaultModeByGivenLang(lang); } + + return cnMode; +} + +int HbInputSettingWidgetPrivate::defaultModeByGivenLang(const HbInputLanguage &lang) const +{ + int imMode = KChineseInputModeNone; + if (lang.variant() == QLocale::China) { + imMode = KPinyinMode; + } else if (lang.variant() == QLocale::HongKong) { + imMode = KStrokeMode; + } else if (lang.variant() == QLocale::Taiwan) { + imMode = KZhuyinMode; + } + + return imMode; +} + +void HbInputSettingWidgetPrivate::createChineseSettingGroup(HbDataFormModel *model) +{ + Q_Q(HbInputSettingWidget); + QByteArray ba = HbInputSettingProxy::instance()->preferredInputMethodCustomData(Qt::Vertical); + QString imName(ba); + HbInputLanguage lang = HbInputSettingProxy::instance()->globalInputLanguage(); + mCnPortraitInputMode = inputModeByGivenName(imName); + + ba = HbInputSettingProxy::instance()->preferredInputMethodCustomData(Qt::Horizontal); + imName = QString(ba); + mCnLandscapeInputMode = inputModeByGivenName(imName); mHwrSpeedNames.clear(); mCnPortraitInputModeList.clear(); @@ -322,27 +348,47 @@ mCnPortraitInputModeNames.clear(); mCnLandscapeInputModeNames.clear(); mCnCangjieInputModeNames.clear(); + mCnDefaultLanguageNames.clear(); - mHwrSpeedNames << "Very slow" << "Slow" << "Normal" << "Fast" << "Very Fast"; - if (mPrimaryInputLanguage == HbInputLanguage(QLocale::Chinese, QLocale::China)) { - mCnPortraitInputModeList << KPinyinMode << KStrokeMode << KHwrMode; - mCnLandscapeInputModeList << KPinyinMode << KStrokeMode << KHwrMode; - mCnPortraitInputModeNames << KPinyinName << KStrokeName << KHwrName; - mCnLandscapeInputModeNames << KPinyinName << KStrokeName << KHwrName; - } else if (mPrimaryInputLanguage == HbInputLanguage(QLocale::Chinese, QLocale::HongKong)) { - mCnPortraitInputModeList << KStrokeMode << KHwrMode; - mCnLandscapeInputModeList << KStrokeMode << KCangjieNormalMode << KHwrMode; + createValidModesList(mCnPortraitInputModeNames, mCnPortraitInputModeList); + mCnLandscapeInputModeNames = mCnPortraitInputModeNames; + mCnLandscapeInputModeList = mCnPortraitInputModeList; + + // append cangjie to landscape related list if need + if (mPrimaryInputLanguage == HbInputLanguage(QLocale::Chinese, QLocale::HongKong) && + !mCnLandscapeInputModeNames.contains(KCangjieGeneralName)) { + + int index = HbInputSettingProxy::instance()->detailedCangjieMode(); + switch(index) { + case 0: + mCnCangjieInputMode = KCangjieEasyMode; + break; + case 1: + mCnCangjieInputMode = KCangjieNormalMode; + break; + case 2: + mCnCangjieInputMode = KCangjieAdvancedMode; + break; + default: + break; + } + + QStringList tmpInputmodeNames; + QList tmpInputmode; + tmpInputmodeNames << mCnLandscapeInputModeNames.at(0) << KCangjieGeneralName << mCnLandscapeInputModeNames.at(1); + tmpInputmode << mCnLandscapeInputModeList.at(0) << mCnCangjieInputMode << mCnLandscapeInputModeList.at(1); + mCnLandscapeInputModeList.clear(); + mCnLandscapeInputModeNames.clear(); + mCnLandscapeInputModeList = tmpInputmode; + mCnLandscapeInputModeNames = tmpInputmodeNames; mCangjieInputModeList << KCangjieEasyMode << KCangjieNormalMode << KCangjieAdvancedMode; - mCnPortraitInputModeNames << KStrokeName << KHwrName; - mCnLandscapeInputModeNames << KStrokeName << KCangjieGeneralName << KHwrName; mCnCangjieInputModeNames << KEasy << KNormal << KAdvanced; - } else if (mPrimaryInputLanguage == HbInputLanguage(QLocale::Chinese, QLocale::Taiwan)) { - mCnPortraitInputModeList << KZhuyinMode << KHwrMode; - mCnLandscapeInputModeList << KZhuyinMode << KHwrMode; - mCnPortraitInputModeNames << KZhuyinName << KHwrName; - mCnLandscapeInputModeNames << KZhuyinName << KHwrName; } + mHwrSpeed = HbInputSettingProxy::instance()->hwrWritingSpeed(); + mHwrSpeedNames << KHwrVerySlowName << KHwrSlowName << KHwrNormalName << KHwrFastName << KHwrVeryFastName; + mCnDefaultLanguageNames << KDefaultChineseName << KDefaultEnglishName; + if (!mChineseInputGroup) { mChineseInputGroup = model->appendDataFormGroup(QObject::tr("Chinese Input")); mPortraitInputMethodItem = new HbDataFormModelItem(HbDataFormModelItem::ComboBoxItem, QObject::tr("Portrait mode input method")); @@ -368,17 +414,24 @@ mHwrSpeedItem = new HbDataFormModelItem(HbDataFormModelItem::ComboBoxItem, QObject::tr("Handwriting speed")); mChineseInputGroup->appendChild(mHwrSpeedItem); mHwrSpeedItem->setContentWidgetData(QString("items"), mHwrSpeedNames); - int hwr = mHwrSpeed; - mHwrSpeedItem->setContentWidgetData(QString("currentIndex"), hwr); + mHwrSpeedItem->setContentWidgetData(QString("currentIndex"), mHwrSpeed); mHwrSpeedItem->setContentWidgetData(QString("objectName"), QString("handwriting_speed")); mForm->addConnection(mHwrSpeedItem, SIGNAL(currentIndexChanged(int)), q, SLOT(setHwrSpeed(int))); + + mCnDefaultLanguageItem = new HbDataFormModelItem(HbDataFormModelItem::ComboBoxItem, QObject::tr("Default language for keyboard input")); + mChineseInputGroup->appendChild(mCnDefaultLanguageItem); + int defaultLanguageIndex = HbInputSettingProxy::instance()->useWesternDefaultKeypadForChinese()?1:0; + mCnDefaultLanguageItem->setContentWidgetData(QString("items"), mCnDefaultLanguageNames); + mCnDefaultLanguageItem->setContentWidgetData(QString("currentIndex"), defaultLanguageIndex); + mCnDefaultLanguageItem->setContentWidgetData(QString("objectName"), QString("default_language_for_keyboard_input")); + mForm->addConnection(mCnDefaultLanguageItem, SIGNAL(currentIndexChanged(int)), q, SLOT(setDefaultLanguageForKeyboardInput(int))); } + int cangjieIdx = HbInputSettingProxy::instance()->detailedCangjieMode(); if (mPrimaryInputLanguage == HbInputLanguage(QLocale::Chinese, QLocale::HongKong)) { mCangjieItem = new HbDataFormModelItem(HbDataFormModelItem::ComboBoxItem, QObject::tr("Cangjie mode")); mChineseInputGroup->appendChild(mCangjieItem); mCangjieItem->setContentWidgetData(QString("items"), mCnCangjieInputModeNames); - int cangjieIdx = inputModeToIndex(mCnCangjieInputMode, mCangjieInputModeList); QVariant varCang; varCang.setValue(cangjieIdx); mCangjieItem->setContentWidgetData(QString("currentIndex"), varCang); @@ -387,12 +440,14 @@ } } -void HbInputSettingWidgetPrivate::updateContentWidgetData() +void HbInputSettingWidgetPrivate::updateContentWidgetData() { // current primary language mPrimaryLanguageItem->setContentWidgetData(QString("currentIndex"), languageToIndex(mPrimaryInputLanguage, mPrimaryLanguages)); - mSecondaryLanguageItem->setContentWidgetData(QString("currentIndex"), languageToIndex(mSecondaryInputLanguage, mSecondaryLanguages)); + if (mSecondaryLanguageItem) { + mSecondaryLanguageItem->setContentWidgetData(QString("currentIndex"), languageToIndex(mSecondaryInputLanguage, mSecondaryLanguages)); + } // key press timeout mKeypressTimeoutItem->setContentWidgetData(QString("sliderPosition"), mKeypressTimeout); if (mCharacterPreviewEnabled) { @@ -419,13 +474,18 @@ mPrimaryCandidateItem->setContentWidgetData(QString("text"), exactTyping); mPrimaryCandidateItem->setContentWidgetData(QString("additionalText"), bestPrediction); } + + if(mChineseInputGroup && mCnDefaultLanguageItem) { + int defaultLanguageIndex = HbInputSettingProxy::instance()->useWesternDefaultKeypadForChinese()?1:0; + mCnDefaultLanguageItem->setContentWidgetData(QString("currentIndex"), defaultLanguageIndex); + } } /*! Creates setting items to this widget */ void HbInputSettingWidgetPrivate::createSettingItems() -{ +{ Q_Q(HbInputSettingWidget); mModel = new HbDataFormModel(); @@ -614,148 +674,6 @@ } } -QInputContextPlugin *HbInputSettingWidgetPrivate::pluginInstance(const QString &pluginFileName) const -{ - if (QLibrary::isLibrary(pluginFileName)) { - QPluginLoader loader(pluginFileName); - QObject *plugin = loader.instance(); - if (plugin) { - return qobject_cast(plugin); - } - } - - return 0; -} - -HbInputMethodDescriptor HbInputSettingWidgetPrivate::findInputMethodDescriptor(const QString &inputMethodString) -{ - HbInputMethodDescriptor descriptor; - // Query plugin paths and scan the folders. - QStringList folders = HbInputSettingProxy::instance()->inputMethodPluginPaths(); - foreach(const QString &folder, folders) { - QDir dir(folder); - for (unsigned int i = 0; i < dir.count(); i++) { - QString path = QString(dir.absolutePath()); - if (path.right(1) != "\\" && path.right(1) != "/") { - path += QDir::separator(); - } - path += inputMethodString; - QInputContextPlugin *inputContextPlugin = pluginInstance(path); - if (inputContextPlugin) { - descriptor.setPluginNameAndPath(dir.absolutePath() + QDir::separator() + inputMethodString); - - // For each found plugin, check if there is already a list item for it. - // If not, then add one. - QStringList contextKeys = inputContextPlugin->keys(); - foreach(QString key, contextKeys) { - descriptor.setKey(key); - descriptor.setDisplayName(inputContextPlugin->displayName(key)); - } - break; - } - } - } - return descriptor; -} - -void HbInputSettingWidgetPrivate::setInputMethodVar(Qt::Orientation orientation, QString &inputMethodString, QByteArray &customData) -{ - int inputMode = KChineseInputModeNone; - if (orientation == Qt::Vertical) { - inputMode = mCnPortraitInputMode; - } else if (orientation == Qt::Horizontal) { - inputMode = mCnLandscapeInputMode; - } else { - return; - } - - switch (inputMode) { - case KPinyinMode: { - orientation == Qt::Vertical ? inputMethodString = KCnVItutPluginName : inputMethodString = KCnVkbPluginName; - customData.append(KPinyinName.toLatin1().data()); - } - break; - case KStrokeMode: { - orientation == Qt::Vertical ? inputMethodString = KCnVItutPluginName : inputMethodString = KCnVkbPluginName; - customData.append(KStrokeName.toLatin1().data()); - } - break; - case KZhuyinMode: { - orientation == Qt::Vertical ? inputMethodString = KCnVItutPluginName : inputMethodString = KCnVkbPluginName; - customData.append(KZhuyinName.toLatin1().data()); - } - break; - case KHwrMode: { - inputMethodString = KCnHwrPluginName; - customData.append(KHwrName.toLatin1().data()); - } - break; - case KCangjieNormalMode: { - inputMethodString = KCnVkbPluginName; - customData.append(KCangjieNormalName.toLatin1().data()); - } - break; - case KCangjieEasyMode: { - inputMethodString = KCnVkbPluginName; - customData.append(KCangjieEasyName.toLatin1().data()); - } - break; - case KCangjieAdvancedMode: { - inputMethodString = KCnVkbPluginName; - customData.append(KCangjieAdvancedName.toLatin1().data()); - } - break; - default: - break; - } - - QByteArray preferredCustomData = HbInputSettingProxy::instance()->preferredInputMethodCustomData(orientation); - QString imName(preferredCustomData); - QStringList temp = imName.split(" "); - if (temp.count() > 1) { - customData.append(" "); - customData.append(temp.at(1).toLatin1().data()); - } else { - customData.append(" "); - customData.append(KHwrNormalName.toLatin1().data()); - } - customData.append((char)0); - return; -} - -QByteArray HbInputSettingWidgetPrivate::createHwrSpeedData(QByteArray preferredCustomData, int index) -{ - QString imName(preferredCustomData); - QStringList temp = imName.split(" "); - - QByteArray customData; - customData.append(temp.at(0).toLatin1().data()); - customData.append(" "); - switch (index) { - case 0: - customData.append(KHwrVerySlowName.toLatin1().data()); - break; - case 1: - customData.append(KHwrSlowName.toLatin1().data()); - break; - case 2: - customData.append(KHwrNormalName.toLatin1().data()); - break; - case 3: - customData.append(KHwrFastName.toLatin1().data()); - break; - case 4: - customData.append(KHwrVeryFastName.toLatin1().data()); - break; - default: - break; - } - customData.append((char)0); - return customData; -} - -/// @endcond - /*! Constructs input setting widget */ @@ -945,6 +863,10 @@ HbPredictionFactory *predFactory = HbPredictionFactory::instance(); bool oldPLangSupportsPrediction = (predFactory->predictionEngineForLanguage(d->mPrimaryInputLanguage) != NULL); d->mPrimaryInputLanguage = d->indexToLanguage(index, d->mPrimaryLanguages); + if (d->mPrimaryInputLanguage.language() == QLocale::Chinese) { + HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Horizontal, HbInputMethodDescriptor()); + HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Vertical, HbInputMethodDescriptor()); + } HbInputSettingProxy::instance()->setGlobalInputLanguage(d->mPrimaryInputLanguage); bool langSupportsPrediction = (predFactory->predictionEngineForLanguage(d->mPrimaryInputLanguage) != NULL); if (oldPLangSupportsPrediction != langSupportsPrediction) { @@ -980,6 +902,8 @@ if (d->mChineseInputGroup) { model->removeItem(d->mChineseInputGroup); d->mChineseInputGroup = NULL; + HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Horizontal, HbInputMethodDescriptor()); + HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Vertical, HbInputMethodDescriptor()); } } else { HbDataFormModel *model = qobject_cast(d->mForm->model()); @@ -993,7 +917,7 @@ d->mSecondaryLanguageItem = NULL; } - resetChineseInputMode(); + resetChineseInputMode(d->mPrimaryInputLanguage); d->createChineseSettingGroup(model); d->mForm->setModel(model); } @@ -1097,12 +1021,35 @@ { Q_D(HbInputSettingWidget); d->mCnPortraitInputMode = d->indexToInputmode(index, d->mCnPortraitInputModeList); - QString inputMethodString; QByteArray customData; - d->setInputMethodVar(Qt::Vertical, inputMethodString, customData); + HbInputMethodDescriptor descriptor; - const HbInputMethodDescriptor descriptor = d->findInputMethodDescriptor(inputMethodString); - HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Vertical, (const HbInputMethodDescriptor &)descriptor, customData); + if (d->mCnPortraitInputMode != KHwrMode) { + QString imName = d->inputModeName(d->mCnPortraitInputMode); + customData.append(imName.toLatin1().data()); + customData.append((char)0); + descriptor = HbInputMethod::defaultInputMethod(Qt::Vertical); + } else { + customData.append(KHwrName.toLatin1().data()); + customData.append((char)0); + QList methodList = HbInputMethod::listCustomInputMethods(Qt::Vertical, HbInputSettingProxy::instance()->globalInputLanguage()); + foreach(const HbInputMethodDescriptor &des, methodList) { + if (des.displayName() == "Chinese Hand Writing Recognition") { + descriptor = des; + break; + } + } + } + + Qt::Orientation orientation = Qt::Vertical; + if (d->mForm) { + orientation = d->mForm->mainWindow()->orientation(); + } + + HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Vertical, descriptor, customData); + if (orientation == Qt::Vertical) { + HbInputMethod::activeInputMethod()->activateInputMethod(descriptor); + } } /*! @@ -1112,12 +1059,43 @@ { Q_D(HbInputSettingWidget); d->mCnLandscapeInputMode = d->indexToInputmode(index, d->mCnLandscapeInputModeList); - QString inputMethodString; QByteArray customData; - d->setInputMethodVar(Qt::Horizontal, inputMethodString, customData); + HbInputMethodDescriptor descriptor; + + if (d->mCnLandscapeInputMode != KHwrMode) { + QString imName; + if (d->mCnLandscapeInputMode == KCangjieNormalMode || + d->mCnLandscapeInputMode == KCangjieEasyMode || + d->mCnLandscapeInputMode == KCangjieAdvancedMode) { + imName = KCangjieGeneralName; + } else { + imName = d->inputModeName(d->mCnLandscapeInputMode); + } - const HbInputMethodDescriptor descriptor = d->findInputMethodDescriptor(inputMethodString); + customData.append(imName.toLatin1().data()); + customData.append((char)0); + descriptor = HbInputMethod::defaultInputMethod(Qt::Horizontal); + } else { + customData.append(KHwrName.toLatin1().data()); + customData.append((char)0); + QList methodList = HbInputMethod::listCustomInputMethods(Qt::Horizontal, HbInputSettingProxy::instance()->globalInputLanguage()); + foreach(const HbInputMethodDescriptor &des, methodList) { + if (des.displayName() == "Chinese Hand Writing Recognition") { + descriptor = des; + break; + } + } + } + + Qt::Orientation orientation = Qt::Horizontal; + if (d->mForm) { + orientation = d->mForm->mainWindow()->orientation(); + } + HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Horizontal, descriptor, customData); + if (orientation == Qt::Horizontal) { + HbInputMethod::activeInputMethod()->activateInputMethod(descriptor); + } } /*! @@ -1129,69 +1107,62 @@ d->mCnCangjieInputMode = d->indexToInputmode(index, d->mCangjieInputModeList); d->mCnLandscapeInputMode = d->mCnCangjieInputMode; - QString inputMethodString; + QString imName = KCangjieGeneralName; QByteArray customData; - d->setInputMethodVar(Qt::Horizontal, inputMethodString, customData); + customData.append(imName.toLatin1().data()); + customData.append((char)0); - const HbInputMethodDescriptor descriptor = d->findInputMethodDescriptor(inputMethodString); + HbInputMethodDescriptor descriptor; + descriptor = HbInputMethod::defaultInputMethod(Qt::Horizontal); + HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Horizontal, descriptor, customData); + HbInputSettingProxy::instance()->setDetailedCangjieMode(HbCangjieDetailMode(index)); } - /*! Saves the handwriting speed */ void HbInputSettingWidget::setHwrSpeed(int index) { - Q_D(HbInputSettingWidget); - Qt::Orientation currentOrientation = HbInputSettingProxy::instance()->screenOrientation(); - QByteArray portraitCustomData = HbInputSettingProxy::instance()->preferredInputMethodCustomData(Qt::Vertical); - QByteArray landscapeCustomData = HbInputSettingProxy::instance()->preferredInputMethodCustomData(Qt::Horizontal); - HbInputMethodDescriptor portraitDes = HbInputSettingProxy::instance()->preferredInputMethod(Qt::Vertical); - HbInputMethodDescriptor landscapeDes = HbInputSettingProxy::instance()->preferredInputMethod(Qt::Horizontal); - QByteArray portraitHwrspeed = d->createHwrSpeedData(portraitCustomData, index); - QByteArray landscapeHwrspeed = d->createHwrSpeedData(landscapeCustomData, index); - - if (currentOrientation == Qt::Vertical) { - HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Horizontal, landscapeDes, landscapeHwrspeed); - HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Vertical, portraitDes, portraitHwrspeed); - - } if (currentOrientation == Qt::Horizontal) { - HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Vertical, portraitDes, portraitHwrspeed); - HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Horizontal, landscapeDes, landscapeHwrspeed); + // hwr speed index in setting widget are exactly same as enum HbHwrWritingSpeed of setting proxy + if (index >= 0 && index < KHwrSpeedCount) { + HbInputSettingProxy::instance()->setHwrWritingSpeed(HbHwrWritingSpeed(index)); } } /*! Saves the portrait input method */ -void HbInputSettingWidget::resetChineseInputMode() +void HbInputSettingWidget::resetChineseInputMode(HbInputLanguage lang) { Q_D(HbInputSettingWidget); - HbInputLanguage lang = HbInputSettingProxy::instance()->globalInputLanguage(); + d->mCnPortraitInputMode = d->defaultModeByGivenLang(lang); + d->mCnLandscapeInputMode = d->defaultModeByGivenLang(lang); + HbInputSettingProxy::instance()->setDetailedCangjieMode(HbCangjieNormal); - if (lang.variant() == QLocale::China) { - d->mCnPortraitInputMode = KPinyinMode; - d->mCnLandscapeInputMode = KPinyinMode; - } else if (lang.variant() == QLocale::HongKong) { - d->mCnPortraitInputMode = KStrokeMode; - d->mCnLandscapeInputMode = KStrokeMode; - } else if (lang.variant() == QLocale::Taiwan) { - d->mCnPortraitInputMode = KZhuyinMode; - d->mCnLandscapeInputMode = KZhuyinMode; + QByteArray portraitCustomData; + QByteArray landscapeCustomData; + QString imName = d->inputModeName(d->mCnPortraitInputMode); + portraitCustomData.append(imName.toLatin1().data()); + portraitCustomData.append((char)0); + HbInputMethodDescriptor portraitDescriptor = HbInputMethod::defaultInputMethod(Qt::Vertical); + + if (d->mCnLandscapeInputMode == KCangjieNormalMode || + d->mCnLandscapeInputMode == KCangjieEasyMode || + d->mCnLandscapeInputMode == KCangjieAdvancedMode) { + imName = KCangjieGeneralName; + } else { + imName = d->inputModeName(d->mCnLandscapeInputMode); } - QString portraitInputMethodString; - QString landscapeInputMethodString; - QByteArray portraitCustomData; - QByteArray landscapeCustomData; - d->setInputMethodVar(Qt::Vertical, portraitInputMethodString, portraitCustomData); - d->setInputMethodVar(Qt::Horizontal, landscapeInputMethodString, landscapeCustomData); + landscapeCustomData.append(imName.toLatin1().data()); + landscapeCustomData.append((char)0); + HbInputMethodDescriptor landscapeDescriptor = HbInputMethod::defaultInputMethod(Qt::Horizontal); - const HbInputMethodDescriptor portraitDescriptor = d->findInputMethodDescriptor(portraitInputMethodString); - const HbInputMethodDescriptor landscapeDescriptor = d->findInputMethodDescriptor(landscapeInputMethodString); HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Vertical, (const HbInputMethodDescriptor &)portraitDescriptor, portraitCustomData); HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Horizontal, (const HbInputMethodDescriptor &)landscapeDescriptor, landscapeCustomData); + + return; } /* @@ -1226,4 +1197,16 @@ disconnect(settings, SIGNAL(primaryCandidateModeChanged(HbPrimaryCandidateMode)), this, SLOT(updatePrimaryCandidateMode(HbPrimaryCandidateMode))); } +/*! +Set default language for keyboard input +*/ +void HbInputSettingWidget::setDefaultLanguageForKeyboardInput(int index) +{ + if(index == 1) { + HbInputSettingProxy::instance()->setWesternDefaultKeypadForChinese(true); + } else { + HbInputSettingProxy::instance()->setWesternDefaultKeypadForChinese(false); + } +} + // End of file diff -r 4633027730f5 -r e6ad4ef83b23 src/hbinput/inputwidgets/hbinputsettingwidget.h --- a/src/hbinput/inputwidgets/hbinputsettingwidget.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbinput/inputwidgets/hbinputsettingwidget.h Thu Sep 02 20:44:51 2010 +0300 @@ -47,7 +47,7 @@ void initializeWidget(); void resetWidget(); - void resetChineseInputMode(); + void resetChineseInputMode(HbInputLanguage lang); public slots: void updateGlobalInputLanguage(const HbInputLanguage &newLanguage); @@ -73,6 +73,8 @@ void setLandscapeInputMethod(int index); void setHwrSpeed(int index); void setCangjieMode(int index); + + void setDefaultLanguageForKeyboardInput(int index); protected: HbInputSettingWidgetPrivate *const d_ptr; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbinput/inputwidgets/hbinputsmileypicker.cpp --- a/src/hbinput/inputwidgets/hbinputsmileypicker.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbinput/inputwidgets/hbinputsmileypicker.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -124,6 +124,7 @@ // Make sure the smiley picker never steals focus. setFlag(QGraphicsItem::ItemIsPanel, true); + d->mActivePopup = false; setActive(false); if (!rows || !columns) { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbinput/inputwidgets/hbinputvirtualrocker.cpp --- a/src/hbinput/inputwidgets/hbinputvirtualrocker.cpp Wed Aug 18 10:05:37 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,317 +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 HbInput 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 "hbinputvirtualrocker.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "hbinputvkbwidget.h" - -/// @cond - -const qreal HbRockerXThreshold = 5.0; -const qreal HbRockerYThreshold = 50.0; -const qreal HbRockerDimOpacity = 1.0; -const qreal HbRockerNormalOpacity = 1.0; -const qreal HbRockerWidth = 50.0; -const qreal HbNormalSizeInUnits = 5; -const qreal HbPressedSizeInUnits = 9.5; -const qreal HbActivatedSizeInUnits = 9.5; - -class HbInputVirtualRockerPrivate -{ -public: - explicit HbInputVirtualRockerPrivate(HbInputVirtualRocker *rocker); - ~HbInputVirtualRockerPrivate(); - int rockerEventRepeats(qreal distance); - -public: - HbInputVirtualRocker *q_ptr; - HbIcon mIconNormal; - HbIcon mIconPressed; - HbIcon mIconActivated; - HbInputVirtualRocker::RockerSelectionMode mShifted; - QPointF mLastPoint; - QPointF mMousePressPoint; - bool mPressed; -}; - -HbInputVirtualRockerPrivate::HbInputVirtualRockerPrivate(HbInputVirtualRocker *rocker) - : q_ptr(rocker), - mShifted(HbInputVirtualRocker::RockerSelectionModeOff), - mLastPoint(0.0, 0.0), - mMousePressPoint(0.0, 0.0), - mPressed(false) -{ - mIconNormal = HbIcon("qtg_graf_trackpoint_normal" ); - mIconPressed = HbIcon("qtg_graf_trackpoint_pressed" ); - mIconActivated = HbIcon("qtg_graf_trackpoint_activated" ); - - q_ptr->grabGesture(Qt::SwipeGesture); - q_ptr->grabGesture(Qt::TapGesture); - q_ptr->grabGesture(Qt::PanGesture); -} - -HbInputVirtualRockerPrivate::~HbInputVirtualRockerPrivate() -{ -} - -int HbInputVirtualRockerPrivate::rockerEventRepeats(qreal distance) -{ - // cursor move multiplier for cursor moving signals, depending on the rocker move speed - int repeats = 1; - if (distance > 30) { - repeats = 30; - } else if (distance > 20) { - repeats = 10; - } else if (distance > 10) { - repeats = 2; - } - return repeats; -} - -/// @endcond - -/*! -@alpha -@hbinput -\class HbInputVirtualRocker -\brief Virtual rocker widget for generating direction events from virtual keyboards. - -Virtual rocker is a virtual version of a mouse pointer decive commonly used in many laptop PC keyboards. -It is typically embedded into virtual keyboards. It generates direction events which can be used for -moving editor cursor, highlighting text, etc. - -User first presses virtual rocker widget and then slides finger to desired direction. The widget -will emit direction events based on the direction of finger momvement, relative to the starting point. -When the finger is lifted, rocker widget returns to normal state and stops sending events. - -Double clicking will start selection mode. Rocker appearance changes and direction events have shift modifier on -but otherwise it behaves in similar manner as described above. - -\sa HbInputVkbWidget -*/ -/*! -\enum HbInputVirtualRocker::RockerDirection - -This enum defines virtual rocker directions. -*/ -/*! -\enum HbInputVirtualRocker::RockerSelectionMode - -This enum defines virtual rocker selection modes. -*/ - -/*! -\deprecated HbInputVirtualRocker::HbInputVirtualRocker(HbInputVkbWidget*) - is deprecated. - -Constructs the object. -*/ -HbInputVirtualRocker::HbInputVirtualRocker(HbInputVkbWidget *parent) - : HbWidget(parent), d_ptr(new HbInputVirtualRockerPrivate(this)) -{ - setOpacity(HbRockerDimOpacity); -} - -/*! -\deprecated HbInputVirtualRocker::HbInputVirtualRocker(HbInputVirtualRockerPrivate&, QGraphicsWidget*) - is deprecated. - -Constructs the object. -*/ -HbInputVirtualRocker::HbInputVirtualRocker(HbInputVirtualRockerPrivate &dd, QGraphicsWidget *parent) - : HbWidget(parent), d_ptr(&dd) -{ - setOpacity(HbRockerDimOpacity); -} - -/*! -\deprecated HbInputVirtualRocker::~HbInputVirtualRocker() - is deprecated. - -Destroys the widget. -*/ -HbInputVirtualRocker::~HbInputVirtualRocker() -{ - delete d_ptr; -} - -/*! -\deprecated HbInputVirtualRocker::mousePressEvent(QGraphicsSceneMouseEvent*) - is deprecated. -*/ -void HbInputVirtualRocker::mousePressEvent(QGraphicsSceneMouseEvent *event) -{ - Q_D(HbInputVirtualRocker); - - QPointF position = event->pos(); - QPointF delta = position - QPointF(HbRockerWidth / 2, HbRockerWidth / 2); - - qreal squareDistance = delta.y() * delta.y() + delta.x() * delta.x(); - qreal squareRadius = HbRockerWidth * HbRockerWidth / 4; - if (squareRadius > squareDistance) { - // the touch point is inside circle which diameter is HbRockerWidth - d->mLastPoint = position; - d->mMousePressPoint = position; - emit rockerDirection(HbRockerDirectionPress, d->mShifted); - HbWidgetFeedback::triggered(this, Hb::InstantPressed); - setOpacity(HbRockerNormalOpacity); - d->mPressed = true; - } else { - // outside of circle: give event to a push button - event->ignore(); - } -} - -/*! -\deprecated HbInputVirtualRocker::mouseReleaseEvent(QGraphicsSceneMouseEvent*) - is deprecated. -*/ -void HbInputVirtualRocker::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) -{ - Q_UNUSED(event) - Q_D(HbInputVirtualRocker); - - emit rockerDirection(HbRockerDirectionRelease, d->mShifted); - setOpacity(HbRockerDimOpacity); - d->mPressed = false; - update(); - d->mShifted = RockerSelectionModeOff; - HbWidgetFeedback::triggered(this, Hb::InstantReleased); -} - -/*! -\deprecated HbInputVirtualRocker::mouseMoveEvent(QGraphicsSceneMouseEvent*) - is deprecated. -*/ -void HbInputVirtualRocker::mouseMoveEvent(QGraphicsSceneMouseEvent *event) -{ - Q_D(HbInputVirtualRocker); - - if (event->buttons() != 0) { - QPointF delta = event->pos() - d->mLastPoint; - QPointF deltaPressLoc = event->pos() - d->mMousePressPoint; - int repeats = 1; - - HbWidgetFeedback::triggered(this, Hb::InstantDraggedOver); - - if (delta.x() > HbRockerXThreshold) { - repeats = d->rockerEventRepeats(delta.x()); - for (int i = 0; i < repeats; i++) { - emit rockerDirection(HbRockerDirectionRight, d->mShifted); - } - d->mLastPoint = event->pos(); - } else if (delta.x() < -HbRockerXThreshold) { - repeats = d->rockerEventRepeats(-delta.x()); - for (int i = 0; i < repeats; i++) { - emit rockerDirection(HbRockerDirectionLeft, d->mShifted); - } - d->mLastPoint = event->pos(); - } - - if (delta.y() > HbRockerYThreshold) { - repeats = d->rockerEventRepeats(delta.y()); - emit rockerDirection(HbRockerDirectionDown, d->mShifted); - d->mLastPoint = event->pos(); - } else if (delta.y() < -HbRockerYThreshold) { - emit rockerDirection(HbRockerDirectionUp, d->mShifted); - d->mLastPoint = event->pos(); - } - update(); - } -} - -/*! -\deprecated HbInputVirtualRocker::mouseDoubleClickEvent(QGraphicsSceneMouseEvent*) - is deprecated. -*/ -void HbInputVirtualRocker::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) -{ - Q_UNUSED(event) - Q_D(HbInputVirtualRocker); - - if (d->mShifted == RockerSelectionModeOff) { - d->mShifted = RockerSelectionModeOn; - } else { - d->mShifted = RockerSelectionModeOff; - } - - emit rockerDirection(HbRockerDirectionDoubleClick, d->mShifted); - setOpacity(HbRockerNormalOpacity); -} - -/*! -\deprecated HbInputVirtualRocker::paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*) - is deprecated. -*/ -void HbInputVirtualRocker::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) -{ - Q_UNUSED(option) - Q_UNUSED(widget) - Q_D(HbInputVirtualRocker); - - painter->setRenderHint(QPainter::Antialiasing, true); - - qreal unitValue = HbDeviceProfile::profile(mainWindow()).unitValue(); - if (selectionMode() == RockerSelectionModeOn) { - d->mIconActivated.setSize(QSizeF(HbActivatedSizeInUnits * unitValue, HbActivatedSizeInUnits * unitValue)); - d->mIconActivated.paint(painter, rect()); - } else if (d->mPressed) { - d->mIconPressed.setSize(QSizeF(HbPressedSizeInUnits * unitValue, HbPressedSizeInUnits * unitValue)); - d->mIconPressed.paint(painter, rect()); - } else { - d->mIconNormal.setSize(QSizeF(HbNormalSizeInUnits * unitValue, HbNormalSizeInUnits * unitValue)); - d->mIconNormal.paint(painter, rect()); - } -} - -/*! -\deprecated HbInputVirtualRocker::selectionMode() const - is deprecated. -*/ -HbInputVirtualRocker::RockerSelectionMode HbInputVirtualRocker::selectionMode() const -{ - Q_D(const HbInputVirtualRocker); - return d->mShifted; -} - -/*! -\deprecated HbInputVirtualRocker::gestureEvent(QGestureEvent*) - is deprecated. -*/ -void HbInputVirtualRocker::gestureEvent(QGestureEvent *event) -{ - Q_UNUSED(event); -} - -// End of file diff -r 4633027730f5 -r e6ad4ef83b23 src/hbinput/inputwidgets/hbinputvirtualrocker.h --- a/src/hbinput/inputwidgets/hbinputvirtualrocker.h Wed Aug 18 10:05:37 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,88 +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 HbInput 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 HB_INPUT_VIRTUAL_ROCKER_H -#define HB_INPUT_VIRTUAL_ROCKER_H - -#include -#include - -class HbInputVkbWidget; -class HbInputVirtualRockerPrivate; - -class HB_INPUT_EXPORT HbInputVirtualRocker : public HbWidget -{ - Q_OBJECT - -public: - enum RockerDirection { - HbRockerDirectionNone = 0, - HbRockerDirectionLeft, - HbRockerDirectionRight, - HbRockerDirectionUp, - HbRockerDirectionDown, - HbRockerDirectionPress, - HbRockerDirectionDoubleClick, - HbRockerDirectionRelease, - }; - - enum RockerSelectionMode { - RockerSelectionModeOff = 0, - RockerSelectionModeOn - }; - -public: - explicit HbInputVirtualRocker(HbInputVkbWidget *parent = 0); - virtual ~HbInputVirtualRocker(); - - RockerSelectionMode selectionMode() const; - - enum { Type = Hb::ItemType_VirtualTrackPoint }; - int type() const { - return Type; - } - -protected: // From QGraphicsItem - void mousePressEvent(QGraphicsSceneMouseEvent *event); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - void mouseMoveEvent(QGraphicsSceneMouseEvent *event); - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); - virtual void gestureEvent(QGestureEvent *event); - -signals: - void rockerDirection(int aDirection, HbInputVirtualRocker::RockerSelectionMode aSelectionMode); - -protected: - HbInputVirtualRocker(HbInputVirtualRockerPrivate &dd, QGraphicsWidget *parent = 0); - HbInputVirtualRockerPrivate *const d_ptr; - -private: - Q_DISABLE_COPY(HbInputVirtualRocker) - Q_DECLARE_PRIVATE_D(d_ptr, HbInputVirtualRocker) -}; - -#endif // HB_INPUT_VIRTUAL_ROCKER_H - -// End of file diff -r 4633027730f5 -r e6ad4ef83b23 src/hbinput/inputwidgets/hbinputvkbwidget.cpp --- a/src/hbinput/inputwidgets/hbinputvkbwidget.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbinput/inputwidgets/hbinputvkbwidget.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -654,28 +654,6 @@ } /*! -\deprecated HbInputVkbWidget::setRockerVisible(bool) - is deprecated. - -Sets virtual rocker visibility. -*/ -void HbInputVkbWidget::setRockerVisible(bool visible) -{ - Q_UNUSED(visible); -} - -/*! -\deprecated HbInputVkbWidget::isRockerVisible() const - is deprecated. - -Returns true if virtual rocker is allowed to be visible. -*/ -bool HbInputVkbWidget::isRockerVisible() const -{ - return false; -} - -/*! Returns active keypad mode. Possible values are EModeAbc, EModeNumeric and EModeSct. */ HbKeypadMode HbInputVkbWidget::mode() const @@ -994,18 +972,6 @@ } /*! -\deprecated HbInputVkbWidget::rockerPosition() - is deprecated. - -Returns the virtual rocker position. The default position is in the middle -of keypad button area. -*/ -QPointF HbInputVkbWidget::rockerPosition() -{ - return QPointF(); -} - -/*! Sets the status of the background drawing. This method can be used to optimize vkb widget drawing. If it is known that the widget will cover whole vkb area and there are no places where the background shows through, then the background @@ -1017,7 +983,6 @@ d->mDrawbackground = backgroundEnabled; } - /*! Returns all possible keys that the user could have intended to press for the last registered touch along with their corresponding probability. @@ -1307,6 +1272,14 @@ } } +/*! +\reimp + */ +HbFrameDrawer* HbInputVkbWidget::iconDrawer() +{ + Q_D(HbInputVkbWidget); + return d->mIconDrawer; +} #include "moc_hbinputvkbwidget.cpp" // End of file diff -r 4633027730f5 -r e6ad4ef83b23 src/hbinput/inputwidgets/hbinputvkbwidget.h --- a/src/hbinput/inputwidgets/hbinputvkbwidget.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbinput/inputwidgets/hbinputvkbwidget.h Thu Sep 02 20:44:51 2010 +0300 @@ -29,7 +29,6 @@ #include #include #include -#include const int HbRepeatTimeout = 1000; const int HbRepeatTimeoutShort = 150; @@ -45,6 +44,7 @@ class HbView; class HbKeymap; class HbPanGesture; +class HbFrameDrawer; class HB_INPUT_EXPORT HbInputVkbWidget : public HbWidget, public HbVirtualKeyboard { @@ -95,9 +95,6 @@ virtual void setContentItem(QGraphicsLayoutItem *item); virtual QGraphicsLayoutItem *contentItem() const; - virtual void setRockerVisible(bool visible); - virtual bool isRockerVisible() const; - virtual void setKeyboardDimmed(bool dimmed); virtual void setBackgroundDrawing(bool backgroundEnabled); virtual QList probableKeypresses(); @@ -117,15 +114,15 @@ protected: // layout - QSizeF keypadButtonAreaSize(); - virtual QPointF rockerPosition(); + QSizeF keypadButtonAreaSize(); + HbFrameDrawer* iconDrawer(); public slots: void showSettingList(); void showSettingsView(); void closeSettingsView(); void executeMethodDialog(); - void closeSettingList(); + virtual void closeSettingList(); void settingsClosed(); void showSmileyPicker(int rows = 0, int columns = 0); void keypadLanguageChangeAnimationUpdate(qreal value); @@ -139,7 +136,6 @@ signals: void keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod closeMethod); - void rockerDirection(int direction, HbInputVirtualRocker::RockerSelectionMode selectionMode); void flickEvent(HbInputVkbWidget::HbFlickDirection direction); void smileySelected(QString text); void mouseMovedOutOfButton(); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbinput/inputwidgets/inputwidgets.pri --- a/src/hbinput/inputwidgets/inputwidgets.pri Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbinput/inputwidgets/inputwidgets.pri Thu Sep 02 20:44:51 2010 +0300 @@ -29,7 +29,6 @@ # hb input widget public headers PUBLIC_HEADERS += $$PWD/hbinputvkbwidget.h -PUBLIC_HEADERS += $$PWD/hbinputvirtualrocker.h PUBLIC_HEADERS += $$PWD/hbinputcandidatelist.h PUBLIC_HEADERS += $$PWD/hbinputmodeindicator.h PUBLIC_HEADERS += $$PWD/hbinputexactwordpopup.h @@ -52,7 +51,6 @@ # hb input widget sources SOURCES += $$PWD/hbinputvkbwidget.cpp -SOURCES += $$PWD/hbinputvirtualrocker.cpp SOURCES += $$PWD/hbinputcandidatelist.cpp SOURCES += $$PWD/hbinputmodeindicator.cpp SOURCES += $$PWD/hbinputexactwordpopup.cpp diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/devicedialogs/devicemessageboxplugin/devicemessageboxplugin.pro --- a/src/hbplugins/devicedialogs/devicemessageboxplugin/devicemessageboxplugin.pro Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/devicedialogs/devicemessageboxplugin/devicemessageboxplugin.pro Thu Sep 02 20:44:51 2010 +0300 @@ -50,7 +50,7 @@ MMP_RULES += SMPSAFE hblib.sources = Hb.dll - hblib.path = \sys\bin + hblib.path = /sys/bin hblib.depends = "(0xEEF9EA38), 1, 0, 0, {\"Hb\"}" pluginstub.sources = HbDeviceMessageBoxPlugin.dll diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/devicedialogs/devicemessageboxplugin/hbdevicemessageboxplugin.cpp --- a/src/hbplugins/devicedialogs/devicemessageboxplugin/hbdevicemessageboxplugin.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/devicedialogs/devicemessageboxplugin/hbdevicemessageboxplugin.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -24,6 +24,9 @@ ****************************************************************************/ #include +#ifdef Q_OS_SYMBIAN +#include +#endif // Q_OS_SYMBIAN #include #include @@ -70,13 +73,20 @@ { TRACE_ENTRY Q_UNUSED(deviceDialogType) + +#ifdef Q_OS_SYMBIAN + // If show group is higher than normal, a swEvent capability is required + if (showLevel(parameters) != NormalLevel) { + return (securityInfo["sym-caps"].toInt() >> ECapabilitySwEvent) & 1; + } else { + return true; // all clients are allowed to use. + } +#else Q_UNUSED(parameters) Q_UNUSED(securityInfo) - - // This plugin doesn't perform operations that may compromise security. // All clients are allowed to use. return true; - TRACE_EXIT +#endif // Q_OS_SYMBIAN } // Create device dialog widget @@ -128,13 +138,16 @@ const QVariantMap ¶meters, DeviceDialogInfo *info) const { TRACE_ENTRY - Q_UNUSED(parameters) Q_UNUSED(deviceDialogType) + unsigned int level = static_cast(showLevel(parameters)); + if (level > CriticalLevel) { + return false; + } + info->group = GenericDeviceDialogGroup; - info->flags = NoDeviceDialogFlags; - info->priority = DefaultPriority; - TRACE_EXIT + info->flags = level == NormalLevel ? NoDeviceDialogFlags : SecurityCheck; + info->showLevel = static_cast(level); return true; } @@ -166,3 +179,14 @@ TRACE_EXIT return d->mError; } + +// Search parameters for show group +int HbDeviceMessageBoxPlugin::showLevel(const QVariantMap ¶meters) +{ + int level = NormalLevel; + const QString propertyName("showLevel"); + if (parameters.contains(propertyName)) { + level = parameters[propertyName].toInt(); + } + return level; +} diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/devicedialogs/devicemessageboxplugin/hbdevicemessageboxplugin_p.h --- a/src/hbplugins/devicedialogs/devicemessageboxplugin/hbdevicemessageboxplugin_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/devicedialogs/devicemessageboxplugin/hbdevicemessageboxplugin_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -52,6 +52,7 @@ QStringList deviceDialogTypes() const; PluginFlags pluginFlags() const; int error() const; + static int showLevel(const QVariantMap ¶meters); private: Q_DISABLE_COPY(HbDeviceMessageBoxPlugin) diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/devicedialogs/devicemessageboxplugin/hbdevicemessageboxwidget.cpp --- a/src/hbplugins/devicedialogs/devicemessageboxplugin/hbdevicemessageboxwidget.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/devicedialogs/devicemessageboxplugin/hbdevicemessageboxwidget.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -306,6 +306,18 @@ return HbMessageBox::standardButtons(); } + +void HbDeviceMessageBoxWidget::setShowLevel(int level) +{ + // Show level can only be set on construction + Q_UNUSED(level) +} + +int HbDeviceMessageBoxWidget::showLevel() const +{ + return 0; +} + // Action (accept or reject) was triggered void HbDeviceMessageBoxWidget::actionTriggered() { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/devicedialogs/devicemessageboxplugin/hbdevicemessageboxwidget_p.h --- a/src/hbplugins/devicedialogs/devicemessageboxplugin/hbdevicemessageboxwidget_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/devicedialogs/devicemessageboxplugin/hbdevicemessageboxwidget_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -46,6 +46,7 @@ Q_PROPERTY(QString rejectAction READ rejectAction WRITE setRejectAction) Q_PROPERTY(QString animationDefinition READ animationDefinition WRITE setAnimationDefinition) Q_PROPERTY(HbMessageBox::StandardButtons standardButtons READ standardButtons WRITE setStandardButtons) + Q_PROPERTY(int showLevel READ showLevel WRITE setShowLevel) public: HbDeviceMessageBoxWidget(HbMessageBox::MessageBoxType type, const QVariantMap ¶meters); @@ -90,6 +91,8 @@ QString animationDefinition() const; void setStandardButtons(HbMessageBox::StandardButtons buttons); HbMessageBox::StandardButtons standardButtons() const; + void setShowLevel(int group); + int showLevel() const; static void parseActionData(QString &data); QString actionData(ActionIndex index) const; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/devicedialogs/devicenotificationdialogplugin/devicenotificationdialogplugin.pro --- a/src/hbplugins/devicedialogs/devicenotificationdialogplugin/devicenotificationdialogplugin.pro Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/devicedialogs/devicenotificationdialogplugin/devicenotificationdialogplugin.pro Thu Sep 02 20:44:51 2010 +0300 @@ -51,7 +51,7 @@ MMP_RULES += SMPSAFE hblib.sources = Hb.dll - hblib.path = \sys\bin + hblib.path = /sys/bin hblib.depends = "(0xEEF9EA38), 1, 0, 0, {\"Hb\"}" pluginstub.sources = HbDeviceNotificationDialogPlugin.dll diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/devicedialogs/devicenotificationdialogplugin/hbdevicenotificationdialogplugin.cpp --- a/src/hbplugins/devicedialogs/devicenotificationdialogplugin/hbdevicenotificationdialogplugin.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/devicedialogs/devicenotificationdialogplugin/hbdevicenotificationdialogplugin.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -70,13 +70,20 @@ { TRACE_ENTRY Q_UNUSED(deviceDialogType) + +#ifdef Q_OS_SYMBIAN + // If show group is higher than normal, a swEvent capability is required + if (showLevel(parameters) != NormalLevel) { + return (securityInfo["sym-caps"].toInt() >> ECapabilitySwEvent) & 1; + } else { + return true; // all clients are allowed to use. + } +#else Q_UNUSED(parameters) Q_UNUSED(securityInfo) - - // This plugin doesn't perform operations that may compromise security. All clients - // are allowed to use. + // All clients are allowed to use. return true; - TRACE_EXIT +#endif // Q_OS_SYMBIAN } // Create device dialog widget @@ -109,13 +116,14 @@ { TRACE_ENTRY Q_UNUSED(deviceDialogType); - Q_UNUSED(parameters); + unsigned int level = static_cast(showLevel(parameters)); + if (level > CriticalLevel) { + return false; + } info->group = DeviceNotificationDialogGroup; - info->flags = NoDeviceDialogFlags; - info->priority = DefaultPriority; - - TRACE_EXIT + info->flags = level == NormalLevel ? NoDeviceDialogFlags : SecurityCheck; + info->showLevel = static_cast(level); return true; } @@ -147,3 +155,14 @@ TRACE_EXIT return d->mError; } + +// Search parameters for show group +int HbDeviceNotificationDialogPlugin::showLevel(const QVariantMap ¶meters) +{ + int level = NormalLevel; + const QString propertyName("showLevel"); + if (parameters.contains(propertyName)) { + level = parameters[propertyName].toInt(); + } + return level; +} diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/devicedialogs/devicenotificationdialogplugin/hbdevicenotificationdialogplugin_p.h --- a/src/hbplugins/devicedialogs/devicenotificationdialogplugin/hbdevicenotificationdialogplugin_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/devicedialogs/devicenotificationdialogplugin/hbdevicenotificationdialogplugin_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -52,6 +52,7 @@ QStringList deviceDialogTypes() const; PluginFlags pluginFlags() const; int error() const; + static int showLevel(const QVariantMap ¶meters); private: Q_DISABLE_COPY(HbDeviceNotificationDialogPlugin) diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/devicedialogs/devicenotificationdialogplugin/hbdevicenotificationdialogwidget.cpp --- a/src/hbplugins/devicedialogs/devicenotificationdialogplugin/hbdevicenotificationdialogwidget.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/devicedialogs/devicenotificationdialogplugin/hbdevicenotificationdialogwidget.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -184,6 +184,17 @@ TRACE_EXIT } +void HbDeviceNotificationDialogWidget::setShowLevel(int level) +{ + // Show level can only be set on construction + Q_UNUSED(level) +} + +int HbDeviceNotificationDialogWidget::showLevel() const +{ + return 0; +} + // Widget is about to hide. Closing effect has ended. void HbDeviceNotificationDialogWidget::hideEvent(QHideEvent *event) { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/devicedialogs/devicenotificationdialogplugin/hbdevicenotificationdialogwidget_p.h --- a/src/hbplugins/devicedialogs/devicenotificationdialogplugin/hbdevicenotificationdialogwidget_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/devicedialogs/devicenotificationdialogplugin/hbdevicenotificationdialogwidget_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -39,6 +39,7 @@ Q_PROPERTY(QString iconName READ iconName WRITE setIconName) Q_PROPERTY(bool touchActivation READ isTouchActivating WRITE enableTouchActivation) Q_PROPERTY(QString animationDefinition READ animationDefinition WRITE setAnimationDefinition) + Q_PROPERTY(int showLevel READ showLevel WRITE setShowLevel) public: HbDeviceNotificationDialogWidget(const QVariantMap ¶meters); @@ -64,6 +65,9 @@ void hideEvent(QHideEvent *event); void showEvent(QShowEvent *event); + void setShowLevel(int level); + int showLevel() const; + QString animationDefinition() const; void setAnimationDefinition(QString &animationDefinition); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/devicedialogs/deviceprogressdialogplugin/deviceprogressdialogplugin.pro --- a/src/hbplugins/devicedialogs/deviceprogressdialogplugin/deviceprogressdialogplugin.pro Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/devicedialogs/deviceprogressdialogplugin/deviceprogressdialogplugin.pro Thu Sep 02 20:44:51 2010 +0300 @@ -51,7 +51,7 @@ MMP_RULES += SMPSAFE hblib.sources = Hb.dll - hblib.path = \sys\bin + hblib.path = /sys/bin hblib.depends = "(0xEEF9EA38), 1, 0, 0, {\"Hb\"}" pluginstub.sources = HbDeviceProgressDialogPlugin.dll diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/devicedialogs/deviceprogressdialogplugin/hbdeviceprogressdialogplugin.cpp --- a/src/hbplugins/devicedialogs/deviceprogressdialogplugin/hbdeviceprogressdialogplugin.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/devicedialogs/deviceprogressdialogplugin/hbdeviceprogressdialogplugin.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -70,13 +70,20 @@ { TRACE_ENTRY Q_UNUSED(deviceDialogType) + +#ifdef Q_OS_SYMBIAN + // If show group is higher than normal, a swEvent capability is required + if (showLevel(parameters) != NormalLevel) { + return (securityInfo["sym-caps"].toInt() >> ECapabilitySwEvent) & 1; + } else { + return true; // all clients are allowed to use. + } +#else Q_UNUSED(parameters) Q_UNUSED(securityInfo) - - // This plugin doesn't perform operations that may compromise security. All clients - // are allowed to use. + // All clients are allowed to use. return true; - TRACE_EXIT +#endif // Q_OS_SYMBIAN } // Create device dialog widget @@ -125,13 +132,16 @@ const QVariantMap ¶meters, DeviceDialogInfo *info) const { TRACE_ENTRY - Q_UNUSED(parameters) Q_UNUSED(deviceDialogType) + unsigned int level = static_cast(showLevel(parameters)); + if (level > CriticalLevel) { + return false; + } + info->group = GenericDeviceDialogGroup; - info->flags = NoDeviceDialogFlags; - info->priority = DefaultPriority; - TRACE_EXIT + info->flags = level == NormalLevel ? NoDeviceDialogFlags : SecurityCheck; + info->showLevel = static_cast(level); return true; } @@ -163,3 +173,14 @@ TRACE_EXIT return d->mError; } + +// Search parameters for show group +int HbDeviceProgressDialogPlugin::showLevel(const QVariantMap ¶meters) +{ + int level = 0; + const QString propertyName("showLevel"); + if (parameters.contains(propertyName)) { + level = parameters[propertyName].toInt(); + } + return level; +} diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/devicedialogs/deviceprogressdialogplugin/hbdeviceprogressdialogplugin_p.h --- a/src/hbplugins/devicedialogs/deviceprogressdialogplugin/hbdeviceprogressdialogplugin_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/devicedialogs/deviceprogressdialogplugin/hbdeviceprogressdialogplugin_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -52,6 +52,7 @@ QStringList deviceDialogTypes() const; PluginFlags pluginFlags() const; int error() const; + static int showLevel(const QVariantMap ¶meters); private: Q_DISABLE_COPY(HbDeviceProgressDialogPlugin) diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/devicedialogs/deviceprogressdialogplugin/hbdeviceprogressdialogwidget.cpp --- a/src/hbplugins/devicedialogs/deviceprogressdialogplugin/hbdeviceprogressdialogwidget.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/devicedialogs/deviceprogressdialogplugin/hbdeviceprogressdialogwidget.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -208,7 +208,7 @@ { TRACE_ENTRY QAction *act = action(Cancel); - QString actionData; + QString actionData; if (act) { actionData.append(actionTextTag); actionData.append(act->text()); @@ -277,6 +277,17 @@ mAnimationDefinition = animationDefinition; } +void HbDeviceProgressDialogWidget::setShowLevel(int level) +{ + // Level can only be set on construction + Q_UNUSED(level) +} + +int HbDeviceProgressDialogWidget::showLevel() const +{ + return 0; +} + // Widget is about to hide. Closing effect has ended. void HbDeviceProgressDialogWidget::hideEvent(QHideEvent *event) { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/devicedialogs/deviceprogressdialogplugin/hbdeviceprogressdialogwidget_p.h --- a/src/hbplugins/devicedialogs/deviceprogressdialogplugin/hbdeviceprogressdialogwidget_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/devicedialogs/deviceprogressdialogplugin/hbdeviceprogressdialogwidget_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -42,6 +42,7 @@ Q_PROPERTY(QString iconName READ iconName WRITE setIconName) Q_PROPERTY(QString animationDefinition READ animationDefinition WRITE setAnimationDefinition) Q_PROPERTY(QString cancelAction READ cancelAction WRITE setCancelAction) + Q_PROPERTY(int showLevel READ showLevel WRITE setShowLevel) public: HbDeviceProgressDialogWidget(HbProgressDialog::ProgressDialogType progressDialogType, const QVariantMap ¶meters); @@ -72,6 +73,8 @@ void showEvent(QShowEvent *event); void setAnimationDefinition(QString &animationDefinition); QString animationDefinition() const; + void setShowLevel(int level); + int showLevel() const; QAction *action(ActionIndex index) const; static void parseActionData(QString &data); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenu_p.h --- a/src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenu_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenu_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -85,7 +85,7 @@ Q_DECLARE_PRIVATE_D(d_ptr, HbDialog) Q_DISABLE_COPY(HbIndicatorMenu) - int mLastError; + int mLastError; bool mShowEventReceived; }; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenuplugin.cpp --- a/src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenuplugin.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenuplugin.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -111,7 +111,7 @@ info->group = IndicatorGroup; info->flags = ReceiveIndicatorStatus; - info->priority = DefaultPriority; + info->showLevel = NormalLevel; TRACE_EXIT return true; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/devicedialogs/indicatormenuplugin/indicatormenuplugin.pro --- a/src/hbplugins/devicedialogs/indicatormenuplugin/indicatormenuplugin.pro Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/devicedialogs/indicatormenuplugin/indicatormenuplugin.pro Thu Sep 02 20:44:51 2010 +0300 @@ -54,7 +54,7 @@ MMP_RULES += SMPSAFE hblib.sources = Hb.dll - hblib.path = \sys\bin + hblib.path = /sys/bin hblib.depends = "(0xEEF9EA38), 1, 0, 0, {\"Hb\"}" pluginstub.sources = HbIndicatorMenuPlugin.dll diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectengine.cpp --- a/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectengine.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectengine.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -38,8 +38,8 @@ #include #include #include "hbmenucontainer_p.h" -#include "hbinputvirtualrocker.h" #include +#include // remove with HB_DEPRECATED /* Constructor @@ -105,8 +105,8 @@ case Hb::InstantSelectionChanged: propertyName = "selectionChangedFeedbackEffect"; break; - case Hb::InstantMultitouchActivated: - propertyName = "multitouchActivatedFeedbackEffect"; + case Hb::InstantAdvancedGestureActivated: + propertyName = "advancedGestureActivatedFeedbackEffect"; break; default: propertyName = "defaultFeedbackEffect"; @@ -178,8 +178,8 @@ case Hb::InstantSelectionChanged: propertyName = "selectionChangedFeedbackModalities"; break; - case Hb::InstantMultitouchActivated: - propertyName = "multitouchActivatedFeedbackModalities"; + case Hb::InstantAdvancedGestureActivated: + propertyName = "advancedGestureActivatedFeedbackModalities"; break; default: propertyName = "defaultFeedbackModalities"; @@ -459,37 +459,6 @@ effect = HbFeedbackEffectUtils::instantOnEditorHighlight(edit, previousCursorPosition) ; previousCursorPosition = edit->cursorPosition(); } - } - else if (const HbInputVirtualRocker *trackPoint = qobject_cast(widget)) { - if (trackPoint && trackPoint->mainWindow() && trackPoint->mainWindow()->scene() && - trackPoint->mainWindow()->scene()->focusItem()) { - - QGraphicsItem* graphicsItem = trackPoint->mainWindow()->scene()->focusItem(); - - if (graphicsItem->isWidget()) { - if (static_cast(graphicsItem)->inherits("HbAbstractEdit")) { - if (HbAbstractEdit* edit = static_cast(graphicsItem)) { - if (edit->cursorPosition() != previousCursorPosition) { - effect = HbFeedbackEffectUtils::instantOnEditorHighlight(edit, previousCursorPosition); - previousCursorPosition = edit->cursorPosition(); - } - } - } - else if (static_cast(graphicsItem)->inherits("QGraphicsWebView") ) - { - // This takes care of the case when the track point is used on a QGraphicsWebView (for e.g. cWRT) - QVariant v; - v = graphicsItem->scene()->inputMethodQuery( Qt::ImCursorPosition ); - if ( v.isValid() && v.canConvert()) { - int currentCursorPosition = v.toInt(); - if (currentCursorPosition != previousCursorPosition) { - effect = HbFeedbackEffectUtils::instantOnEditorHighlight(trackPoint, previousCursorPosition); - previousCursorPosition = currentCursorPosition; - } - } - } - } - } } else { effect = HbFeedbackEffectUtils::instantOnDrag(widget, modifiers()); } @@ -639,14 +608,23 @@ */ void HbFeedbackEffectEngine::multitouchActivated(const HbWidget *widget) { + HB_DEPRECATED("HbFeedbackEffectEngine::multitouchActivated(const HbWidget*) is deprecated. Use HbFeedbackEffectEngine::advancedGestureActivated(const HbWidget*) instead"); + advancedGestureActivated(widget); +} + +/* + Called by the feedback manager when a touch gesture with more than one finger is detected. +*/ +void HbFeedbackEffectEngine::advancedGestureActivated(const HbWidget *widget) +{ HbFeedback::InstantEffect effect = HbFeedback::None ; HbFeedback::Modalities modalities = 0 ; - Hb::InstantInteraction interaction = Hb::InstantMultitouchActivated; + Hb::InstantInteraction interaction = Hb::InstantAdvancedGestureActivated; if(widgetOverridesEffect( widget, interaction)) { effect = overrider.newInstantEffect; } else { - effect = HbFeedback::MultitouchActivate; + effect = HbFeedback::AdvancedGestureActivate; } if(widgetOverridesModalities(widget,interaction)) { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectengine.h --- a/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectengine.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectengine.h Thu Sep 02 20:44:51 2010 +0300 @@ -57,7 +57,8 @@ void boundaryReached(const HbWidget *widget); void rotated90Degrees(const HbWidget *widget); void selectionChanged(const HbWidget *widget); - void multitouchActivated(const HbWidget *widget); + void multitouchActivated(const HbWidget *widget); // deprecated + void advancedGestureActivated(const HbWidget *widget); void continuousTriggered(const HbWidget *widget, Hb::ContinuousInteraction interaction, QPointF delta); void continuousStopped(const HbWidget *widget, Hb::ContinuousInteraction interaction); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.cpp --- a/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -105,7 +104,7 @@ case Hb::ItemType_MenuItem: case Hb::ItemType_AbstractItemView: - + case Hb::ItemType_ListView: case Hb::ItemType_ListViewItem: @@ -712,49 +711,7 @@ } } } - else if (const HbInputVirtualRocker *trackPoint = qobject_cast(widget)) { - QGraphicsItem* graphicsItem = trackPoint->mainWindow()->scene()->focusItem(); - - if (graphicsItem->isWidget() && (static_cast(graphicsItem)->inherits("QGraphicsWebView"))) { - QVariant v; - v = graphicsItem->scene()->inputMethodQuery( Qt::ImCursorPosition ); - if ( v.isValid() && v.canConvert()) { - int index; - index = v.toInt(); - QVariant varSurrText; - varSurrText = graphicsItem->scene()->inputMethodQuery( Qt::ImSurroundingText ); - if ( varSurrText.isValid() ) { - QString text = varSurrText.toString(); - // Index (current cursor position) can be equal to the - // length of the string (for e.g. when the cursor is at the end) - // So we make sure we bring index within the bounds of the string - if (!text.isEmpty() && index <= text.count()) { - dist = abs(index - previousCursorPosition); - - if (previousCursorPosition < index || index == text.count()) { - index--; - } - QChar character = text.at(index); - emptyline = character.category() == QChar::Separator_Paragraph; - - if (emptyline) { - effect = HbFeedback::EmptyLineSelection; - } - else if (dist > 1) { - effect = HbFeedback::LineSelection; - } - else if (character.isSpace()) { - effect = HbFeedback::BlankSelection; - } - else { - effect = HbFeedback::TextSelection; - } - } - } - } - } - } return effect; } @@ -847,8 +804,8 @@ default: break; } - } - } + } + } else if (const HbAbstractItemView* itemView = qobject_cast(widget)) { if (itemView->selectionMode() == HbAbstractItemView::MultiSelection && (modifiers & Hb::ModifierScrolling)) { effect = HbFeedback::MultipleCheckbox; @@ -1038,7 +995,7 @@ modalities = HbFeedback::Tactile; break; - case Hb::InstantMultitouchActivated: + case Hb::InstantAdvancedGestureActivated: modalities = HbFeedback::Tactile | HbFeedback::Audio; break; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputengines/hbautocomplete/hbautocomplete.cpp --- a/src/hbplugins/inputengines/hbautocomplete/hbautocomplete.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputengines/hbautocomplete/hbautocomplete.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -214,7 +214,7 @@ */ QString HbAutoComplete::vendorIdString() const { - return HbAutoCompleteVendorIdString; + return HbAutoCompleteVendorIdString; } /*! @@ -250,9 +250,9 @@ d->mActiveCollection = 0; d->mActiveDictionary = HbExtraDictionaryFactory::instance()->createDictionary(aId); - if (d->mActiveDictionary) { - d->mActiveDictionary->setHostEngine(this); - } + if (d->mActiveDictionary) { + d->mActiveDictionary->setHostEngine(this); + } clear(); } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/common/hbinputabstractbase.cpp --- a/src/hbplugins/inputmethods/common/hbinputabstractbase.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/common/hbinputabstractbase.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -41,6 +41,7 @@ HbInputAbstractMethod::HbInputAbstractMethod() { mVanillQwertySwitch = new HbAction(QString("QTY")); + mIsFocusOnVanillaQtEditor = false; } // --------------------------------------------------------------------------- @@ -163,7 +164,7 @@ bool HbInputAbstractMethod::isSctModeActive() const { - return false; + return false; } @@ -174,16 +175,16 @@ void HbInputAbstractMethod::focusReceived() { - bool isVannilaApp = false; + mIsFocusOnVanillaQtEditor = false; QInputContext* context = qApp->inputContext(); if (context && context->focusWidget()) { QWidget *focusedWidget = context->focusWidget(); if (!focusedWidget->inherits("HbMainWindow")) { - isVannilaApp = true; + mIsFocusOnVanillaQtEditor = true; } } - if(isVannilaApp && focusObject() ) { + if(mIsFocusOnVanillaQtEditor && focusObject() ) { QList customActions= focusObject()->editorInterface().actions(); if(!customActions.contains(mVanillQwertySwitch)) { disconnect(mVanillQwertySwitch, SIGNAL(triggered(bool))); @@ -196,16 +197,8 @@ void HbInputAbstractMethod::focusLost() { - bool isVannilaApp = false; - QInputContext* context = qApp->inputContext(); - if (context && context->focusWidget()) { - QWidget *focusedWidget = context->focusWidget(); - if (!focusedWidget->inherits("HbMainWindow")) { - isVannilaApp = true; - } - } - if(isVannilaApp && focusObject()) { + if(mIsFocusOnVanillaQtEditor && focusObject()) { QList customActions= focusObject()->editorInterface().actions(); if(customActions.contains(mVanillQwertySwitch)) { disconnect(mVanillQwertySwitch, SIGNAL(triggered(bool))); @@ -235,7 +228,7 @@ QChar HbInputAbstractMethod ::previousChar() { - return QChar(); + return QChar(); } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/common/hbinputabstractbase.h --- a/src/hbplugins/inputmethods/common/hbinputabstractbase.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/common/hbinputabstractbase.h Thu Sep 02 20:44:51 2010 +0300 @@ -52,8 +52,8 @@ virtual void starKeySelected(); virtual void getCandidatePositionAndSize(HbCandidateList *candidatePopup, HbInputVkbWidget *currentKeypad, QPointF & pos,QSizeF & size); - virtual bool isSctModeActive() const; - virtual QChar previousChar(); + virtual bool isSctModeActive() const; + virtual QChar previousChar(); virtual HbKeyboardType currentKeyboardType() const; public: // From HbInputMethod void focusReceived(); @@ -63,6 +63,7 @@ void switchKeypad(bool isActive); private: HbAction *mVanillQwertySwitch; + bool mIsFocusOnVanillaQtEditor; Q_DISABLE_COPY(HbInputAbstractMethod) }; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/common/hbinputbasichandler.cpp --- a/src/hbplugins/inputmethods/common/hbinputbasichandler.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/common/hbinputbasichandler.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -181,7 +181,7 @@ if(d->mAutoCompleter) { d->mInputMethod->closeAutoCompletionPopup(); } - break; + break; default: ret = HbInputModeHandler::filterEvent(event); break; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/common/hbinputmodehandler.cpp --- a/src/hbplugins/inputmethods/common/hbinputmodehandler.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/common/hbinputmodehandler.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -49,6 +49,7 @@ Q_Q(HbInputModeHandler); mTimer = new QTimer(q); q->connect(mTimer, SIGNAL(timeout()), q, SLOT(_q_timeout())); + mTimer->setSingleShot(true); } // A virtual timeout function mode handlers should implement this slot. @@ -87,7 +88,7 @@ { allowedChars.clear(); HbInputLanguage language = mInputMethod->inputState().language(); - + if (!mKeymap) { mKeymap = HbKeymapFactory::instance()->keymap(language); } @@ -96,13 +97,13 @@ return; } QString chars = mappedKey->characters(modifiers); - // check whether current input language supports native digits. if yes, replace latin digits with native digits + // check whether current input language supports native digits. if yes, replace latin digits with native digits for (int i = 0; i < chars.length(); i++) { if (chars.at(i) >= '0' && chars.at(i) <= '9') { chars = chars.replace(chars.at(i), HbInputUtils::findFirstNumberCharacterBoundToKey(mappedKey, - language, HbInputUtils::inputDigitType(language))); - } - } + language, HbInputUtils::inputDigitType(language))); + } + } // We need to see which of the characters in keyData are allowed to the editor. // this looks like expensive operation, need to find out a better way/place to do it. HbInputFocusObject *focusedObject = mInputMethod->focusObject(); @@ -168,8 +169,8 @@ if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) { const QKeyEvent *keyEvent = static_cast(event); return filterEvent(keyEvent); - } - } + } + } return false; } @@ -272,17 +273,17 @@ if (!d->mKeymap) { d->mKeymap = HbKeymapFactory::instance()->keymap(language); } - bool isNumericEditor = d->mInputMethod->focusObject()->editorInterface().isNumericEditor(); - HbInputDigitType digitType = HbInputUtils::inputDigitType(language); - if (isNumericEditor) { - QLocale::Language systemLanguage = QLocale::system().language(); - if (language.language() != systemLanguage) { + bool isNumericEditor = d->mInputMethod->focusObject()->editorInterface().isNumericEditor(); + HbInputDigitType digitType = HbInputUtils::inputDigitType(language); + if (isNumericEditor) { + QLocale::Language systemLanguage = QLocale::system().language(); + if (language.language() != systemLanguage) { digitType = HbDigitTypeLatin; - } - } + } + } QChar numChr = HbInputUtils::findFirstNumberCharacterBoundToKey( d->mKeymap->keyForKeycode(type, key), language, digitType); - // when a number is to be entered, it should commit + // when a number is to be entered, it should commit // the previous string and then append the number to the string if (numChr != 0) { commitAndAppendString(numChr); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/common/hbinputmodehandler.h --- a/src/hbplugins/inputmethods/common/hbinputmodehandler.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/common/hbinputmodehandler.h Thu Sep 02 20:44:51 2010 +0300 @@ -72,7 +72,7 @@ HbInputModeActionFocusRecieved, // focus received state HbInputModeActionFocusLost, // focus lost state HbInputModeActionCancelButtonPress, - HbInputModeActionCloseSpellQuery, + HbInputModeActionCloseSpellQuery, HbInputModeActionRestorePreviousState // more.. }; @@ -92,7 +92,7 @@ virtual void commitAndUpdate(const QString& string, int replaceFrom = 0, int replaceLength = 0, bool isAsync = false); void sendAndUpdate(QEvent &event); virtual void setKeymap(const HbKeymap* keymap); - void togglePrediction(); + void togglePrediction(); signals: // incase one mode handler is not capable of processing the events. @@ -188,7 +188,6 @@ void commitExactWord(); virtual void candidatePopupClosed(QString activatedWord, int closingKey); virtual void showExactWordPopupIfNeeded(); - void closeSpellQueryDialog(); void spellQueryDialogClosed(QObject *savedFocusObject,HbInputSpellQuery::HbSpellCloseReason closeReason,const QString &string); void setAutocompletionStatus(bool status); public slots: @@ -197,6 +196,7 @@ void sctCharacterSelected(QString character); void smileySelected(QString smiley); void launchSpellQueryDialog(); + void closeSpellQueryDialog(); signals://some useful signals related to popups void launchInputQueryPopup(QString editWord); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/common/hbinputnumerichandler.cpp --- a/src/hbplugins/inputmethods/common/hbinputnumerichandler.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/common/hbinputnumerichandler.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -73,8 +73,8 @@ commitAndUpdate(qc); break; } - case HbInputButton::ButtonKeyCodeSettings: - break; + case HbInputButton::ButtonKeyCodeSettings: + break; default: ret = HbInputModeHandler::filterEvent(event); break; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/common/hbinputpredictionhandler.cpp --- a/src/hbplugins/inputmethods/common/hbinputpredictionhandler.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/common/hbinputpredictionhandler.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -81,14 +81,14 @@ //To prevent showing autocompletion part while deleting the characters using backspace key mShowTail = false; mShowTooltip = false; - bool unused = false; + bool unused = false; mEngine->updateCandidates(mBestGuessLocation, unused); - //If Input length greater or equal to one then Append the current word to candidate - if (!mCandidates->count() && mEngine->inputLength() >= 1) { - mCandidates->append(mEngine->currentWord()); + //If Input length greater or equal to one then Append the current word to candidate + if (!mCandidates->count() && mEngine->inputLength() >= 1) { + mCandidates->append(mEngine->currentWord()); } - mCanContinuePrediction = true; - // update the editor with the new preedit text. + mCanContinuePrediction = true; + // update the editor with the new preedit text. updateEditor(); return; } else { @@ -96,7 +96,7 @@ // once the word is committed, we can not bring it back to inline edit. // so if the engine does not have any data, we just send backspace event to the editor. Q_Q(HbInputPredictionHandler); - QKeyEvent event = QKeyEvent(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier); + QKeyEvent event = QKeyEvent(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier); q->sendAndUpdate(event); event = QKeyEvent(QEvent::KeyRelease, Qt::Key_Backspace, Qt::NoModifier); q->sendAndUpdate(event); @@ -208,7 +208,7 @@ int taillength = mCandidates->at(mBestGuessLocation).length() - mEngine->inputLength(); if (taillength > 0 && mShowTail) { // TODO: Color from skin should be used - QColor col = HbColorScheme::color("qtc_input_hint_normal"); + QColor col = HbColorScheme::color("qtc_input_hint_normal"); QBrush brush(col); QTextCharFormat gray; gray.setForeground(brush); @@ -220,11 +220,11 @@ } else { list.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, mEngine->inputLength(), taillength, gray)); } - list.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor, mEngine->inputLength(), 0, 0)); + list.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor, mEngine->inputLength(), 0, 0)); QInputMethodEvent event(mCandidates->at(mBestGuessLocation), list); focusedObject->sendEvent(event); } else { - list.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor, mCandidates->at(mBestGuessLocation).length(), 0, 0)); + list.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor, mCandidates->at(mBestGuessLocation).length(), 0, 0)); QInputMethodEvent event(mCandidates->at(mBestGuessLocation).left(mEngine->inputLength()), list); focusedObject->sendEvent(event); } @@ -266,14 +266,14 @@ { QString currentSelection = focusObject->inputMethodQuery(Qt::ImCurrentSelection).toString(); if(currentSelection.length()) { - QKeyEvent event = QKeyEvent(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier); + QKeyEvent event = QKeyEvent(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier); q->sendAndUpdate(event); event = QKeyEvent(QEvent::KeyRelease, Qt::Key_Backspace, Qt::NoModifier); q->sendAndUpdate(event); } else { deleteOneCharacter(); } - } + } ret = true; break; @@ -381,7 +381,7 @@ //The mouse has been clicked on the pre-editing word, launch candidate list mInputMethod->launchCandidatePopup(*mCandidates); - } + } } } @@ -408,12 +408,12 @@ void HbInputPredictionHandlerPrivate::commit() { if (mEngine && mEngine->inputLength() > 0 && mCandidates->count() > 0) { - - // Close exact word pop up in qwerty when the word is committed - if(HbInputUtils::isQwertyKeyboard(mInputMethod->inputState().keyboard())) { - mInputMethod->closeExactWordPopup(); - } - + + // Close exact word pop up in qwerty when the word is committed + if(HbInputUtils::isQwertyKeyboard(mInputMethod->inputState().keyboard())) { + mInputMethod->closeExactWordPopup(); + } + QString commitString = getCommitString(); // need to update the freq information @@ -450,9 +450,9 @@ Q_Q(HbInputPredictionHandler); // Close exact word pop up in qwerty when the word is committed - if(HbInputUtils::isQwertyKeyboard(mInputMethod->inputState().keyboard())) { - mInputMethod->closeExactWordPopup(); - } + if(HbInputUtils::isQwertyKeyboard(mInputMethod->inputState().keyboard())) { + mInputMethod->closeExactWordPopup(); + } q->commitAndUpdate(string, 0, 0, isAsync); @@ -482,10 +482,10 @@ { Q_Q(HbInputPredictionHandler); - // Close exact word pop up in qwerty when the word is committed - if(HbInputUtils::isQwertyKeyboard(mInputMethod->inputState().keyboard())) { - mInputMethod->closeExactWordPopup(); - } + // Close exact word pop up in qwerty when the word is committed + if(HbInputUtils::isQwertyKeyboard(mInputMethod->inputState().keyboard())) { + mInputMethod->closeExactWordPopup(); + } q->sendAndUpdate(event); @@ -531,7 +531,7 @@ mEngine->deleteKeyPress(); mEngine->updateCandidates(mBestGuessLocation, isCustomWord); if (mCandidates->count()){ - (*mCandidates)[mBestGuessLocation] = (*mCandidates)[mBestGuessLocation].left(mEngine->inputLength()); + (*mCandidates)[mBestGuessLocation] = (*mCandidates)[mBestGuessLocation].left(mEngine->inputLength()); (*mCandidates)[mBestGuessLocation].append("?"); } else { //Should the mBestGuessLocation not be zero. @@ -555,7 +555,7 @@ { //update the editor with pre-edit text mEngine->setWord(string); - bool used = false; + bool used = false; mEngine->updateCandidates(mBestGuessLocation, used); if(showAutocompletionPart && mShowTail) { mShowTail = true; @@ -731,7 +731,7 @@ void HbInputPredictionHandler::sctCharacterSelected(QString character) { Q_D(HbInputPredictionHandler); - //d->mShowTail = false; + //d->mShowTail = false; d->commit(); HbInputModeHandler::sctCharacterSelected(character); } @@ -841,7 +841,7 @@ if(abstractEdit) { abstractEdit->setCursorPosition(abstractEdit->cursorPosition()); } - HbInputMethod::activeInputMethod()->setFocusObject(newFocusObject); + HbInputMethod::activeInputMethod()->setFocusObject(newFocusObject); if (closeReason == HbInputSpellQuery::HbOkPressed) { d->commit(string,true); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/hardwareinput/hardwareinput.pro --- a/src/hbplugins/inputmethods/hardwareinput/hardwareinput.pro Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/hardwareinput/hardwareinput.pro Thu Sep 02 20:44:51 2010 +0300 @@ -39,31 +39,31 @@ HEADERS += hardwareinputplugin.h \ hbhardware12key.h \ - hbhardwareqwerty.h \ + hbhardwareqwerty.h \ hbhardwareinputbasic12keyhandler.h \ - hbhardwareinputbasicqwertyhandler.h \ - hbhardwareinputnumericqwertyhandler.h \ - hbhardwareinputpredictionqwertyhandler.h \ - ..\common\hbinputbasichandler_p.h \ - ..\common\hbinputmodehandler.h \ - ..\common\hbinputmodehandler_p.h \ + hbhardwareinputbasicqwertyhandler.h \ + hbhardwareinputnumericqwertyhandler.h \ + hbhardwareinputpredictionqwertyhandler.h \ + ../common/hbinputbasichandler_p.h \ + ../common/hbinputmodehandler.h \ + ../common/hbinputmodehandler_p.h \ hbhardwareinputnumeric12keyhandler.h \ - ..\common\hbinputnumerichandler_p.h \ + ../common/hbinputnumerichandler_p.h \ hbhardwareinputprediction12keyhandler.h \ - ..\common\hbinputpredictionhandler_p.h + ../common/hbinputpredictionhandler_p.h SOURCES += hardwareinputplugin.cpp \ hbhardware12key.cpp \ - hbhardwareqwerty.cpp \ + hbhardwareqwerty.cpp \ hbhardwareinputbasic12keyhandler.cpp \ - hbhardwareinputbasicqwertyhandler.cpp \ - hbhardwareinputnumericqwertyhandler.cpp \ - hbhardwareinputpredictionqwertyhandler.cpp \ - ..\common\hbinputbasichandler.cpp \ - ..\common\hbinputmodehandler.cpp \ + hbhardwareinputbasicqwertyhandler.cpp \ + hbhardwareinputnumericqwertyhandler.cpp \ + hbhardwareinputpredictionqwertyhandler.cpp \ + ../common/hbinputbasichandler.cpp \ + ../common/hbinputmodehandler.cpp \ hbhardwareinputnumeric12keyhandler.cpp \ - ..\common\hbinputnumerichandler.cpp \ + ../common/hbinputnumerichandler.cpp \ hbhardwareinputprediction12keyhandler.cpp \ - ..\common\hbinputpredictionhandler.cpp + ../common/hbinputpredictionhandler.cpp symbian { TARGET.EPOCALLOWDLLDATA = 1 diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/hardwareinput/hardwareinputplugin.cpp --- a/src/hbplugins/inputmethods/hardwareinput/hardwareinputplugin.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/hardwareinput/hardwareinputplugin.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -58,13 +58,13 @@ // QInputContext* HbHardwareInputPlugin::create(const QString& key) { - if (key == QString("HbHardware12key")) { - return new HbHardware12key(); - } else if (key == QString("HbHardwareQwerty")) { + if (key == QString("HbHardware12key")) { + return new HbHardware12key(); + } else if (key == QString("HbHardwareQwerty")) { return new HbHardwareQwerty(); - } else { - return 0; - } + } else { + return 0; + } } // --------------------------------------------------------------------------- @@ -73,14 +73,14 @@ // --------------------------------------------------------------------------- // QString HbHardwareInputPlugin::description(const QString& key) -{ - if (key == QString("HbHardware12key")) { - return QString("HW phone keypad input"); +{ + if (key == QString("HbHardware12key")) { + return QString("HW phone keypad input"); } else if (key == QString("HbHardwareQwerty")) { return QString("HW phone Qwerty keypad input"); - } else { - return QString(""); - } + } else { + return QString(""); + } } // --------------------------------------------------------------------------- @@ -90,13 +90,13 @@ // QString HbHardwareInputPlugin::displayName(const QString& key) { - if (key == QString("HbHardware12key")) { - return QString("HW 12-key"); + if (key == QString("HbHardware12key")) { + return QString("HW 12-key"); } else if (key == QString("HbHardwareQwerty")) { return QString("HW phone Qwerty keypad input"); - } else { - return QString(""); - } + } else { + return QString(""); + } } // --------------------------------------------------------------------------- @@ -106,10 +106,10 @@ // QStringList HbHardwareInputPlugin::keys() const { - QStringList keys; - keys.append(QString("HbHardware12key")); - keys.append(QString("HbHardwareQwerty")); - return keys; + QStringList keys; + keys.append(QString("HbHardware12key")); + keys.append(QString("HbHardwareQwerty")); + return keys; } // --------------------------------------------------------------------------- @@ -119,7 +119,7 @@ // QStringList HbHardwareInputPlugin::languages(const QString& /*key*/) { - return QStringList(); + return QStringList(); } // diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/hardwareinput/hardwareinputplugin.h --- a/src/hbplugins/inputmethods/hardwareinput/hardwareinputplugin.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/hardwareinput/hardwareinputplugin.h Thu Sep 02 20:44:51 2010 +0300 @@ -30,18 +30,18 @@ class HbHardwareInputPlugin : public QInputContextPlugin { - Q_OBJECT + Q_OBJECT public: - HbHardwareInputPlugin(QObject *parent = 0); - ~HbHardwareInputPlugin(); + HbHardwareInputPlugin(QObject *parent = 0); + ~HbHardwareInputPlugin(); public: // From QInputContextPlugin - QInputContext* create(const QString& key); - QString description(const QString& key); - QString displayName(const QString& key); - QStringList keys() const; - QStringList languages(const QString& key); + QInputContext* create(const QString& key); + QString description(const QString& key); + QString displayName(const QString& key); + QStringList keys() const; + QStringList languages(const QString& key); }; #endif // hardwareinputplugin_IMPL_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/hardwareinput/hbhardware12key.cpp --- a/src/hbplugins/inputmethods/hardwareinput/hbhardware12key.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/hardwareinput/hbhardware12key.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -200,7 +200,7 @@ //activateState(inputState); //focusedObject->editorInterface().setInputMode(mInputMode); //focusedObject->syncEditorInterface(); - HbInputFocusObject *focusedObject = focusObject(); + HbInputFocusObject *focusedObject = focusObject(); if (focusedObject) { // Just refresh the situation. inputStateActivated(inputState()); @@ -508,7 +508,7 @@ mCandidatePopup->resize(candListSize); } - mCandidatePopup->setBackgroundFaded(false); + mCandidatePopup->setBackgroundFaded(false); mCandidatePopup->show(); } else if (mCandidatePopup->isVisible()) { mCandidatePopup->hide(); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/hardwareinput/hbhardwareinputbasic12keyhandler.cpp --- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputbasic12keyhandler.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputbasic12keyhandler.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -35,24 +35,24 @@ class HbHardwareInputBasic12KeyHandlerPrivate: public HbInputBasicHandlerPrivate { - Q_DECLARE_PUBLIC(HbHardwareInputBasic12KeyHandler) + Q_DECLARE_PUBLIC(HbHardwareInputBasic12KeyHandler) public: - HbHardwareInputBasic12KeyHandlerPrivate(); - ~HbHardwareInputBasic12KeyHandlerPrivate(); + HbHardwareInputBasic12KeyHandlerPrivate(); + ~HbHardwareInputBasic12KeyHandlerPrivate(); - void handleAlphaEvent(int buttonId); - bool keyPressed(const QKeyEvent *keyEvent); - bool keyReleased(const QKeyEvent *keyEvent); - bool actionHandler(HbInputModeHandler::HbInputModeAction action); + void handleAlphaEvent(int buttonId); + bool keyPressed(const QKeyEvent *keyEvent); + bool keyReleased(const QKeyEvent *keyEvent); + bool actionHandler(HbInputModeHandler::HbInputModeAction action); - void _q_timeout(); + void _q_timeout(); public: - int mLastKey; - QChar mCurrentChar; - int mNumChr; - bool mButtonDown; - HbInputFocusObject *mCurrentlyFocused; + int mLastKey; + QChar mCurrentChar; + int mNumChr; + bool mButtonDown; + HbInputFocusObject *mCurrentlyFocused; }; HbHardwareInputBasic12KeyHandlerPrivate::HbHardwareInputBasic12KeyHandlerPrivate() @@ -71,92 +71,92 @@ // handles the key press events. It starts a multitap timer as well. void HbHardwareInputBasic12KeyHandlerPrivate::handleAlphaEvent(int buttonId) { - Q_Q(HbHardwareInputBasic12KeyHandler); - HbInputFocusObject *focusObject = 0; - focusObject = mInputMethod->focusObject(); - if (!focusObject) { - return; - } + Q_Q(HbHardwareInputBasic12KeyHandler); + HbInputFocusObject *focusObject = 0; + focusObject = mInputMethod->focusObject(); + if (!focusObject) { + return; + } - mCurrentChar = q->getNthCharacterInKey(mNumChr, buttonId); + mCurrentChar = q->getNthCharacterInKey(mNumChr, buttonId); - if (mCurrentChar != 0) { - QString str; - str += mCurrentChar; + if (mCurrentChar != 0) { + QString str; + str += mCurrentChar; - QList list; - QInputMethodEvent event(str, list); - focusObject->sendEvent(event); - mTimer->start(HbMultiTapTimerTimeout); - } + QList list; + QInputMethodEvent event(str, list); + focusObject->sendEvent(event); + mTimer->start(HbMultiTapTimerTimeout); + } } bool HbHardwareInputBasic12KeyHandlerPrivate::keyPressed(const QKeyEvent *keyEvent) { - Q_Q(HbHardwareInputBasic12KeyHandler); - HbInputFocusObject *focusObject = 0; - focusObject = mInputMethod->focusObject(); - if (!focusObject) { - return false; - } + Q_Q(HbHardwareInputBasic12KeyHandler); + HbInputFocusObject *focusObject = 0; + focusObject = mInputMethod->focusObject(); + if (!focusObject) { + return false; + } - int buttonId = keyEvent->key(); - + int buttonId = keyEvent->key(); + - if( mLastKey != buttonId) { - mLastKey = buttonId; - if(mTimer->isActive()) { - mTimer->stop(); - mNumChr = 0; - if (isEnterCharacter(mCurrentChar)) { - focusObject->sendPreEditString(QString("")); // Make sure the enter character is cleared. - mCurrentChar = QChar('\n'); // Convert enter character to line feed. - } + if( mLastKey != buttonId) { + mLastKey = buttonId; + if(mTimer->isActive()) { + mTimer->stop(); + mNumChr = 0; + if (isEnterCharacter(mCurrentChar)) { + focusObject->sendPreEditString(QString("")); // Make sure the enter character is cleared. + mCurrentChar = QChar('\n'); // Convert enter character to line feed. + } - if(mCurrentChar != 0) { - focusObject->filterAndCommitCharacter(mCurrentChar); - } - // For QLineEdit it works fine. For HbLineEdit, need to set the state - // to lower by calling activateState(). - // This is needed for the scenario - When automatic text case is true - // click a button and before the multitap timer expires click on - // another button. - mInputMethod->updateState(); + if(mCurrentChar != 0) { + focusObject->filterAndCommitCharacter(mCurrentChar); + } + // For QLineEdit it works fine. For HbLineEdit, need to set the state + // to lower by calling activateState(). + // This is needed for the scenario - When automatic text case is true + // click a button and before the multitap timer expires click on + // another button. + mInputMethod->updateState(); refreshAutoCompleter(); - } - } + } + } - if (buttonId == Qt::Key_Return) { - mLastKey = buttonId; - return true; - } else if (buttonId == Qt::Key_Shift) { - // For single key press, change the text input case. If the second shift key press is - // received within long key press time out interval, then activate the next state - if (mTimer->isActive() && (mLastKey == buttonId)){ - mTimer->stop(); + if (buttonId == Qt::Key_Return) { + mLastKey = buttonId; + return true; + } else if (buttonId == Qt::Key_Shift) { + // For single key press, change the text input case. If the second shift key press is + // received within long key press time out interval, then activate the next state + if (mTimer->isActive() && (mLastKey == buttonId)){ + mTimer->stop(); HbInputState rootState; mInputMethod->editorRootState(rootState); mInputMethod->activateState(rootState); - } else { - updateTextCase(); - mTimer->start(HbLongPressTimerTimeout); - } - mCurrentChar = 0; - mButtonDown = true; - mCurrentChar = 0; - return true; - } - // Let's see if we can get the handler for this button in the base class. - if (q->HbInputBasicHandler::filterEvent(keyEvent)) { - return true; - } + } else { + updateTextCase(); + mTimer->start(HbLongPressTimerTimeout); + } + mCurrentChar = 0; + mButtonDown = true; + mCurrentChar = 0; + return true; + } + // Let's see if we can get the handler for this button in the base class. + if (q->HbInputBasicHandler::filterEvent(keyEvent)) { + return true; + } - mLastKey = buttonId; - mButtonDown = true; + mLastKey = buttonId; + mButtonDown = true; - handleAlphaEvent(buttonId); - return true; + handleAlphaEvent(buttonId); + return true; } /*! @@ -165,146 +165,146 @@ */ bool HbHardwareInputBasic12KeyHandlerPrivate::keyReleased(const QKeyEvent *keyEvent) { - Q_Q(HbHardwareInputBasic12KeyHandler); - mButtonDown = false; - int buttonId = keyEvent->key(); + Q_Q(HbHardwareInputBasic12KeyHandler); + mButtonDown = false; + int buttonId = keyEvent->key(); - if (buttonId == Qt::Key_Asterisk) { - //Same asterisk key is used for launching candidate list (long key press) - //and also for SCT. So, do not launch SCT if candidate list is already launched. - mInputMethod->switchMode(buttonId); - return true; - } else if (buttonId == Qt::Key_Delete) { - QKeyEvent keyEvent(QEvent::KeyRelease, Qt::Key_Backspace, Qt::NoModifier); - q->sendAndUpdate(keyEvent); - return true; - } + if (buttonId == Qt::Key_Asterisk) { + //Same asterisk key is used for launching candidate list (long key press) + //and also for SCT. So, do not launch SCT if candidate list is already launched. + mInputMethod->switchMode(buttonId); + return true; + } else if (buttonId == Qt::Key_Delete) { + QKeyEvent keyEvent(QEvent::KeyRelease, Qt::Key_Backspace, Qt::NoModifier); + q->sendAndUpdate(keyEvent); + return true; + } - return false; + return false; } void HbHardwareInputBasic12KeyHandlerPrivate::_q_timeout() { - Q_Q(HbHardwareInputBasic12KeyHandler); - mTimer->stop(); - mNumChr = 0; + Q_Q(HbHardwareInputBasic12KeyHandler); + mTimer->stop(); + mNumChr = 0; - HbInputFocusObject *focusedObject = 0; - focusedObject = mInputMethod->focusObject(); - if (!focusedObject) { - qDebug("HbHardwareInputBasic12KeyHandler::timeout focusObject == 0"); - return; - } + HbInputFocusObject *focusedObject = 0; + focusedObject = mInputMethod->focusObject(); + if (!focusedObject) { + qDebug("HbHardwareInputBasic12KeyHandler::timeout focusObject == 0"); + return; + } - if (isEnterCharacter(mCurrentChar)) { - focusedObject->sendPreEditString(QString("")); // Make sure the enter character is cleared. - mCurrentChar = QChar('\n'); // Convert enter character to line feed. - } + if (isEnterCharacter(mCurrentChar)) { + focusedObject->sendPreEditString(QString("")); // Make sure the enter character is cleared. + mCurrentChar = QChar('\n'); // Convert enter character to line feed. + } - //Long key press number key is applicable to all keys - if (mButtonDown) { - //switch to numeric mode for long key press of Hash key - if (mLastKey == Qt::Key_Shift){ - updateTextCase(); - mInputMethod->switchMode(Qt::Key_Shift); - }else { - q->commitFirstMappedNumber(mLastKey); - } - } else if(mLastKey != Qt::Key_Shift){ - if (!focusedObject->characterAllowedInEditor(mCurrentChar)) { - focusedObject->sendCommitString(QString()); - } else { - if ( mCurrentChar != 0){ - QString curString; - curString.append(mCurrentChar); - focusedObject->sendCommitString(curString); - } - mInputMethod->updateState(); - // pass this character to autocompleter. + //Long key press number key is applicable to all keys + if (mButtonDown) { + //switch to numeric mode for long key press of Hash key + if (mLastKey == Qt::Key_Shift){ + updateTextCase(); + mInputMethod->switchMode(Qt::Key_Shift); + }else { + q->commitFirstMappedNumber(mLastKey); + } + } else if(mLastKey != Qt::Key_Shift){ + if (!focusedObject->characterAllowedInEditor(mCurrentChar)) { + focusedObject->sendCommitString(QString()); + } else { + if ( mCurrentChar != 0){ + QString curString; + curString.append(mCurrentChar); + focusedObject->sendCommitString(curString); + } + mInputMethod->updateState(); + // pass this character to autocompleter. refreshAutoCompleter(); - } - } - return; + } + } + return; } bool HbHardwareInputBasic12KeyHandlerPrivate::actionHandler(HbInputModeHandler::HbInputModeAction action) { - HbInputFocusObject *focusObject = 0; - focusObject = mInputMethod->focusObject(); - if (!focusObject) { - return false; - } + HbInputFocusObject *focusObject = 0; + focusObject = mInputMethod->focusObject(); + if (!focusObject) { + return false; + } - bool ret = true; - switch (action) { + bool ret = true; + switch (action) { case HbInputModeHandler::HbInputModeActionReset: - mLastKey = 0; - mNumChr = 0; - if (mTimer->isActive()) { - mTimer->stop(); - } - break; + mLastKey = 0; + mNumChr = 0; + if (mTimer->isActive()) { + mTimer->stop(); + } + break; case HbInputModeHandler::HbInputModeActionDeleteAndCommit:{ - mTimer->stop(); - QString empty; - if(mInputMethod) { - //In case of the sct the character is already committed - //We need to remove the committed character. - QList list; - QInputMethodEvent event(QString(), list); - event.setCommitString(empty, -1, 1); - focusObject->sendEvent(event); - } else { - // Close event was originated from a button press, remove the uncommitted character. - focusObject->sendCommitString(empty); - } - } - break; + mTimer->stop(); + QString empty; + if(mInputMethod) { + //In case of the sct the character is already committed + //We need to remove the committed character. + QList list; + QInputMethodEvent event(QString(), list); + event.setCommitString(empty, -1, 1); + focusObject->sendEvent(event); + } else { + // Close event was originated from a button press, remove the uncommitted character. + focusObject->sendCommitString(empty); + } + } + break; case HbInputModeHandler::HbInputModeActionFocusRecieved: - mTimer->stop(); - mNumChr = 0; - if (mCurrentlyFocused != focusObject) { - mCurrentlyFocused = focusObject; - if (mAutoCompleter) { - mAutoCompleter->commit(); - } - } - // set up auto completer - setUpAutoCompleter(); - break; + mTimer->stop(); + mNumChr = 0; + if (mCurrentlyFocused != focusObject) { + mCurrentlyFocused = focusObject; + if (mAutoCompleter) { + mAutoCompleter->commit(); + } + } + // set up auto completer + setUpAutoCompleter(); + break; case HbInputModeHandler::HbInputModeActionCommit: case HbInputModeHandler::HbInputModeActionFocusLost: - if (mTimer->isActive()) { - mTimer->stop(); - if (mCurrentChar != 0) { - if (isEnterCharacter(mCurrentChar)) { - focusObject->sendPreEditString(QString("")); // Make sure the enter character is cleared. - mCurrentChar = QChar('\n'); // Convert enter character to line feed. - } - focusObject->filterAndCommitCharacter(mCurrentChar); - mCurrentChar = 0; - } - mLastKey = 0; - mNumChr = 0; - mInputMethod->updateState(); - } - break; + if (mTimer->isActive()) { + mTimer->stop(); + if (mCurrentChar != 0) { + if (isEnterCharacter(mCurrentChar)) { + focusObject->sendPreEditString(QString("")); // Make sure the enter character is cleared. + mCurrentChar = QChar('\n'); // Convert enter character to line feed. + } + focusObject->filterAndCommitCharacter(mCurrentChar); + mCurrentChar = 0; + } + mLastKey = 0; + mNumChr = 0; + mInputMethod->updateState(); + } + break; default: { - ret = false; - } - break; - }; + ret = false; + } + break; + }; - return ret; + return ret; } HbHardwareInputBasic12KeyHandler::HbHardwareInputBasic12KeyHandler(HbInputAbstractMethod* inputMethod) :HbInputBasicHandler( *new HbHardwareInputBasic12KeyHandlerPrivate, inputMethod) { - Q_D(HbHardwareInputBasic12KeyHandler); - d->q_ptr = this; + Q_D(HbHardwareInputBasic12KeyHandler); + d->q_ptr = this; } HbHardwareInputBasic12KeyHandler::~HbHardwareInputBasic12KeyHandler() @@ -316,16 +316,16 @@ */ bool HbHardwareInputBasic12KeyHandler::filterEvent(const QKeyEvent * event) { - Q_D(HbHardwareInputBasic12KeyHandler); + Q_D(HbHardwareInputBasic12KeyHandler); - if (event->isAutoRepeat()) { - // Ignore all repeat events after first repeat event - return true; - } else if (event->type() == QEvent::KeyRelease) { - return d->keyReleased(event); - } else { - return d->keyPressed(event); - } + if (event->isAutoRepeat()) { + // Ignore all repeat events after first repeat event + return true; + } else if (event->type() == QEvent::KeyRelease) { + return d->keyReleased(event); + } else { + return d->keyPressed(event); + } } /*! @@ -333,8 +333,8 @@ */ bool HbHardwareInputBasic12KeyHandler::isComposing() const { - Q_D(const HbHardwareInputBasic12KeyHandler); - return d->mTimer->isActive(); + Q_D(const HbHardwareInputBasic12KeyHandler); + return d->mTimer->isActive(); } /*! @@ -342,11 +342,11 @@ */ bool HbHardwareInputBasic12KeyHandler::actionHandler(HbInputModeAction action) { - Q_D(HbHardwareInputBasic12KeyHandler); - if (!d->actionHandler(action)) { - // no action taken so let's pass it to the base class. - return HbInputBasicHandler::actionHandler(action); - } - return false; + Q_D(HbHardwareInputBasic12KeyHandler); + if (!d->actionHandler(action)) { + // no action taken so let's pass it to the base class. + return HbInputBasicHandler::actionHandler(action); + } + return false; } // EOF diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/hardwareinput/hbhardwareinputbasic12keyhandler.h --- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputbasic12keyhandler.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputbasic12keyhandler.h Thu Sep 02 20:44:51 2010 +0300 @@ -30,17 +30,17 @@ class HbHardwareInputBasic12KeyHandlerPrivate; class HbHardwareInputBasic12KeyHandler: public HbInputBasicHandler { - Q_OBJECT + Q_OBJECT public: - HbHardwareInputBasic12KeyHandler(HbInputAbstractMethod* inputMethod); - ~HbHardwareInputBasic12KeyHandler(); + HbHardwareInputBasic12KeyHandler(HbInputAbstractMethod* inputMethod); + ~HbHardwareInputBasic12KeyHandler(); - bool isComposing() const; - bool actionHandler(HbInputModeAction action); - bool filterEvent(const QKeyEvent * event); + bool isComposing() const; + bool actionHandler(HbInputModeAction action); + bool filterEvent(const QKeyEvent * event); private: - Q_DECLARE_PRIVATE(HbHardwareInputBasic12KeyHandler) + Q_DECLARE_PRIVATE(HbHardwareInputBasic12KeyHandler) Q_DISABLE_COPY(HbHardwareInputBasic12KeyHandler) }; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/hardwareinput/hbhardwareinputbasicqwertyhandler.cpp --- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputbasicqwertyhandler.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputbasicqwertyhandler.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -63,43 +63,43 @@ bool HbHardwareInputBasicQwertyHandlerPrivate::buttonPressed(const QKeyEvent * event) { - mButton = event->key(); - if (!mTimer->isActive()){ - mTimer->start(HbLongPressTimerTimeout); - } + mButton = event->key(); + if (!mTimer->isActive()){ + mTimer->start(HbLongPressTimerTimeout); + } - if (event->key() != Qt::Key_Delete && event->key() != Qt::Key_Backspace) { - return true; - } else { - return false; - } + if (event->key() != Qt::Key_Delete && event->key() != Qt::Key_Backspace) { + return true; + } else { + return false; + } } bool HbHardwareInputBasicQwertyHandlerPrivate::buttonReleased(const QKeyEvent * event) { // Kept for handling button released specific logic - - Q_Q(HbHardwareInputBasicQwertyHandler); - HbInputFocusObject *focusObject = 0; + + Q_Q(HbHardwareInputBasicQwertyHandler); + HbInputFocusObject *focusObject = 0; focusObject = mInputMethod->focusObject(); if (!focusObject) { qDebug("HbHardwareInputBasicQwertyHandler::virtualButtonClicked : no focused editor widget!"); return false; } - - // If the timer is not active and it is alpha mode, it is a long press + + // If the timer is not active and it is alpha mode, it is a long press // and handled in another function. So just return. if (mTimer->isActive()) { mTimer->stop(); } - int eventKey = event->key(); + int eventKey = event->key(); - //Handle long key press here + //Handle long key press here switch(eventKey) { case Qt::Key_Alt: - //handle function key (fn key) states here using fn & shift handler helper class - break; + //handle function key (fn key) states here using fn & shift handler helper class + break; case Qt::Key_Shift: { //If the shift key state is EShiftKeyPressed and a second shift key press is received before any other //key events, then current text case should not be changed. @@ -125,42 +125,42 @@ } break; case Qt::Key_Control:{ - return true; - } - - break; - case Qt::Key_Backspace: - case Qt::Key_Delete: { - // let's pass the backspace event to the focused editor. - //return q->HbInputBasicHandler::filterEvent(event); - break; - } - case Qt::Key_Return: - case Qt::Key_Enter: - case Qt::Key_Space: { - QChar qc(eventKey); - if(Qt::Key_Space == eventKey && (event->modifiers() & Qt::ControlModifier)){ - if (HbInputSettingProxy::instance()->predictiveInputStatus()) { - HbInputSettingProxy::instance()->setPredictiveInputStatus(0); - } else { - HbInputSettingProxy::instance()->setPredictiveInputStatus(1); - } - break; - } + return true; + } + + break; + case Qt::Key_Backspace: + case Qt::Key_Delete: { + // let's pass the backspace event to the focused editor. + //return q->HbInputBasicHandler::filterEvent(event); + break; + } + case Qt::Key_Return: + case Qt::Key_Enter: + case Qt::Key_Space: { + QChar qc(eventKey); + if(Qt::Key_Space == eventKey && (event->modifiers() & Qt::ControlModifier)){ + if (HbInputSettingProxy::instance()->predictiveInputStatus()) { + HbInputSettingProxy::instance()->setPredictiveInputStatus(0); + } else { + HbInputSettingProxy::instance()->setPredictiveInputStatus(1); + } + break; + } - if (qc == Qt::Key_Enter || qc == Qt::Key_Return) { - qc = QChar('\n'); // Editor expects normal line feed. - } - if(focusObject){ - q->commitAndUpdate(qc); - } - break; - } + if (qc == Qt::Key_Enter || qc == Qt::Key_Return) { + qc = QChar('\n'); // Editor expects normal line feed. + } + if(focusObject){ + q->commitAndUpdate(qc); + } + break; + } default: { - if (q->HbInputBasicHandler::filterEvent(event)) { - return true; - } - QList list; + if (q->HbInputBasicHandler::filterEvent(event)) { + return true; + } + QList list; QString newText; int currentTextCase = focusObject->editorInterface().textCase(); // If function key is pressed, get the functionized @@ -194,20 +194,20 @@ mInputMethod->updateState(); } break; - } - return true; + } + return true; } void HbHardwareInputBasicQwertyHandlerPrivate::_q_timeout() { mTimer->stop(); - qDebug("Timer stoped"); - if (mButton == Qt::Key_Shift ){ + qDebug("Timer stoped"); + if (mButton == Qt::Key_Shift ){ mShiftKeyState = EShiftKeyPressed; - } else { - mFnState = HbFnNext; - } - return; + } else { + mFnState = HbFnNext; + } + return; } HbHardwareInputBasicQwertyHandler::HbHardwareInputBasicQwertyHandler(HbInputAbstractMethod* inputMethod) @@ -228,13 +228,13 @@ { Q_D(HbHardwareInputBasicQwertyHandler); - if (!event->isAutoRepeat()) { - if ((event->type() == QEvent::KeyRelease) ) { - return d->buttonReleased(event); - } else { - return d->buttonPressed(event); - } - } + if (!event->isAutoRepeat()) { + if ((event->type() == QEvent::KeyRelease) ) { + return d->buttonReleased(event); + } else { + return d->buttonPressed(event); + } + } return false; } @@ -258,7 +258,7 @@ case HbInputModeActionReset: if (d->mTimer->isActive()) { d->mTimer->stop(); - qDebug("Timer stoped"); + qDebug("Timer stoped"); } break; default: { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumeric12keyhandler.cpp --- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumeric12keyhandler.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumeric12keyhandler.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -35,17 +35,17 @@ class HbHardwareInputNumeric12KeyHandlerPrivate: public HbInputNumericHandlerPrivate { - Q_DECLARE_PUBLIC(HbHardwareInputNumeric12KeyHandler) + Q_DECLARE_PUBLIC(HbHardwareInputNumeric12KeyHandler) public: - HbHardwareInputNumeric12KeyHandlerPrivate(); - ~HbHardwareInputNumeric12KeyHandlerPrivate(); + HbHardwareInputNumeric12KeyHandlerPrivate(); + ~HbHardwareInputNumeric12KeyHandlerPrivate(); - bool keyPressed(const QKeyEvent *keyEvent); - void _q_timeout(); + bool keyPressed(const QKeyEvent *keyEvent); + void _q_timeout(); public: - int mLastKey; - bool mButtonDown; + int mLastKey; + bool mButtonDown; }; HbHardwareInputNumeric12KeyHandlerPrivate::HbHardwareInputNumeric12KeyHandlerPrivate(): @@ -60,76 +60,76 @@ bool HbHardwareInputNumeric12KeyHandlerPrivate::keyPressed(const QKeyEvent *keyEvent) { - Q_Q(HbHardwareInputNumeric12KeyHandler); - HbInputFocusObject *focusObject = 0; - focusObject = mInputMethod->focusObject(); - if (!focusObject) { - qDebug("HbInputModeHandler::buttonClicked no focusObject ... failed!!"); - return false; - } + Q_Q(HbHardwareInputNumeric12KeyHandler); + HbInputFocusObject *focusObject = 0; + focusObject = mInputMethod->focusObject(); + if (!focusObject) { + qDebug("HbInputModeHandler::buttonClicked no focusObject ... failed!!"); + return false; + } - int buttonId = keyEvent->key(); + int buttonId = keyEvent->key(); - if (buttonId == Qt::Key_Return) { + if (buttonId == Qt::Key_Return) { - return true; - } else if (buttonId == Qt::Key_Shift) { + return true; + } else if (buttonId == Qt::Key_Shift) { - if (mTimer->isActive() && (mLastKey == buttonId)){ - mTimer->stop(); - HbHardware12key *hostInputMethod = qobject_cast(mInputMethod); - if (hostInputMethod) { - HbInputState newState; - mInputMethod->editorRootState(newState); - mInputMethod->activateState(newState); - } - } else { - mTimer->start(HbLongPressTimerTimeout); - } - mLastKey = buttonId; - mButtonDown = true; - return true; - } else if (buttonId == Qt::Key_Asterisk) { - mInputMethod->switchMode(Qt::Key_Asterisk); - return true; - } + if (mTimer->isActive() && (mLastKey == buttonId)){ + mTimer->stop(); + HbHardware12key *hostInputMethod = qobject_cast(mInputMethod); + if (hostInputMethod) { + HbInputState newState; + mInputMethod->editorRootState(newState); + mInputMethod->activateState(newState); + } + } else { + mTimer->start(HbLongPressTimerTimeout); + } + mLastKey = buttonId; + mButtonDown = true; + return true; + } else if (buttonId == Qt::Key_Asterisk) { + mInputMethod->switchMode(Qt::Key_Asterisk); + return true; + } - // Let's see if we can get the handler for this button in the base class. - if (q->HbInputNumericHandler::filterEvent(keyEvent)) { - return true; - } + // Let's see if we can get the handler for this button in the base class. + if (q->HbInputNumericHandler::filterEvent(keyEvent)) { + return true; + } - q->commitFirstMappedNumber(buttonId); - return true; + q->commitFirstMappedNumber(buttonId); + return true; } void HbHardwareInputNumeric12KeyHandlerPrivate::_q_timeout() { - mTimer->stop(); + mTimer->stop(); - HbInputFocusObject *focusedObject = 0; - focusedObject = mInputMethod->focusObject(); - if (!focusedObject) { - qDebug("HbHardwareInputNumeric12KeyHandler::timeout focusObject == 0"); - return; - } - //switch to Alpha mode when Long key press of Shift key is received - if (mButtonDown && (mLastKey == Qt::Key_Shift )) - { - mButtonDown = false; - // If the editor is not a number only editor, then activate the alphanumeric keypad - if( !focusedObject->editorInterface().isNumericEditor() ){ - mInputMethod->switchMode(mLastKey); - } - } - return; + HbInputFocusObject *focusedObject = 0; + focusedObject = mInputMethod->focusObject(); + if (!focusedObject) { + qDebug("HbHardwareInputNumeric12KeyHandler::timeout focusObject == 0"); + return; + } + //switch to Alpha mode when Long key press of Shift key is received + if (mButtonDown && (mLastKey == Qt::Key_Shift )) + { + mButtonDown = false; + // If the editor is not a number only editor, then activate the alphanumeric keypad + if( !focusedObject->editorInterface().isNumericEditor() ){ + mInputMethod->switchMode(mLastKey); + } + } + return; } HbHardwareInputNumeric12KeyHandler::HbHardwareInputNumeric12KeyHandler(HbInputAbstractMethod* inputMethod) :HbInputNumericHandler( *new HbHardwareInputNumeric12KeyHandlerPrivate, inputMethod) { - Q_D(HbHardwareInputNumeric12KeyHandler); - d->q_ptr = this; + Q_D(HbHardwareInputNumeric12KeyHandler); + d->q_ptr = this; } HbHardwareInputNumeric12KeyHandler::~HbHardwareInputNumeric12KeyHandler() @@ -141,14 +141,14 @@ */ bool HbHardwareInputNumeric12KeyHandler::filterEvent(const QKeyEvent * event) { - Q_D(HbHardwareInputNumeric12KeyHandler); + Q_D(HbHardwareInputNumeric12KeyHandler); - // in numeric mode in itut keypad only KeyPress events are handled. - if ((event->type() == QEvent::KeyPress ) - || (event->type() == QEvent::KeyRelease && event->key() == Qt::Key_Asterisk)) { - return d->keyPressed(event); - } - return false; + // in numeric mode in itut keypad only KeyPress events are handled. + if ((event->type() == QEvent::KeyPress ) + || (event->type() == QEvent::KeyRelease && event->key() == Qt::Key_Asterisk)) { + return d->keyPressed(event); + } + return false; } /*! @@ -156,33 +156,33 @@ */ bool HbHardwareInputNumeric12KeyHandler::actionHandler(HbInputModeAction action) { - bool ret = false; - switch (action) { - //In case of the numeric editor the character is already committed. - //Need to remove the committed character. + bool ret = false; + switch (action) { + //In case of the numeric editor the character is already committed. + //Need to remove the committed character. case HbInputModeHandler::HbInputModeActionDeleteAndCommit:{ - HbInputFocusObject *focusObject = 0; - Q_D(HbHardwareInputNumeric12KeyHandler); - focusObject = d->mInputMethod->focusObject(); - if (!focusObject) { - return false; - } - d->mTimer->stop(); - QString empty; - QList list; - QInputMethodEvent event(QString(), list); - event.setCommitString(empty, -1, 1); - focusObject->sendEvent(event); - ret = true; - } + HbInputFocusObject *focusObject = 0; + Q_D(HbHardwareInputNumeric12KeyHandler); + focusObject = d->mInputMethod->focusObject(); + if (!focusObject) { + return false; + } + d->mTimer->stop(); + QString empty; + QList list; + QInputMethodEvent event(QString(), list); + event.setCommitString(empty, -1, 1); + focusObject->sendEvent(event); + ret = true; + } default: { - ret = false; - } - } - if(!ret) { - ret = HbInputNumericHandler::actionHandler(action); - } - return ret; + ret = false; + } + } + if(!ret) { + ret = HbInputNumericHandler::actionHandler(action); + } + return ret; } // EOF diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumeric12keyhandler.h --- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumeric12keyhandler.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumeric12keyhandler.h Thu Sep 02 20:44:51 2010 +0300 @@ -30,17 +30,17 @@ class HbHardwareInputNumeric12KeyHandlerPrivate; class HbHardwareInputNumeric12KeyHandler: public HbInputNumericHandler { - Q_OBJECT + Q_OBJECT public: - HbHardwareInputNumeric12KeyHandler(HbInputAbstractMethod* inputMethod); - ~HbHardwareInputNumeric12KeyHandler(); + HbHardwareInputNumeric12KeyHandler(HbInputAbstractMethod* inputMethod); + ~HbHardwareInputNumeric12KeyHandler(); - bool actionHandler(HbInputModeAction action); - bool filterEvent(const QKeyEvent * event); + bool actionHandler(HbInputModeAction action); + bool filterEvent(const QKeyEvent * event); private: - Q_DECLARE_PRIVATE(HbHardwareInputNumeric12KeyHandler) - Q_DISABLE_COPY(HbHardwareInputNumeric12KeyHandler) + Q_DECLARE_PRIVATE(HbHardwareInputNumeric12KeyHandler) + Q_DISABLE_COPY(HbHardwareInputNumeric12KeyHandler) }; #endif //HB_HARDWARE_INPUT_NUMERIC_12KEY_HANDLER diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumericqwertyhandler.cpp --- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumericqwertyhandler.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumericqwertyhandler.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -80,9 +80,9 @@ qDebug("HbHardwareInputNumericQwertyHandler::buttonReleased : no focused editor widget!"); return false; } - int currentTextCase = focusObject->editorInterface().textCase(); - QChar newChar = QChar(buttonId); - if (currentTextCase == HbTextCaseLower) { + int currentTextCase = focusObject->editorInterface().textCase(); + QChar newChar = QChar(buttonId); + if (currentTextCase == HbTextCaseLower) { newChar = newChar.toLower(); } else { newChar = newChar.toUpper(); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/hardwareinput/hbhardwareinputprediction12keyhandler.h --- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputprediction12keyhandler.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputprediction12keyhandler.h Thu Sep 02 20:44:51 2010 +0300 @@ -37,7 +37,7 @@ bool actionHandler(HbInputModeAction action); bool filterEvent(const QKeyEvent * event); - bool isActive() const; + bool isActive() const; private: Q_DECLARE_PRIVATE(HbHardwareInputPrediction12KeyHandler) diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/hardwareinput/hbhardwareinputpredictionqwertyhandler.cpp --- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputpredictionqwertyhandler.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputpredictionqwertyhandler.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -162,16 +162,16 @@ case Qt::Key_Down:{ q->actionHandler(HbInputModeHandler::HbInputModeActionLaunchCandidatePopup); break; - } - case Qt::Key_Space:{ - if (event->modifiers() & Qt::ControlModifier){ - if (HbInputSettingProxy::instance()->predictiveInputStatus()) { - HbInputSettingProxy::instance()->setPredictiveInputStatus(0); - } else { - HbInputSettingProxy::instance()->setPredictiveInputStatus(1); - } - break; - } + } + case Qt::Key_Space:{ + if (event->modifiers() & Qt::ControlModifier){ + if (HbInputSettingProxy::instance()->predictiveInputStatus()) { + HbInputSettingProxy::instance()->setPredictiveInputStatus(0); + } else { + HbInputSettingProxy::instance()->setPredictiveInputStatus(1); + } + break; + } } default: { int currentTextCase = focusObject->editorInterface().textCase(); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/hardwareinput/hbhardwareqwerty.cpp --- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareqwerty.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareqwerty.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -160,12 +160,12 @@ // bool HbHardwareQwerty::filterEvent(const QEvent *event) { - const QKeyEvent *keyEvent = 0; + const QKeyEvent *keyEvent = 0; keyEvent = static_cast(event); - if(keyEvent->key() == Qt::Key_F8){ - emit flipStatusChange(); - return false; - } + if(keyEvent->key() == Qt::Key_F8){ + emit flipStatusChange(); + return false; + } if(handleEvent()){ return mActiveModeHandler->filterEvent(event); } @@ -425,7 +425,7 @@ //activateState(inputState); //focusedObject->editorInterface().setInputMode(mMode); //focusedObject->syncEditorInterface(); - Q_UNUSED(newStatus); + Q_UNUSED(newStatus); // HbInputFocusObject *focusedObject = focusObject(); /*if (focusedObject)*/ { @@ -556,26 +556,26 @@ */ bool HbHardwareQwerty::usePrediction() const { - qDebug("in usePrediction()"); + qDebug("in usePrediction()"); HbInputFocusObject *fo = focusObject(); - if(!fo){ - qDebug("NO Focus object"); - } else { - qDebug("Yes Focus object"); - } - - if (!HbInputSettingProxy::instance()->predictiveInputStatus()){ - qDebug("No HbInputSettingProxy::instance()->predictiveInputStatus()"); - } else { - qDebug("Yes HbInputSettingProxy::instance()->predictiveInputStatus()"); - } - - if(!mPredictionModeHandler->isActive()){ - qDebug("No mPredictionModeHandler->isActive()"); + if(!fo){ + qDebug("NO Focus object"); + } else { + qDebug("Yes Focus object"); + } + + if (!HbInputSettingProxy::instance()->predictiveInputStatus()){ + qDebug("No HbInputSettingProxy::instance()->predictiveInputStatus()"); + } else { + qDebug("Yes HbInputSettingProxy::instance()->predictiveInputStatus()"); + } + + if(!mPredictionModeHandler->isActive()){ + qDebug("No mPredictionModeHandler->isActive()"); - } else { - qDebug("Yes mPredictionModeHandler->isActive()"); - } + } else { + qDebug("Yes mPredictionModeHandler->isActive()"); + } if (HbInputSettingProxy::instance()->predictiveInputStatus() && diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/hardwareinput/hbhardwareqwerty.h --- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareqwerty.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareqwerty.h Thu Sep 02 20:44:51 2010 +0300 @@ -80,7 +80,7 @@ signals: void flipStatusChange(); protected: - void predictiveInputStatusChanged(int newStatus); + void predictiveInputStatusChanged(int newStatus); void openKeypad(bool inMinimizedMode = false); public slots: diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/touchinput/hbinput12keytouchkeyboard.cpp --- a/src/hbplugins/inputmethods/touchinput/hbinput12keytouchkeyboard.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/touchinput/hbinput12keytouchkeyboard.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -29,6 +29,7 @@ #include #include #include +#include #include "hbinput12keytouchkeyboard.h" #include "hbinput12keytouchkeyboard_p.h" @@ -199,8 +200,14 @@ const HbKeyboardMap *keyboardMap; if (mOwner->focusObject() && mOwner->focusObject()->editorInterface().editorClass() == HbInputEditorClassEmail) { keyboardMap = mKeymap->keyboard(HbKeyboardVirtual12KeyEmail); + if (!keyboardMap) { + keyboardMap = mKeymap->keyboard(HbKeyboardVirtual12Key); + } } else if (mOwner->focusObject() && mOwner->focusObject()->editorInterface().editorClass() == HbInputEditorClassUrl) { keyboardMap = mKeymap->keyboard(HbKeyboardVirtual12KeyUrl); + if (!keyboardMap) { + keyboardMap = mKeymap->keyboard(HbKeyboardVirtual12Key); + } } else { keyboardMap = mKeymap->keyboard(HbKeyboardVirtual12Key); } @@ -229,8 +236,14 @@ if (mOwner->focusObject() && mOwner->focusObject()->editorInterface().editorClass() == HbInputEditorClassEmail) { keyboardMap = mKeymap->keyboard(HbKeyboardVirtual12KeyEmail); + if (!keyboardMap) { + keyboardMap = mKeymap->keyboard(HbKeyboardVirtual12Key); + } } else if (mOwner->focusObject() && mOwner->focusObject()->editorInterface().editorClass() == HbInputEditorClassUrl) { keyboardMap = mKeymap->keyboard(HbKeyboardVirtual12KeyUrl); + if (!keyboardMap) { + keyboardMap = mKeymap->keyboard(HbKeyboardVirtual12Key); + } } else { keyboardMap = mKeymap->keyboard(HbKeyboardVirtual12Key); } @@ -283,10 +296,24 @@ item->setText(QString("*"), HbInputButton::ButtonTextIndexPrimary); item->setText(QString(""), HbInputButton::ButtonTextIndexSecondaryFirstRow); } else if (mMode == EModeAbc) { - item->setText(QString("*"), HbInputButton::ButtonTextIndexPrimary); - item->setText(QString("+"), HbInputButton::ButtonTextIndexSecondaryFirstRow); + if (HbInputSettingProxy::instance()->globalInputLanguage().language() == QLocale::Chinese) { + QString str = QString(QChar(0x7B26)); + str.append(QString(QChar(0x53F7))); + item->setText(QString(), HbInputButton::ButtonTextIndexSecondaryFirstRow); + item->setText(str, HbInputButton::ButtonTextIndexPrimary); + } else { + item->setText(QString("*"), HbInputButton::ButtonTextIndexPrimary); + item->setText(QString("+"), HbInputButton::ButtonTextIndexSecondaryFirstRow); + } } - } + } else if (keyCode(i) == HbInputButton::ButtonKeyCodeSymbol) { + if (HbInputSettingProxy::instance()->globalInputLanguage().language() == QLocale::Chinese) { + item->setText(QString(QChar(0x4E2D)), HbInputButton::ButtonTextIndexPrimary); + item->setIcon(HbIcon(), HbInputButton::ButtonIconIndexPrimary); + } else { + item->setIcon(HbIcon(HbInputButtonIconSymbol2), HbInputButton::ButtonIconIndexPrimary); + } + } } buttonGroup->setButtons(buttons); } @@ -355,11 +382,12 @@ { Q_D(const Hb12KeyTouchKeyboard); - if (d->mOwner->focusObject()) - { - if (d->mOwner->focusObject()->editorInterface().editorClass() == HbInputEditorClassEmail) { + if (d->mOwner->focusObject()) { + if (d->mOwner->focusObject()->editorInterface().editorClass() == HbInputEditorClassEmail && + d->mKeymap && d->mKeymap->keyboard(HbKeyboardVirtual12KeyEmail)) { return HbKeyboardVirtual12KeyEmail; - } else if (d->mOwner->focusObject()->editorInterface().editorClass() == HbInputEditorClassUrl) { + } else if (d->mOwner->focusObject()->editorInterface().editorClass() == HbInputEditorClassUrl && + d->mKeymap && d->mKeymap->keyboard(HbKeyboardVirtual12KeyUrl)) { return HbKeyboardVirtual12KeyUrl; } } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler.cpp --- a/src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -63,15 +63,15 @@ do { int currCharIndex = 0; mCurrentChar = 0; - //This condition is to avoid get the characters mapped to Asterisk - //Especially for Thai language we have mapped character to Asterisk + //This condition is to avoid get the characters mapped to Asterisk + //Especially for Thai language we have mapped character to Asterisk if (buttonId != HbInputButton::ButtonKeyCodeAsterisk || mInputMethod->currentKeyboardType() == HbKeyboardSctEmail || mInputMethod->currentKeyboardType() == HbKeyboardSctUrl || mInputMethod->currentKeyboardType() == HbKeyboardSctPortrait ) { currCharIndex = mNumChr ; mCurrentChar = q->getNthCharacterInKey(mNumChr, buttonId, type); - } + } if (mCurrentChar != 0) { if (focusObject->characterAllowedInEditor(mCurrentChar)) { @@ -115,14 +115,18 @@ mInputMethod->currentKeyboardType() != HbKeyboardSctEmail && mInputMethod->currentKeyboardType() != HbKeyboardSctUrl )) { mLongPressHappened = true; - mInputMethod->selectSpecialCharacterTableMode(); + if (HbInputSettingProxy::instance()->globalInputLanguage().language() == QLocale::Chinese) { + mInputMethod->switchMode(mDownKey); + } else { + mInputMethod->selectSpecialCharacterTableMode(); + } } else if (mDownKey == HbInputButton::ButtonKeyCodeAsterisk && - !mInputMethod->isSctModeActive() && - (mInputMethod->currentKeyboardType() != HbKeyboardSctPortrait && + !mInputMethod->isSctModeActive() && + (mInputMethod->currentKeyboardType() != HbKeyboardSctPortrait && mInputMethod->currentKeyboardType() != HbKeyboardSctUrl && mInputMethod->currentKeyboardType() != HbKeyboardSctEmail )) { // launch the SCT keypad when long press of Asterisk key is - // received in non-SCT mode + // received in non-SCT mode mLongPressHappened = true; mInputMethod->switchMode(mDownKey); } else if (mDownKey != HbInputButton::ButtonKeyCodeDelete && @@ -228,7 +232,7 @@ if( HbInputSettingProxy::instance()->globalInputLanguage() == mInputMethod->inputState().language() || HbInputSettingProxy::instance()->globalSecondaryInputLanguage() == mInputMethod->inputState().language() || ((HbEditorConstraintLatinAlphabetOnly | HbEditorConstraintAutoCompletingField)==focusObject->editorInterface().inputConstraints())){ - // in latin variants , double tap of shift key toggles the prediction status + // in latin variants , double tap of shift key toggles the prediction status // revert back to the old case as this is a double tap // (the case was changed on the single tap) updateTextCase(); @@ -271,7 +275,7 @@ return true; } // switch the keypad mode when the short key press of Asterisk key in non-SCT mode - // or SYM button or Alphabet button is received + // or SYM button or Alphabet button is received if ((buttonId == HbInputButton::ButtonKeyCodeAsterisk && !mInputMethod->isSctModeActive()) || buttonId == HbInputButton::ButtonKeyCodeSymbol || buttonId == HbInputButton::ButtonKeyCodeAlphabet) { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler.h --- a/src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler.h Thu Sep 02 20:44:51 2010 +0300 @@ -43,7 +43,7 @@ void cursorPositionChanged(int oldPos, int newPos); protected: - HbInputBasic12KeyHandler(HbInputBasic12KeyHandlerPrivate &dd, HbInputAbstractMethod* inputMethod); + HbInputBasic12KeyHandler(HbInputBasic12KeyHandlerPrivate &dd, HbInputAbstractMethod* inputMethod); private: Q_DECLARE_PRIVATE_D(d_ptr, HbInputBasic12KeyHandler) diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler_p.h --- a/src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -47,6 +47,6 @@ int mDownKey; HbInputFocusObject *mCurrentlyFocused; bool mLongPressHappened; - bool mShiftKeyDoubleTapped; + bool mShiftKeyDoubleTapped; }; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/touchinput/hbinputnumeric12keyhandler.cpp --- a/src/hbplugins/inputmethods/touchinput/hbinputnumeric12keyhandler.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/touchinput/hbinputnumeric12keyhandler.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -41,7 +41,7 @@ HbInputNumeric12KeyHandlerPrivate(); ~HbInputNumeric12KeyHandlerPrivate(); - void handleMultitapStarKey(); + void handleMultitapStarKey(); bool handleAlphaEvent(int buttonId, HbKeyboardType type); bool buttonPressed(const QKeyEvent *keyEvent); bool buttonReleased(const QKeyEvent *keyEvent); @@ -50,15 +50,15 @@ int mLastKey; bool mLongPressHappened; int mButtonDown; - int mMultiTapNum; - QChar mCurrentMultitapChar; + int mMultiTapNum; + QChar mCurrentMultitapChar; }; HbInputNumeric12KeyHandlerPrivate::HbInputNumeric12KeyHandlerPrivate(): mLastKey(0), mLongPressHappened(false), mButtonDown(false), - mMultiTapNum(0), - mCurrentMultitapChar(0) + mMultiTapNum(0), + mCurrentMultitapChar(0) { } @@ -68,27 +68,27 @@ void HbInputNumeric12KeyHandlerPrivate::handleMultitapStarKey() { - HbInputFocusObject *focusObject = mInputMethod->focusObject(); - if (!focusObject) { - return; - } - QChar MultitapStarKeyArray[] = {'*','+','p','w','\0'}; - + HbInputFocusObject *focusObject = mInputMethod->focusObject(); + if (!focusObject) { + return; + } + QChar MultitapStarKeyArray[] = {'*','+','p','w','\0'}; + int index = mMultiTapNum; do { mCurrentMultitapChar = MultitapStarKeyArray[mMultiTapNum]; mMultiTapNum = (++mMultiTapNum)%4; - if (mCurrentMultitapChar != 0) { + if (mCurrentMultitapChar != 0) { if (focusObject->characterAllowedInEditor(mCurrentMultitapChar)) { - QString str; - str += mCurrentMultitapChar; + QString str; + str += mCurrentMultitapChar; - QList list; - QInputMethodEvent event(str,list); - focusObject->sendEvent(event); + QList list; + QInputMethodEvent event(str,list); + focusObject->sendEvent(event); return; } - } + } } while (index != mMultiTapNum); } @@ -103,13 +103,13 @@ } QChar character = 0; - //This condition is to avoid get the characters mapped to Asterisk - //Especially for Thai language we have mapped character to Asterisk + //This condition is to avoid get the characters mapped to Asterisk + //Especially for Thai language we have mapped character to Asterisk if (buttonId != HbInputButton::ButtonKeyCodeAsterisk || mInputMethod->currentKeyboardType() == HbKeyboardSctPortrait) { int index = 0; character = q->getNthCharacterInKey(index, buttonId, type); - } + } if (character != 0) { q->commitAndUpdate(character); @@ -122,13 +122,13 @@ { Q_Q(HbInputNumeric12KeyHandler); mLongPressHappened = false; - HbInputFocusObject *focusObject = 0; + HbInputFocusObject *focusObject = 0; focusObject = mInputMethod->focusObject(); if (!focusObject) { return false; } int buttonId = keyEvent->key(); - mButtonDown = buttonId; + mButtonDown = buttonId; if (keyEvent->isAutoRepeat() && mLastKey == buttonId) { if (buttonId == HbInputButton::ButtonKeyCodeShift) { // If the editor is not a number only editor, then activate the alphanumeric keypad @@ -147,33 +147,33 @@ mCurrentMultitapChar = QChar(HbInputButton::ButtonKeyCodeAsterisk); HbInputFocusObject *focusedObject = mInputMethod->focusObject(); if (focusedObject) { - focusedObject->filterAndCommitCharacter(mCurrentMultitapChar); + focusedObject->filterAndCommitCharacter(mCurrentMultitapChar); } - mCurrentMultitapChar = 0; + mCurrentMultitapChar = 0; } if (mLongPressHappened) { mLastKey = 0; return true; } - } + } - if (mInputMethod) { - if (mLastKey != buttonId) { - if (mCurrentMultitapChar !=0) { + if (mInputMethod) { + if (mLastKey != buttonId) { + if (mCurrentMultitapChar !=0) { if (!focusObject->characterAllowedInEditor(mCurrentMultitapChar)) { - focusObject->sendCommitString(QString()); + focusObject->sendCommitString(QString()); } else { - QChar commitChar(mCurrentMultitapChar); - mCurrentMultitapChar = 0; - q->commitAndUpdate(commitChar); - } - } - } - if (buttonId == HbInputButton::ButtonKeyCodeAsterisk) { - mTimer->stop(); - mTimer->start(HbMultiTapTimerTimeout); - } - } + QChar commitChar(mCurrentMultitapChar); + mCurrentMultitapChar = 0; + q->commitAndUpdate(commitChar); + } + } + } + if (buttonId == HbInputButton::ButtonKeyCodeAsterisk) { + mTimer->stop(); + mTimer->start(HbMultiTapTimerTimeout); + } + } mLastKey = buttonId; return false; @@ -192,7 +192,7 @@ qDebug("HbInputModeHandler::buttonReleased no focusObject ... failed!!"); return false; } - + int buttonId = keyEvent->key(); if (mLongPressHappened) { @@ -204,30 +204,30 @@ mTimer->stop(); } if (mLastKey != buttonId) { - mMultiTapNum = 0; + mMultiTapNum = 0; } - mButtonDown = 0; + mButtonDown = 0; if (buttonId == HbInputButton::ButtonKeyCodeAsterisk && mInputMethod->currentKeyboardType() != HbKeyboardSctPortrait) { //Asterisk Key will multitap bettween *,+,p,w //mInputMethod->switchMode(buttonId); - mLastKey = buttonId; - handleMultitapStarKey(); + mLastKey = buttonId; + handleMultitapStarKey(); return true; } else if (buttonId == HbInputButton::ButtonKeyCodeSymbol) { mInputMethod->switchMode(buttonId); } else if (buttonId == HbInputButton::ButtonKeyCodeAlphabet) { - mInputMethod->switchMode(buttonId); - mLastKey = buttonId; - return true; - } else if (buttonId == Qt::Key_Return) { + mInputMethod->switchMode(buttonId); + mLastKey = buttonId; + return true; + } else if (buttonId == Qt::Key_Return) { mInputMethod->closeKeypad(); return true; - } else if (buttonId == HbInputButton::ButtonKeyCodeShift) { + } else if (buttonId == HbInputButton::ButtonKeyCodeShift) { //Let's commit character "#" on single tap and double tap of shift Key - mLastKey = buttonId; + mLastKey = buttonId; QChar qc = QChar('#'); q->commitAndUpdate(qc); return true; @@ -237,7 +237,9 @@ return true; } mLastKey = buttonId; - if (mInputMethod->currentKeyboardType() == HbKeyboardSctPortrait && + if ((mInputMethod->currentKeyboardType() == HbKeyboardSctPortrait || + mInputMethod->currentKeyboardType() == HbKeyboardSctUrl || + mInputMethod->currentKeyboardType() == HbKeyboardSctEmail) && handleAlphaEvent(buttonId, mInputMethod->currentKeyboardType())) { return true; } @@ -250,7 +252,7 @@ void HbInputNumeric12KeyHandlerPrivate::_q_timeout() { mTimer->stop(); - mMultiTapNum = 0; + mMultiTapNum = 0; HbInputFocusObject *focusedObject = mInputMethod->focusObject(); if (!focusedObject) { @@ -260,10 +262,10 @@ if (!mButtonDown) { if (mCurrentMultitapChar != 0) { - focusedObject->filterAndCommitCharacter(mCurrentMultitapChar); + focusedObject->filterAndCommitCharacter(mCurrentMultitapChar); } - } - mCurrentMultitapChar = 0; + } + mCurrentMultitapChar = 0; } HbInputNumeric12KeyHandler::HbInputNumeric12KeyHandler(HbInputAbstractMethod* inputMethod) @@ -304,7 +306,7 @@ case HbInputModeHandler::HbInputModeActionCancelButtonPress: case HbInputModeHandler::HbInputModeActionReset: d->mLastKey = 0; - d->mButtonDown = false; + d->mButtonDown = false; break; //In case of the numeric editor the character is already committed. //Need to remove the committed character. diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler.cpp --- a/src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -83,13 +83,13 @@ if (keyEvent->isAutoRepeat() && mLastKey == buttonId) { // mode switch should happen only when Qt::Key_Asterisk key is pressed in non-SCT - // keypad. + // keypad. if (buttonId == HbInputButton::ButtonKeyCodeAsterisk && !mInputMethod->isSctModeActive()) { //Remove the "?" mark if present if (!mCanContinuePrediction) { chopQMarkAndUpdateEditor(); - } + } mInputMethod->switchMode(buttonId); mLongPressHappened = true; } else if (buttonId == HbInputButton::ButtonKeyCodeShift) { @@ -112,7 +112,7 @@ mLongPressHappened = true; } // commit the first mapped number character when long key press - // of character key received in alphanumeric mode + // of character key received in alphanumeric mode if (buttonId != HbInputButton::ButtonKeyCodeDelete && !mInputMethod->isSctModeActive()) { q->commitFirstMappedNumber(buttonId, mInputMethod->currentKeyboardType()); @@ -156,13 +156,13 @@ mButtonDown = false; int buttonId = keyEvent->key(); - // short key press of character keys should not be handled when "?" is displayed + // short key press of character keys should not be handled when "?" is displayed if (!mCanContinuePrediction && !mLongPressHappened && - buttonId >= Qt::Key_1 && buttonId <= Qt::Key_9) { + buttonId >= Qt::Key_1 && buttonId <= Qt::Key_9) { return false; - } + } // Sym key is handled in this class it self, so not passing it to - // the base mode handlers. + // the base mode handlers. if (buttonId == HbInputButton::ButtonKeyCodeSymbol || buttonId == HbInputButton::ButtonKeyCodeAlphabet) { //Remove the "?" mark if present @@ -176,11 +176,11 @@ - Behavior of Short Press of Asterisk Key when not in inline editing state - Should launch SCT - Behaviour of Short Press of Asterisk Key in SCT keypad - - Should input the * character and should not change the keypad mode + - Should input the * character and should not change the keypad mode */ else if (buttonId == HbInputButton::ButtonKeyCodeAsterisk && !mInputMethod->isSctModeActive()) { - if(!mCanContinuePrediction && (*mCandidates)[mBestGuessLocation].endsWith('?')) { + if(!mCanContinuePrediction && (*mCandidates)[mBestGuessLocation].endsWith('?')) { //Remove the "?" mark (*mCandidates)[mBestGuessLocation].chop(1); updateEditor(); @@ -201,7 +201,7 @@ mShiftKeyDoubleTap = false; //mShowTail = false; if (HbInputSettingProxy::instance()->globalInputLanguage()== mInputMethod->inputState().language()) { - // in latin variants , double tap of shift key toggles the prediction status + // in latin variants , double tap of shift key toggles the prediction status // revert back to the old case as this is a double tap // (the case was changed on the single tap) updateTextCase(); @@ -224,7 +224,7 @@ } return true; } - // ButtonKeyCodeSettings should not be propagated to the engine + // ButtonKeyCodeSettings should not be propagated to the engine if(buttonId == HbInputButton::ButtonKeyCodeSettings) { return true; } @@ -238,7 +238,7 @@ // text input happens on button release if (q->HbInputPredictionHandler::filterEvent(keyEvent)) { return true; - } + } return false; } @@ -285,6 +285,7 @@ int eventKey = event->key(); switch(eventKey) { case Qt::Key_0: + case HbInputButton::ButtonKeyCodeSettings: case HbInputButton::ButtonKeyCodeSpace: { if(d->mCandidates->size() && focusObject) { //Remove the "?" mark diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler.h --- a/src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler.h Thu Sep 02 20:44:51 2010 +0300 @@ -40,7 +40,7 @@ bool isActive() const; void mouseHandler(int cursorPosition, QMouseEvent* mouseEvent); protected: - HbInputPrediction12KeyHandler(HbInputPrediction12KeyHandlerPrivate &dd, HbInputAbstractMethod* inputMethod); + HbInputPrediction12KeyHandler(HbInputPrediction12KeyHandlerPrivate &dd, HbInputAbstractMethod* inputMethod); private: Q_DECLARE_PRIVATE_D(d_ptr, HbInputPrediction12KeyHandler) Q_DISABLE_COPY(HbInputPrediction12KeyHandler) diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/touchinput/hbinputpredictionqwertyhandler.cpp --- a/src/hbplugins/inputmethods/touchinput/hbinputpredictionqwertyhandler.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/touchinput/hbinputpredictionqwertyhandler.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -115,29 +115,29 @@ else { currentTextCase = HbTextCaseAutomatic; } - break; - case HbTextCaseUpper: - currentTextCase = HbTextCaseLower; + break; + case HbTextCaseUpper: + currentTextCase = HbTextCaseLower; break; case HbTextCaseAutomatic: - currentTextCase = HbTextCaseUpper; + currentTextCase = HbTextCaseUpper; break; default: break; } HbInputState state = mInputMethod->inputState(); - state.setTextCase(currentTextCase); + state.setTextCase(currentTextCase); mInputMethod->activateState(state); } break; case HbInputButton::ButtonKeyCodeSymbol: { // Ctrl/Chr case HbInputButton::ButtonKeyCodeAlphabet: mInputMethod->switchSpecialCharacterTable(); - } + } break; case HbInputButton::ButtonKeyCodeSettings: mInputMethod->closeExactWordPopup(); - break; + break; default: { HbTextCase currentTextCase = focusObject->editorInterface().textCase(); Qt::KeyboardModifiers modifiers = Qt::NoModifier; @@ -288,7 +288,7 @@ } void HbInputPredictionQwertyHandler::sctCharacterSelected(QString character) -{ +{ HbInputPredictionHandler::sctCharacterSelected(character); } @@ -358,7 +358,7 @@ // once the word is committed, we can not bring it back to inline edit. // so if the engine does not have any data, we just send backspace event to the editor. Q_Q(HbInputPredictionQwertyHandler); - QKeyEvent event = QKeyEvent(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier); + QKeyEvent event = QKeyEvent(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier); q->sendAndUpdate(event); event = QKeyEvent(QEvent::KeyRelease, Qt::Key_Backspace, Qt::NoModifier); q->sendAndUpdate(event); @@ -434,7 +434,7 @@ list.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, 0, QInputMethodEvent::TextFormat, gray)); } else { list.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, mEngine->inputLength(), taillength, gray)); - } + } list.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor, mEngine->inputLength(), 0, 0)); // the best guess word is sent to the editor QInputMethodEvent event(bestGuessWord, list); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/touchinput/hbinputqwertynumerictouchkeyboard.cpp --- a/src/hbplugins/inputmethods/touchinput/hbinputqwertynumerictouchkeyboard.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/touchinput/hbinputqwertynumerictouchkeyboard.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -190,7 +190,7 @@ if (charKeyCount < 10) { item->setText(numberCharacterBoundToKey((charKeyCount + 1) % 10), HbInputButton::ButtonTextIndexPrimary); - charKeyCount++; + charKeyCount++; } else { if (key < characters.count()) { item->setText(characters.at(key), HbInputButton::ButtonTextIndexPrimary); @@ -198,7 +198,7 @@ item->setText(QString(), HbInputButton::ButtonTextIndexPrimary); } ++key; - } + } } } buttonGroup->setButtons(buttons); @@ -213,7 +213,7 @@ return; } QString chars; - + foreach (const HbMappedKey* mappedKey, keyboardMap->keys) { chars.append(mappedKey->characters(HbModifierNone)); } @@ -225,8 +225,8 @@ // Remove digits from it ( digits always come in the first row ) for (int i=0; i < 10; i++) { allowedChars.remove(numberCharacterBoundToKey(i)); - } - + } + foreach (QChar sctChar, allowedChars) { if (!characters.contains(sctChar)) { characters.append(sctChar); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/touchinput/touchinput.pro --- a/src/hbplugins/inputmethods/touchinput/touchinput.pro Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/touchinput/touchinput.pro Thu Sep 02 20:44:51 2010 +0300 @@ -42,19 +42,19 @@ HEADERS += touchinputplugin.h HEADERS += hbinputbasic12keyhandler.h HEADERS += hbinputprediction12keyhandler.h -HEADERS += ..\common\hbinputbasichandler_p.h -HEADERS += ..\common\hbinputmodehandler.h -HEADERS += ..\common\hbinputmodehandler_p.h -HEADERS += ..\common\hbinputpredictionhandler_p.h +HEADERS += ../common/hbinputbasichandler_p.h +HEADERS += ../common/hbinputmodehandler.h +HEADERS += ../common/hbinputmodehandler_p.h +HEADERS += ../common/hbinputpredictionhandler_p.h HEADERS += hbinputbasicqwertyhandler.h HEADERS += hbinputpredictionqwertyhandler.h -HEADERS += ..\common\hbinputnumerichandler_p.h +HEADERS += ../common/hbinputnumerichandler_p.h HEADERS += hbinputnumericqwertyhandler.h HEADERS += hbinputnumeric12keyhandler.h -HEADERS += ..\common\hbinputabstractbase.h +HEADERS += ../common/hbinputabstractbase.h HEADERS += hbinputprediction12keyhandler_p.h HEADERS += hbinputbasic12keyhandler_p.h -HEADERS += ..\common\hbinputspellquerydialog.h +HEADERS += ../common/hbinputspellquerydialog.h HEADERS += hbinput12keytouchkeyboard.h HEADERS += hbinput12keytouchkeyboard_p.h HEADERS += hbinputqwerty10x4touchkeyboard.h @@ -69,20 +69,20 @@ SOURCES += touchinputplugin.cpp SOURCES += hbinputbasic12keyhandler.cpp SOURCES += hbinputprediction12keyhandler.cpp -SOURCES += ..\common\hbinputbasichandler.cpp -SOURCES += ..\common\hbinputmodehandler.cpp -SOURCES += ..\common\hbinputpredictionhandler.cpp +SOURCES += ../common/hbinputbasichandler.cpp +SOURCES += ../common/hbinputmodehandler.cpp +SOURCES += ../common/hbinputpredictionhandler.cpp SOURCES += hbinputbasicqwertyhandler.cpp SOURCES += hbinputpredictionqwertyhandler.cpp -SOURCES += ..\common\hbinputnumerichandler.cpp +SOURCES += ../common/hbinputnumerichandler.cpp SOURCES += hbinputnumericqwertyhandler.cpp SOURCES += hbinputnumeric12keyhandler.cpp -SOURCES += ..\common\hbinputabstractbase.cpp +SOURCES += ../common/hbinputabstractbase.cpp SOURCES += hbinput12keytouchkeyboard.cpp SOURCES += hbinputqwerty10x4touchkeyboard.cpp SOURCES += hbinputqwerty11x4touchkeyboard.cpp SOURCES += hbinputqwertynumerictouchkeyboard.cpp -SOURCES += ..\common\hbinputspellquerydialog.cpp +SOURCES += ../common/hbinputspellquerydialog.cpp symbian { TARGET.EPOCALLOWDLLDATA = 1 diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/touchinput/virtual12key.cpp --- a/src/hbplugins/inputmethods/touchinput/virtual12key.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/touchinput/virtual12key.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -68,8 +68,7 @@ mKeymap(0), mCandidatePopup(0), mCurrentlyFocused(0), - mVkbHost(0), - mKeyboardChangeAlreadyInprogress(false) + mVkbHost(0) { initializeModeHandlers(); } @@ -79,7 +78,7 @@ mBasicModeHandler = new HbInputBasic12KeyHandler(this); mPredictionModeHandler = new HbInputPrediction12KeyHandler(this); mNumericModeHandler = new HbInputNumeric12KeyHandler(this); - + mActiveModeHandler = mBasicModeHandler; mBasicModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionInit); @@ -123,7 +122,7 @@ delete mPredictionModeHandler; mPredictionModeHandler = 0; delete mNumericModeHandler; - mNumericModeHandler = 0; + mNumericModeHandler = 0; } /*! @@ -173,13 +172,11 @@ Hb12KeyTouchKeyboard *tempKeypad = new Hb12KeyTouchKeyboard(this, mKeymap); connect(tempKeypad, SIGNAL(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod)), this, SLOT(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod))); - connect(tempKeypad, SIGNAL(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode)), - this, SLOT(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode))); //FLICKDISABLED connect(tempKeypad, SIGNAL(flickEvent(HbInputVkbWidget::FlickDirection)), this, SLOT(flickEvent(HbInputVkbWidget::FlickDirection))); connect(tempKeypad, SIGNAL(smileySelected(QString)), this, SLOT(smileySelected(QString))); connect(tempKeypad, SIGNAL(mouseMovedOutOfButton()), this, SLOT(mouseMovedOutOfButton())); connect(tempKeypad, SIGNAL(settingsListClosed()), this, SLOT(restorePreviousState())); - tempKeypad->setRockerVisible(true); + return tempKeypad; } @@ -291,10 +288,6 @@ return; } - mKeyboardChangeAlreadyInprogress = true; - HbInputSettingProxy::instance()->setActiveKeyboard(HbKeyboardVirtual12Key); - mKeyboardChangeAlreadyInprogress = false; - bool disableAnimation = false; // see if we are trying to open a different keypad than what is already opened. if (mCurrentKeypad != keypadToOpen) { @@ -422,51 +415,6 @@ } /*! -The rocker widget emits the signal rockerDirection when there is any rocker movement. This method catches the emitted -signal and makes the cursor movements according to the rcker movement. -*/ -void HbVirtual12Key::rockerDirection(int aDirection, HbInputVirtualRocker::RockerSelectionMode aSelectionMode) -{ - Qt::KeyboardModifiers modifiers = 0; - if (aSelectionMode == HbInputVirtualRocker::RockerSelectionModeOn) { - modifiers = Qt::ShiftModifier; - } - // commit any character/word which is in inline edit. - mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionCommit); - - HbInputLanguage inputlang = HbInputSettingProxy::instance()->globalInputLanguage(); - - switch (aDirection) { - case HbInputVirtualRocker::HbRockerDirectionLeft: - if (inputlang.isRightToLeftLanguage()) { - focusObject()->cursorRight(modifiers); - } else { - focusObject()->cursorLeft(modifiers); - } - break; - case HbInputVirtualRocker::HbRockerDirectionRight: - if (inputlang.isRightToLeftLanguage()) { - focusObject()->cursorLeft(modifiers); - } else { - focusObject()->cursorRight(modifiers); - } - break; - case HbInputVirtualRocker::HbRockerDirectionUp: { - QKeyEvent keyEvent(QEvent::KeyPress, Qt::Key_Up, modifiers); - focusObject()->sendEvent(keyEvent); - } - break; - case HbInputVirtualRocker::HbRockerDirectionDown: { - QKeyEvent keyEvent(QEvent::KeyPress, Qt::Key_Down, modifiers); - focusObject()->sendEvent(keyEvent); - } - break; - default: - break; - } -} - -/*! Notification from the generic input method framework indicating a change of input language. The VKB keypad needs to refreshed to show the renewed key mapping. */ @@ -509,7 +457,7 @@ */ void HbVirtual12Key::inputStateActivated(const HbInputState& newState) { - if (!isActiveMethod() || mKeyboardChangeAlreadyInprogress) { + if (!isActiveMethod()) { return; // Just to be sure... } @@ -527,12 +475,12 @@ } HbInputModeHandler *previousModeHandler = mActiveModeHandler; - if (newState.inputMode() == HbInputModeDefault && usePrediction()) { + if (newState.inputMode() == HbInputModeDefault && usePrediction()) { mActiveModeHandler = mPredictionModeHandler; // by passing HbInputModeActionFocusRecieved we will be setting the candidate list and keypad mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionFocusRecieved); - /* The below line should be added in orientationChanged Slot, however currently it is not working correctly - hence this fix is temporarily added here */ + /* The below line should be added in orientationChanged Slot, however currently it is not working correctly + hence this fix is temporarily added here */ mPredictionModeHandler->setAutocompletionStatus(HbInputSettingProxy::instance()->isAutocompletionEnabled(HbKeyboardSetting12key)); } else if (newState.inputMode() == HbInputModeDefault) { mActiveModeHandler = mBasicModeHandler; @@ -593,7 +541,7 @@ } if(mNumericModeHandler) { mNumericModeHandler->setKeymap(mKeymap); - } + } } } } @@ -636,8 +584,16 @@ // if sct is active keypad, then launch itu-t keypad switchToAlphaMode(); } else { - // launch special character keypad - displaySpecialCharacterTable(this); + if (keyCode == HbInputButton::ButtonKeyCodeSymbol && HbInputSettingProxy::instance()->globalInputLanguage().language() == QLocale::Chinese) { + HbInputLanguage primaryInputLanguage = HbInputSettingProxy::instance()->globalInputLanguage(); + HbInputMethod::activeInputMethod()->activateState(HbInputState(HbInputModeDefault, + HbTextCaseAutomatic, + HbKeyboardTouchPortrait, + primaryInputLanguage)); + } else { + // launch special character keypad + displaySpecialCharacterTable(this); + } } } else if (keyCode == HbInputButton::ButtonKeyCodeShift) { HbInputState nextState = inputState(); @@ -663,8 +619,7 @@ connect(mSctKeypad, SIGNAL(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod)), this, SLOT(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod))); connect(mSctKeypad, SIGNAL(smileySelected(QString)), - this, SLOT(smileySelected(QString))); - mSctKeypad->setRockerVisible(false); + this, SLOT(smileySelected(QString))); } mSctKeypad->setMode(EModeAbc, HbModifierNone); //Open the keypad @@ -789,7 +744,7 @@ mCandidatePopup = new HbCandidateList(this); connect(mCandidatePopup, SIGNAL(candidatePopupCancelled()), this, SLOT(restorePreviousState())); connect(mCandidatePopup, SIGNAL(candidateSelected(int,QString)), this, SLOT(candidatePopupClosed(int,QString))); - QObject::connect(mCandidatePopup,SIGNAL(launchSpellQueryDialog()),mPredictionModeHandler,SLOT(launchSpellQueryDialog())); + QObject::connect(mCandidatePopup,SIGNAL(launchSpellQueryDialog()),mPredictionModeHandler,SLOT(launchSpellQueryDialog())); } if (candidates.count() > 0) { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/touchinput/virtual12key.h --- a/src/hbplugins/inputmethods/touchinput/virtual12key.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/touchinput/virtual12key.h Thu Sep 02 20:44:51 2010 +0300 @@ -28,7 +28,6 @@ #include #include -#include #include class HbKeymap; @@ -101,8 +100,7 @@ public slots: void keypadClosed(); void keypadOpened(); - void keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod vkbCloseMethod); - void rockerDirection(int direction, HbInputVirtualRocker::RockerSelectionMode selectionMode); + void keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod vkbCloseMethod); void orientationChanged(); void candidatePopupClosed(int closingKey, const QString &candidate); void flickEvent(HbInputVkbWidget::HbFlickDirection direction); @@ -134,9 +132,8 @@ HbInputPrediction12KeyHandler *mPredictionModeHandler; HbInputBasic12KeyHandler *mBasicModeHandler; HbInputNumeric12KeyHandler *mNumericModeHandler; - - QPointer mVkbHost; - bool mKeyboardChangeAlreadyInprogress; + + QPointer mVkbHost; }; #endif // _Virtual12Key_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/touchinput/virtualqwerty.cpp --- a/src/hbplugins/inputmethods/touchinput/virtualqwerty.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/touchinput/virtualqwerty.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -88,7 +87,7 @@ connect(this, SIGNAL(autoCompletionPopupClosed(QString, int)), mBasicModeHandler, SLOT(autoCompletionPopupClosed(QString, int))); connect(HbInputSettingProxy::instance(), SIGNAL(predictiveInputStateChanged(HbKeyboardSettingFlags,bool)), this, SLOT(predictiveInputStateChanged(HbKeyboardSettingFlags,bool))); - connect(HbInputSettingProxy::instance(), SIGNAL(primaryCandidateModeChanged(HbPrimaryCandidateMode)), this, SLOT(primaryCandidateModeChanged(HbPrimaryCandidateMode))); + connect(HbInputSettingProxy::instance(), SIGNAL(primaryCandidateModeChanged(HbPrimaryCandidateMode)), this, SLOT(primaryCandidateModeChanged(HbPrimaryCandidateMode))); connect(HbInputSettingProxy::instance(), SIGNAL(autocompletionStateChanged(HbKeyboardSettingFlags,bool)), this, SLOT(autocompletionStateChanged(HbKeyboardSettingFlags,bool))); connect(HbInputSettingProxy::instance(), SIGNAL(typingCorrectionLevelChanged(HbTypingCorrectionLevel)), this, SLOT(typingCorrectionLevelChanged(HbTypingCorrectionLevel))); mPredictionModeHandler->setPrimaryCandidateMode(HbInputSettingProxy::instance()->primaryCandidateMode()); @@ -339,7 +338,6 @@ connect(keyboard, SIGNAL(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode)), this, SLOT(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode))); connect(keyboard, SIGNAL(mouseMovedOutOfButton()), this, SLOT(mouseMovedOutOfButton())); - keyboard->setRockerVisible(true); return keyboard; } @@ -353,7 +351,7 @@ { if (mVkbHost->keypadStatus() == HbVkbHost::HbVkbStatusMinimized) { closeExactWordPopup(); - } + } } void HbVirtualQwerty::keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod vkbCloseMethod) @@ -379,7 +377,7 @@ void HbVirtualQwerty::inputLanguageChanged(const HbInputLanguage &aNewLanguage) { mPredictionModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionCommit); - if (mExactWordPopup && mExactWordPopup->isVisible()) + if (mExactWordPopup && mExactWordPopup->isVisible()) closeExactWordPopup(); // move keypad off screen if (mCurrentKeypad){ @@ -420,10 +418,10 @@ mActiveModeHandler = mNumericModeHandler; } else if (newState.inputMode() == HbInputModeDefault && usePrediction()) { mActiveModeHandler = mPredictionModeHandler; - // by passing HbInputModeActionFocusRecieved we will be setting the candidate list and keypad + // by passing HbInputModeActionFocusRecieved we will be setting the candidate list and keypad mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionFocusRecieved); - /* The below line should be added in orientationChanged Slot, however currently it is not working correctly - hence this fix is temporarily added here */ + /* The below line should be added in orientationChanged Slot, however currently it is not working correctly + hence this fix is temporarily added here */ mPredictionModeHandler->setAutocompletionStatus(HbInputSettingProxy::instance()->isAutocompletionEnabled(HbKeyboardSettingQwerty)); } else if (newState.inputMode() == HbInputModeDefault) { mActiveModeHandler = mBasicModeHandler; @@ -514,10 +512,7 @@ if (!mSctKeypad) { mSctKeypad = new HbSctKeyboard(this, mKeymap); connect(mSctKeypad, SIGNAL(smileySelected(QString)), this, SLOT(smileySelected(QString))); - connect(mSctKeypad, SIGNAL(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod)), this, SLOT(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod))); - connect(mSctKeypad, SIGNAL(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode)), - this, SLOT(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode))); - mSctKeypad->setRockerVisible(true); + connect(mSctKeypad, SIGNAL(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod)), this, SLOT(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod))); } mSctKeypad->setMode(EModeAbc, HbModifierNone); //open the keypad @@ -648,49 +643,6 @@ } /*! -Slot used by virtual rocker to move cursor. -*/ -void HbVirtualQwerty::rockerDirection(int aDirection, HbInputVirtualRocker::RockerSelectionMode aSelectionMode) -{ - Qt::KeyboardModifiers modifiers = 0; - if (aSelectionMode == HbInputVirtualRocker::RockerSelectionModeOn) { - modifiers = Qt::ShiftModifier; - } - // commit any character/word which is in inline edit. - mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionCommit); - HbInputLanguage inputlang = HbInputSettingProxy::instance()->globalInputLanguage(); - - switch (aDirection) { - case HbInputVirtualRocker::HbRockerDirectionLeft: - if(inputlang.isRightToLeftLanguage()) { - focusObject()->cursorRight(modifiers); - } else { - focusObject()->cursorLeft(modifiers); - } - break; - case HbInputVirtualRocker::HbRockerDirectionRight: - if(inputlang.isRightToLeftLanguage()) { - focusObject()->cursorLeft(modifiers); - } else { - focusObject()->cursorRight(modifiers); - } - break; - case HbInputVirtualRocker::HbRockerDirectionUp: { - QKeyEvent keyEvent(QEvent::KeyPress, Qt::Key_Up, modifiers); - focusObject()->sendEvent(keyEvent); - } - break; - case HbInputVirtualRocker::HbRockerDirectionDown: { - QKeyEvent keyEvent(QEvent::KeyPress, Qt::Key_Down, modifiers); - focusObject()->sendEvent(keyEvent); - } - break; - default: - break; - } -} - -/*! The framework calls this method when the predictive input status changes. */ void HbVirtualQwerty::predictiveInputStateChanged(HbKeyboardSettingFlags keyboardType, bool newStatus) @@ -708,7 +660,7 @@ void HbVirtualQwerty::primaryCandidateModeChanged(HbPrimaryCandidateMode mode) { - mPredictionModeHandler->setPrimaryCandidateMode(mode); + mPredictionModeHandler->setPrimaryCandidateMode(mode); } void HbVirtualQwerty::autocompletionStateChanged(HbKeyboardSettingFlags keyboardType, bool newState) diff -r 4633027730f5 -r e6ad4ef83b23 src/hbplugins/inputmethods/touchinput/virtualqwerty.h --- a/src/hbplugins/inputmethods/touchinput/virtualqwerty.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbplugins/inputmethods/touchinput/virtualqwerty.h Thu Sep 02 20:44:51 2010 +0300 @@ -29,7 +29,6 @@ #include #include #include -#include #include class QTimer; @@ -65,8 +64,7 @@ bool filterEvent(const QEvent* event); public slots: - void orientationAboutToChange(); - void rockerDirection(int aDirection, HbInputVirtualRocker::RockerSelectionMode aSelectionMode); + void orientationAboutToChange(); // keypad related slots void keypadClosed(); void keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod vkbCloseMethod); @@ -107,7 +105,7 @@ HbKeyboardType currentKeyboardType() const; private slots: - void primaryCandidateModeChanged(HbPrimaryCandidateMode mode); + void primaryCandidateModeChanged(HbPrimaryCandidateMode mode); void restorePreviousState(); private: diff -r 4633027730f5 -r e6ad4ef83b23 src/hbservers/hbsplashgenerator/hbsplashdirs_p.h --- a/src/hbservers/hbsplashgenerator/hbsplashdirs_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbservers/hbsplashgenerator/hbsplashdirs_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -27,6 +27,7 @@ #define HBSPLASHDIRS_P_H #include +#include "hbsplashdefs_p.h" #ifdef Q_OS_SYMBIAN #include @@ -46,9 +47,9 @@ CCoeEnv *env = CCoeEnv::Static(); if (env) { TUint driveStatus; - qDebug("[hbsplash] dir selection: trying drive %d %c", drive, (char) driveLetter); + splDebug("[hbsplash] dir selection: trying drive %d %c", drive, (char) driveLetter); if (DriveInfo::GetDriveStatus(env->FsSession(), drive, driveStatus) == KErrNone) { - qDebug("[hbsplash] drive status is %x", driveStatus); + splDebug("[hbsplash] drive status is %x", driveStatus); // Check if the drive is really internal (devices without internal mass // storage will return the memory card which is not what we want here). if (!(driveStatus & DriveInfo::EDriveInternal) @@ -56,11 +57,11 @@ || !(driveStatus & DriveInfo::EDriveFormatted) || (driveStatus & DriveInfo::EDriveCorrupt) || (driveStatus & DriveInfo::EDriveInUse)) { - qDebug("[hbsplash] drive not usable, skipping"); + splDebug("[hbsplash] drive not usable, skipping"); driveUsable = false; } } else { - qDebug("[hbsplash] GetDriveStatus failed, skipping"); + splDebug("[hbsplash] GetDriveStatus failed, skipping"); driveUsable = false; } } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbservers/hbsplashgenerator/hbsplashgen_server_symbian.cpp --- a/src/hbservers/hbsplashgenerator/hbsplashgen_server_symbian.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbservers/hbsplashgenerator/hbsplashgen_server_symbian.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -36,7 +36,6 @@ #include #include #include -#include const int bitmap_cache_limit = 4; // Must be at least 1. Each bitmap consumes ~1 MB. @@ -54,7 +53,7 @@ CEikAppUi *HbSplashGenDocument::CreateAppUiL() { - qDebug() << PRE << "using custom appui"; + splDeb() << PRE << "using custom appui"; return new(ELeave) HbSplashGenAppUi; } @@ -137,8 +136,8 @@ void HbSplashGenServer::onOutputDirContentsUpdated(const QString &dir, const QStringList &entries) { - qDebug() << PRE << "splash screen dir contents received" << dir; - qDebug() << PRE << entries; + splDeb() << PRE << "splash screen dir contents received" << dir; + splDeb() << PRE << entries; mServer->setSplashScreenDir(dir); mServer->setSplashScreenDirContents(entries); } @@ -166,7 +165,7 @@ mFs.ShareProtected(); TRAP(err, StartL(hbsplash_server_name)); if (err == KErrNone) { - qDebug() << PRE << "server started"; + splDeb() << PRE << "server started"; } else { qWarning() << PRE << "server start failed" << err; } @@ -244,14 +243,14 @@ if (wantsBitmap) { const BitmapCacheData *cachedBitmapData = getCachedBitmap(fileName); if (cachedBitmapData) { - qDebug() << PRE << "returning cached bitmap for" << fileName; + splDeb() << PRE << "returning cached bitmap for" << fileName; completeWithBitmap(message, *cachedBitmapData); return true; } } QDir splashScreenDir(mSplashScreenDir); QString nativeName = QDir::toNativeSeparators(splashScreenDir.filePath(fileName)); - qDebug() << PRE << "trying to read" << nativeName; + splDeb() << PRE << "trying to read" << nativeName; TPtrC nativeNameDes(static_cast(nativeName.utf16()), nativeName.length()); RFile f; if (f.Open(mFs, nativeNameDes, EFileRead | EFileShareReadersOrWriters) == KErrNone) { @@ -319,7 +318,7 @@ QString orientation = QString::fromUtf16(orientationDes.Ptr(), orientationDes.Length()); QString appId = QString::fromUtf16(appIdDes.Ptr(), appIdDes.Length()); QString screenId = QString::fromUtf16(screenIdDes.Ptr(), screenIdDes.Length()); - qDebug() << PRE << "getSplash request" << orientation << appId << screenId; + splDeb() << PRE << "getSplash request" << orientation << appId << screenId; // Do not allow accessing app-specific splash screens of other applications. if (!appId.isEmpty() || !screenId.isEmpty()) { @@ -381,7 +380,7 @@ } } - qDebug() << PRE << "getSplash request completed"; + splDeb() << PRE << "getSplash request completed"; if (!cachedEntryListValid) { // Set the splash dir back to empty so future invocations can also // recognize that the generator has not notified us yet. @@ -393,12 +392,12 @@ HbSplashGenServerSession::HbSplashGenServerSession(HbSplashGenServerSymbian *server) : mServer(server) { - qDebug() << PRE << "new session"; + splDeb() << PRE << "new session"; } HbSplashGenServerSession::~HbSplashGenServerSession() { - qDebug() << PRE << "session destroyed"; + splDeb() << PRE << "session destroyed"; } void HbSplashGenServerSession::ServiceL(const RMessage2 &message) @@ -420,7 +419,7 @@ param 3 [out] CFbsBitmap handle */ - qDebug() << PRE << "ServiceL" << message.Function() << QString::number(message.SecureId().iId, 16); + splDeb() << PRE << "ServiceL" << message.Function() << QString::number(message.SecureId().iId, 16); switch (message.Function()) { case HbSplashSrvGetSplashFile: // fallthrough case HbSplashSrvGetSplashData: diff -r 4633027730f5 -r e6ad4ef83b23 src/hbservers/hbsplashgenerator/hbsplashgenerator.cpp --- a/src/hbservers/hbsplashgenerator/hbsplashgenerator.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbservers/hbsplashgenerator/hbsplashgenerator.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -108,7 +108,7 @@ { const char *fmt = PRE " %s ('%s' '%s')"; QString oriName = orientationName(static_cast(orientation)); - qDebug(fmt, qPrintable(msg), qPrintable(theme), qPrintable(oriName)); + splDebug(fmt, qPrintable(msg), qPrintable(theme), qPrintable(oriName)); } // To be called on startup and after each fully completed regeneration. @@ -129,7 +129,7 @@ void HbSplashGenerator::doStart() { - qDebug() << PRE << "accessing theme"; + splDeb() << PRE << "accessing theme"; // Start listening to the theme-change-finished signal. HbTheme *theme = hbInstance->theme(); connect(theme, SIGNAL(changeFinished()), SLOT(regenerate())); @@ -145,6 +145,12 @@ } } + // Regenerate screens, if needed. + scheduleRegen(); +} + +void HbSplashGenerator::scheduleRegen() +{ // Regenerate screens on startup only when the theme, the language, the // number of files in the splash screen directory, or the splash screen // directory path is different than the recorded values. (or when @@ -153,7 +159,7 @@ QString lastLang = mSettings->value(QLatin1String(last_lang_key)).toString(); int lastFileCount = mSettings->value(QLatin1String(last_file_count_key)).toInt(); QString lastOutputDir = mSettings->value(QLatin1String(last_output_dir_key)).toString(); - QString currentTheme = theme->name(); + QString currentTheme = hbInstance->theme()->name(); QString currentLang = QLocale::system().name(); QString currentOutputDir = hbsplash_output_dir(); int currentFileCount = updateOutputDirContents(currentOutputDir); @@ -166,6 +172,7 @@ || currentFileCount != lastFileCount || currentOutputDir != lastOutputDir) { QMetaObject::invokeMethod(this, "regenerate", Qt::QueuedConnection); + mForceRegen = false; } } @@ -216,7 +223,7 @@ queueAppSpecificItems(themeName, Qt::Vertical); queueAppSpecificItems(themeName, Qt::Horizontal); mSaveSplFailed = false; - qDebug() << PRE << "queue preparation time (ms):" << queuePrepTime.elapsed(); + splDeb() << PRE << "queue preparation time (ms):" << queuePrepTime.elapsed(); QMetaObject::invokeMethod(this, "processQueue", Qt::QueuedConnection); } catch (const std::bad_alloc &) { cleanup(); @@ -260,13 +267,13 @@ image.fill(QColor(Qt::transparent).rgba()); QPainter painter(&image); mMainWindow->render(&painter); - qDebug() << PRE << "rendering time (ms):" << t.elapsed(); + splDeb() << PRE << "rendering time (ms):" << t.elapsed(); return image; } void HbSplashGenerator::processQueue() { - qDebug() << PRE << "processQueue()"; + splDeb() << PRE << "processQueue()"; // If the queue is empty then the splash regeneraton is complete so store // the current theme and language names as the last fully processed ones in // the settings and stop. @@ -280,22 +287,31 @@ // ...but store zero if some file writing failed at some point // so there will be a regeneration on next boot at least. if (mSaveSplFailed) { + qWarning() << PRE << "some files not ok, ignoring file count"; fileCount = 0; - qDebug() << PRE << "some files not ok, ignoring file count"; + // Waiting until next boot is not always the best solution so try + // again a bit later. This has to be limited, though, to prevent + // continously flooding the system with regenerate requests in case + // of an unusable drive. So retry only for a limited number of + // times, if all else fails we will try again on next boot. + static int retriesLeft = 3; + if (retriesLeft-- > 0) { + QTimer::singleShot(60000, this, SLOT(scheduleRegen())); // 1 min + } } else { - qDebug() << PRE << "all files ok"; + splDeb() << PRE << "all files ok"; } mSettings->setValue(last_file_count_key, fileCount); mSettings->setValue(last_output_dir_key, outDir); emit finished(); - qDebug() << PRE << "processQueue() over"; + splDeb() << PRE << "processQueue() over"; return; } // If a previous splash generation is still in progress or a compositor is // working then do nothing. if (!lockMainWindow()) { mProcessQueuePending = true; - qDebug() << PRE << "still busy processQueue() over"; + splDeb() << PRE << "still busy processQueue() over"; return; } try { @@ -306,12 +322,12 @@ ensureMainWindow(); mMainWindow->setOrientation(mItem.mOrientation, false); - qDebug() << PRE << "mainwindow init time (ms):" << mItemTime.elapsed(); + splDeb() << PRE << "mainwindow init time (ms):" << mItemTime.elapsed(); QTime setupTime; setupTime.start(); setupAppSpecificWindow(); - qDebug() << PRE << "content setup time (ms):" << setupTime.elapsed(); + splDeb() << PRE << "content setup time (ms):" << setupTime.elapsed(); // The async call chain goes like this: // processQueue -> finishWindow -> processWindow -> processQueue -> ... @@ -322,7 +338,7 @@ } catch (const std::bad_alloc &) { cleanup(); } - qDebug() << PRE << "processQueue() over"; + splDeb() << PRE << "processQueue() over"; } HbMainWindow *HbSplashGenerator::ensureMainWindow() @@ -343,7 +359,7 @@ // Take the screenshot, remove content, and move on to the next request in the queue. log("processWindow() rendering splash screen", mItem.mThemeName, mItem.mOrientation); takeScreenshot(); - qDebug() << PRE << "total time for screen (ms):" << mItemTime.elapsed(); + splDeb() << PRE << "total time for screen (ms):" << mItemTime.elapsed(); QList views = mMainWindow->views(); foreach(HbView * view, views) { @@ -372,7 +388,7 @@ QTime t; t.start(); QString splashFile = splashFileName(); - qDebug() << PRE << "saving to" << splashFile; + splDeb() << PRE << "saving to" << splashFile; if (saveSpl(splashFile, image, mItem.mFlagsToStore)) { #if !defined(Q_OS_SYMBIAN) && defined(QT_DEBUG) image.save(splashFile + QLatin1String(".png")); @@ -380,8 +396,12 @@ } else { qWarning() << PRE << "file write failed for" << splashFile; mSaveSplFailed = true; + // After setting the fail flag, clear the queue to stop processing + // further screens because file writes would probably fail anyway. + // Instead, processQueue() will schedule a retry at a later time. + mQueue.clear(); } - qDebug() << PRE << "save time (ms):" << t.elapsed(); + splDeb() << PRE << "save time (ms):" << t.elapsed(); log("takeScreenshot() over", mItem.mThemeName, mItem.mOrientation); } catch (const std::bad_alloc &) { cleanup(); @@ -392,11 +412,29 @@ { QString outDirName = hbsplash_output_dir(); QDir dir(outDirName); +#ifdef Q_OS_SYMBIAN + // Do not use QDir::mkpath() on Symbian. It is not able to create the + // 'private' directory itself in case it does not exist (which is possible + // during first boot because splashgen is started relatively early and the + // eMMC may be totally empty at that point). RFs::MkDirAll() works better in + // this respect. + QString nativeOutPath = QDir::toNativeSeparators(outDirName); + if (!nativeOutPath.endsWith('\\')) { + nativeOutPath.append('\\'); + } + TPtrC nativeOutPathDes(static_cast(nativeOutPath.utf16()), + nativeOutPath.length()); + TInt err = CCoeEnv::Static()->FsSession().MkDirAll(nativeOutPathDes); + if (err != KErrNone && err != KErrAlreadyExists) { + qWarning() << PRE << "MkDirAll failed with" << err << "for" << nativeOutPath; + } +#else if (!dir.exists()) { if (!QDir(".").mkpath(outDirName)) { qWarning() << PRE << "mkpath failed for" << outDirName; } } +#endif // "splash___" QString splashFile = dir.filePath("splash_"); splashFile.append(orientationName(mItem.mOrientation)); @@ -499,17 +537,17 @@ // Skip if a file with the same name has already been processed from // a different location. if (processedFileNames.contains(entry)) { - qDebug() << PRE << "skipping splashml (already found at other location)" << dir.filePath(entry); + splDeb() << PRE << "skipping splashml (already found at other location)" << dir.filePath(entry); continue; } processedFileNames.insert(entry); QString fullName = dir.filePath(entry); - qDebug() << PRE << "parsing splashml" << fullName; + splDeb() << PRE << "parsing splashml" << fullName; if (mParsedSplashmls.contains(fullName)) { QueueItem item(mParsedSplashmls.value(fullName)); item.mThemeName = themeName; item.mOrientation = orientation; - qDebug() << PRE << "splashml already parsed queuing request" << item; + splDeb() << PRE << "splashml already parsed queuing request" << item; addSplashmlItemToQueue(item); continue; } @@ -522,7 +560,7 @@ // Add the full path to the filename. The docml is supposed to // be in the same directory as the splashml. item.mDocmlFileName = dir.filePath(item.mDocmlFileName); - qDebug() << PRE << "queuing request" << item; + splDeb() << PRE << "queuing request" << item; addSplashmlItemToQueue(item); mParsedSplashmls.insert(fullName, item); } else { @@ -668,7 +706,7 @@ { QObject *obj = HbDocumentLoader::createObject(type, name); if (!obj) { - qDebug() << PRE << "unsupported object" << type << name; + splDeb() << PRE << "unsupported object" << type << name; // Cannot let parsing fail because of unknown custom widgets // so provide an empty HbWidget (or HbView if the splashml // prefers that). @@ -717,12 +755,12 @@ } } sections << mItem.mForcedSections; - qDebug() << PRE << "loading" << mItem.mDocmlFileName << "common section"; + splDeb() << PRE << "loading" << mItem.mDocmlFileName << "common section"; bool ok; loader.load(mItem.mDocmlFileName, &ok); if (ok && !sections.isEmpty()) { foreach(const QString & section, sections) { - qDebug() << PRE << "loading" << mItem.mDocmlFileName << "section" << section; + splDeb() << PRE << "loading" << mItem.mDocmlFileName << "section" << section; loader.load(mItem.mDocmlFileName, section, &ok); } } @@ -732,7 +770,7 @@ // Find the root view and add it to the mainwindow. QGraphicsWidget *widget = loader.findWidget(mItem.mDocmlWidgetName); if (widget) { - qDebug() << PRE << "widget created from" << mItem; + splDeb() << PRE << "widget created from" << mItem; mMainWindow->addView(widget); } else { qWarning() << PRE << "widget creation failed from" << mItem; @@ -753,7 +791,7 @@ } HbWidget *widget = qobject_cast(loader.findWidget(req.mTargetWidgetName)); if (widget) { - qDebug() << PRE << "setting background item" << req.mFrameGraphicsName + splDeb() << PRE << "setting background item" << req.mFrameGraphicsName << "for" << req.mTargetWidgetName; widget->setBackgroundItem( new HbFrameItem(req.mFrameGraphicsName, req.mFrameGraphicsType), @@ -847,7 +885,7 @@ // Hide dynamic content from status bar (clock, indicators). setStatusBarElementsVisible(mMainWindow, false); - qDebug() << PRE << "time spent in finishWindow() (ms):" << prepTime.elapsed(); + splDeb() << PRE << "time spent in finishWindow() (ms):" << prepTime.elapsed(); // Continue with rendering the graphics view in processWindow(). QMetaObject::invokeMethod(this, "processWindow", Qt::QueuedConnection); @@ -887,7 +925,7 @@ // may still pick up another suitable file based on this name. if (translator->load(fullName)) { QCoreApplication::installTranslator(translator); - qDebug() << PRE << "translator installed:" << fullName; + splDeb() << PRE << "translator installed:" << fullName; ok = true; break; } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbservers/hbsplashgenerator/hbsplashgenerator_p.h --- a/src/hbservers/hbsplashgenerator/hbsplashgenerator_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbservers/hbsplashgenerator/hbsplashgenerator_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -73,6 +73,7 @@ private slots: void doStart(); + void scheduleRegen(); void processQueue(); void finishWindow(); void processWindow(); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbservers/hbsplashgenerator/main.cpp --- a/src/hbservers/hbsplashgenerator/main.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbservers/hbsplashgenerator/main.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -71,7 +71,7 @@ HbApplication app(argc, argv, Hb::NoSplash); #endif - qDebug("[hbsplashgenerator] initializing generator"); + splDebug("[hbsplashgenerator] initializing generator"); HbSplashGenerator gen; bool forceRegen = false; char **args = argv; @@ -85,7 +85,7 @@ #if defined(Q_OS_SYMBIAN) || defined(HB_Q_WS_MAEMO) app.setQuitOnLastWindowClosed(false); #else - qDebug("[hbsplashgenerator] initializing ui"); + splDebug("[hbsplashgenerator] initializing ui"); QMainWindow mw; QPushButton *btnRegen = new QPushButton("Regenerate"); gen.connect(btnRegen, SIGNAL(clicked()), SLOT(uncachedRegenerate())); @@ -99,16 +99,16 @@ // The server must be initialized before calling HbSplashGenerator::start(). #if defined(Q_OS_SYMBIAN) - qDebug("[hbsplashgenerator] starting server"); + splDebug("[hbsplashgenerator] starting server"); HbSplashGenServer server(&gen); // If there was an error then exit right away. if (!server.startupSuccess()) { - qDebug("[hbsplashgenerator] exiting due to failed server startup"); + splDebug("[hbsplashgenerator] exiting due to failed server startup"); return 0; } #endif - qDebug("[hbsplashgenerator] starting generator"); + splDebug("[hbsplashgenerator] starting generator"); gen.start(forceRegen); HbSplashIndicatorCompositor indiCompositor(&gen); @@ -116,15 +116,15 @@ #if defined(Q_OS_SYMBIAN) server.addCompositor(&indiCompositor); if (mutexToSignal) { - qDebug("[hbsplashgenerator] signaling mutex"); + splDebug("[hbsplashgenerator] signaling mutex"); static_cast(mutexToSignal)->Signal(); } #endif - qDebug("[hbsplashgenerator] entering event loop"); + splDebug("[hbsplashgenerator] entering event loop"); int ret = app.exec(); - qDebug("[hbsplashgenerator] exiting"); + splDebug("[hbsplashgenerator] exiting"); return ret; } @@ -143,7 +143,7 @@ mutex.Wait(); mutexToSignal = &mutex; } else { - qDebug("[hbsplashgenerator] failed to open/create mutex"); + qWarning("[hbsplashgenerator] failed to open/create mutex"); } // Due to the mutex-based synchronization we should now be able to // use TFindServer to safely check if there is another instance @@ -151,7 +151,7 @@ TFindServer findServer(hbsplash_server_name); TFullName serverName; if (findServer.Next(serverName) == KErrNone) { - qDebug("[hbsplashgenerator] found another instance, exiting"); + splDebug("[hbsplashgenerator] found another instance, exiting"); canStart = false; RProcess::Rendezvous(KErrAlreadyExists); } @@ -162,7 +162,7 @@ try { result = runMain(argc, argv, mutexToSignal); } catch (...) { - qDebug("[hbsplashgenerator] exiting due to exception in main()"); + qWarning("[hbsplashgenerator] exiting due to exception in main()"); } } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbservers/hbthemeserver/hbicondatacache_p.cpp --- a/src/hbservers/hbthemeserver/hbicondatacache_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbservers/hbthemeserver/hbicondatacache_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -189,7 +189,7 @@ cache->clear(); // close the sgimage driver after all the - // sgimage items and its memory were deleted. + // sgimage items and its memory were deleted. #ifdef HB_SGIMAGE_ICON if (!goodMemory && (currentGpuCacheSize <= 0) ) { HbSgImageRenderer::global()->terminate(); @@ -726,7 +726,7 @@ } } // close the sgimage driver after all the - // sgimage items and its memory were deleted. + // sgimage items and its memory were deleted. #ifdef HB_SGIMAGE_ICON if (!goodMemory && (currentGpuCacheSize <= 0) ) { HbSgImageRenderer::global()->terminate(); @@ -841,7 +841,22 @@ } } return sgImagesCount; +} +int HbIconDataCache::totalSgImagesCost() const +{ + int sgImagesCost = 0; + QHash::const_iterator itEnd(cache->constEnd()); + for (QHash::const_iterator iter = cache->constBegin(); + iter != itEnd; + ++iter) { + HbIconCacheItem *temp = iter.value(); + if( temp->rasterIconData.type == SGIMAGE ){ + sgImagesCost += temp->rasterIconDataCost; + } + } + return sgImagesCost; } int HbIconDataCache::cachedPixmapCount() const diff -r 4633027730f5 -r e6ad4ef83b23 src/hbservers/hbthemeserver/hbicondatacache_p.h --- a/src/hbservers/hbthemeserver/hbicondatacache_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbservers/hbthemeserver/hbicondatacache_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -73,6 +73,7 @@ int vectorLruCount(); #endif int cachedSgImagesCount() const; + int totalSgImagesCost() const; int cachedPixmapCount() const; private: diff -r 4633027730f5 -r e6ad4ef83b23 src/hbservers/hbthemeserver/hbiconprocessor_p.h --- a/src/hbservers/hbthemeserver/hbiconprocessor_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbservers/hbthemeserver/hbiconprocessor_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -50,7 +50,7 @@ mode(m), mirrored(mir), color(clr), - renderMode(rMode) + renderMode(rMode) { } @@ -77,7 +77,7 @@ mirrored = other.mirrored; filename = other.filename; color = other.color; - renderMode = other.renderMode; + renderMode = other.renderMode; } return *this; } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbservers/hbthemeserver/hbpixmapiconprocessor_p.cpp --- a/src/hbservers/hbthemeserver/hbpixmapiconprocessor_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbservers/hbthemeserver/hbpixmapiconprocessor_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -128,7 +128,7 @@ isIconCreated = renderPicToPixmap(iconPath); } else if (iconType == "NVG") { #if defined (HB_NVG_CS_ICON) - isIconCreated = renderNvgToPixmap(iconPath); + isIconCreated = renderNvgToPixmap(iconPath); #endif //HB_NVG_CS_ICON } else { isIconCreated = renderOtherFormatsToPixmap(iconPath); @@ -267,7 +267,7 @@ } HbIconSource *source = HbThemeServerUtils::getIconSource(iconPath); - pixmap = *source->pixmap(); + pixmap = QPixmap::fromImage(*source->image()); if (pixmap.isNull()) { return isIconCreated; @@ -308,7 +308,7 @@ isIconCreated = true; // Delete original pixmap if its size is large - source->deletePixmapIfLargerThan(PIXMAP_SIZE_LIMIT); + source->deleteImageIfLargerThan(IMAGE_SIZE_LIMIT); return isIconCreated; } @@ -366,7 +366,7 @@ painter.drawPixmap(multiPieceIconParams.multiPartIconData.targets[i].topLeft(), pixmap, pixmap.rect()); } #if defined (HB_NVG_CS_ICON) - } + } #endif } @@ -495,7 +495,7 @@ //Copy the data from the surface err = VGICopyToTarget(format, stride, imageBuffer, 0, NULL, VGI_COPY_TRANSPARENT_PIXELS); #ifdef __DEBUG - qDebug() << "error code for VGICopyToTarget()"<< err; + qDebug() << "error code for VGICopyToTarget()"<< err; #endif //Get Pixmap from the Qimage. pixmap = QPixmap::fromImage(img); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbservers/hbthemeserver/hbpixmapiconprocessor_p.h --- a/src/hbservers/hbthemeserver/hbpixmapiconprocessor_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbservers/hbthemeserver/hbpixmapiconprocessor_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -81,7 +81,7 @@ bool renderNvgToPixmap(const QString& iconPath); bool pixmapFromByteArray(const QByteArray &byteArray, const QSize iconSize, Qt::AspectRatioMode aspectRatioMode); HbNvgAspectRatioSettings mapKeyAspectRatioToNvgAspectRatio( - Qt::AspectRatioMode aspectRatio) const; + Qt::AspectRatioMode aspectRatio) const; #endif //HB_NVG_CS_ICON private: QPixmap pixmap; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbservers/hbthemeserver/hbthemeserver_symbian.cpp --- a/src/hbservers/hbthemeserver/hbthemeserver_symbian.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbservers/hbthemeserver/hbthemeserver_symbian.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -502,6 +502,11 @@ return cache->cachedSgImagesCount(); } +int HbThemeServerPrivate::totalSgImagesCost() const +{ + return cache->totalSgImagesCost(); +} + int HbThemeServerPrivate::cachedPixmapCount() const { return cache->cachedPixmapCount(); @@ -710,9 +715,14 @@ unLoadIcon(aMessage); break; + case EBatchUnloadIcon: + batchUnLoadIcon(aMessage); + break; + case EUnloadMultiIcon: unloadMultiIcon(aMessage); break; + case ENotifyForegroundLost: #if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON) freeClientGpuResources(); @@ -864,6 +874,12 @@ aMessage.WriteL(1, out); break; } + case ETotalSgImagesCost: { + TInt cachedSgImagesCost = iServer->totalSgImagesCost(); + TPckg out(cachedSgImagesCost); + aMessage.WriteL(1, out); + break; + } case ECachedPixmapImages: { TInt cachedPixImages = iServer->cachedPixmapCount(); TPckg out(cachedPixImages); @@ -1701,23 +1717,43 @@ } +void HbThemeServerSession::performUnload(const TIconParams ¶ms) +{ + QString filename((QChar*) params.fileName.Ptr(), params.fileName.Length()); + HbIconKey key(filename, + QSizeF(params.width, params.height), + (Qt::AspectRatioMode) params.aspectRatioMode, + (QIcon::Mode) params.mode, + params.mirrored, + GetColorFromRgba(params.rgba, params.colorflag), + (HbRenderingMode) params.renderMode); + iServer->CleanupSessionIconItem(key); + sessionData.removeOne(key); +} + void HbThemeServerSession::unLoadIcon(const RMessage2& aMessage) { TIconParams params = ReadMessageAndRetrieveParams(aMessage); - QString filename((QChar*)params.fileName.Ptr(), params.fileName.Length()); - QColor color = GetColorFromRgba(params.rgba, params.colorflag); - HbIconKey key(filename, QSizeF(params.width, params.height), - (Qt::AspectRatioMode)params.aspectRatioMode, - (QIcon::Mode)params.mode, params.mirrored, color, (HbRenderingMode)params.renderMode); - iServer->CleanupSessionIconItem(key); - sessionData.removeOne(key); + performUnload(params); +} + +void HbThemeServerSession::batchUnLoadIcon(const RMessage2& aMessage) +{ + typedef TIconParams Params[BATCH_SIZE_LIMIT]; + Params paramList; + TPckg paramsPckg(paramList); + aMessage.ReadL(0, paramsPckg); + for (int i = 0; i < BATCH_SIZE_LIMIT; ++i) { + const TIconParams ¶ms(paramList[i]); + if (params.fileName.Length()) { + performUnload(params); + } + } } void HbThemeServerSession::unloadMultiIcon(const RMessage2& aMessage) { TIconListParams params; - - TInt deslen = aMessage.GetDesLength(0); TPckg paramPckg(params); // Copy the client's descriptor data into our buffer. aMessage.ReadL(0, paramPckg, 0); @@ -1747,7 +1783,7 @@ void HbThemeServerSession::freeClientGpuResources() { #if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON) - QList tempSessionData(sessionData); + QList tempSessionData(sessionData); QList::const_iterator itEnd( tempSessionData.constEnd() ); for ( QList::const_iterator iter = tempSessionData.constBegin(); iter != itEnd; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbservers/hbthemeserver/hbthemeserver_symbian_p_p.h --- a/src/hbservers/hbthemeserver/hbthemeserver_symbian_p_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbservers/hbthemeserver/hbthemeserver_symbian_p_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -110,6 +110,7 @@ unsigned long freeGPUMemory(); unsigned long totalGPUMemory(); int cachedSgImagesCount() const; + int totalSgImagesCost() const; int cachedPixmapCount() const; //Debug Code for Test Purpose #ifdef HB_ICON_CACHE_DEBUG @@ -195,14 +196,17 @@ HbSharedIconInfoList &iconInfoList); void HandleTypefaceReqL(const RMessage2& aMessage); void unLoadIcon(const RMessage2& aMessage); + void batchUnLoadIcon(const RMessage2& aMessage); void unloadMultiIcon(const RMessage2& aMessage); void freeClientGpuResources(); void ClearSessionData(); void freeGpuResources(); void SwitchRenderingMode(HbRenderingMode aRenderMode); + protected: TIconParams ReadMessageAndRetrieveParams(const RMessage2 & aMessage); void PanicClient(const RMessage2 & aMessage, TInt aPanic) const; + void performUnload(const TIconParams ¶ms); private: HbThemeServerPrivate *iServer; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbservers/hbthemeserveroogmplugin/hbthemeclientoogm.cpp --- a/src/hbservers/hbthemeserveroogmplugin/hbthemeclientoogm.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbservers/hbthemeserveroogmplugin/hbthemeclientoogm.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -150,8 +150,8 @@ } if (connected) { - TPckg usingSwRendering(isUsingSwRendering); - TIpcArgs args(&usingSwRendering, 0); + TPckg usingSwRendering(isUsingSwRendering); + TIpcArgs args(&usingSwRendering, 0); TInt err = SendReceive(EMemoryGood, args); if (KErrNone != err) { RDebug::Print(_L("ThemeServerPlugin: Good Memory notification sent to ThemeServer")); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbservers/hbthemeserveroogmplugin/hbthemeserveroogmplugin.cpp --- a/src/hbservers/hbthemeserveroogmplugin/hbthemeserveroogmplugin.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbservers/hbthemeserveroogmplugin/hbthemeserveroogmplugin.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -25,7 +25,7 @@ // Include Files -#include "hbthemeserveroogmplugin_p.h" // CThemeSrvOogmPlugin +#include "hbthemeserveroogmplugin_p.h" // CThemeSrvOogmPlugin diff -r 4633027730f5 -r e6ad4ef83b23 src/hbservers/hbthemeserveroogmplugin/hbthemeserveroogmplugin.pro --- a/src/hbservers/hbthemeserveroogmplugin/hbthemeserveroogmplugin.pro Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbservers/hbthemeserveroogmplugin/hbthemeserveroogmplugin.pro Thu Sep 02 20:44:51 2010 +0300 @@ -54,9 +54,9 @@ myrssrules = \ "START RESOURCE hbthemeserveroogmplugin.rss" \ - "TARGETPATH resource/plugins" \ - "TARGET hbthemeserveroogmplugin.rsc" \ - "END" + "TARGETPATH resource/plugins" \ + "TARGET hbthemeserveroogmplugin.rsc" \ + "END" MMP_RULES += myrssrules diff -r 4633027730f5 -r e6ad4ef83b23 src/hbtools/hbbincssmaker/hboffsetmapbuilder.cpp --- a/src/hbtools/hbbincssmaker/hboffsetmapbuilder.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbtools/hbbincssmaker/hboffsetmapbuilder.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -39,8 +39,8 @@ qptrdiff offsets[]) { if (!fileInfo) { - return true; - } + return true; + } bool retValue = true; quint32 nameHash = HbSharedCache::hash(QStringRef(&className)); HbBinMakerOffsetItem mapItem = mMapItems.value(nameHash, HbBinMakerOffsetItem()); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbutils/document/hbdocumentloader.h --- a/src/hbutils/document/hbdocumentloader.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbutils/document/hbdocumentloader.h Thu Sep 02 20:44:51 2010 +0300 @@ -63,7 +63,7 @@ void reset(); static QString version(); - + protected: virtual QObject *createObject(const QString& type, const QString &name); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbutils/theme/hbthemeservices.cpp --- a/src/hbutils/theme/hbthemeservices.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbutils/theme/hbthemeservices.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -70,7 +70,7 @@ themeRequestProp.Close(); #else HbThemeClient::global()->setTheme(themePath); -#endif +#endif } /*! diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/dataform/hbdataform.cpp --- a/src/hbwidgets/dataform/hbdataform.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/dataform/hbdataform.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -610,9 +610,9 @@ slot of receiver object. \param item - %Data form model item. - \param signal - The signal of content widget object. - \param receiver - The object whose slot is called. - \param slot - The slot of \a receiver object which is called when \a signal is emitted. + \param signal - The signal of content widget object. + \param receiver - The object whose slot is called. + \param slot - The slot of \a receiver object which is called when \a signal is emitted. \sa addConnection and removeAllConnection */ diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/dataform/hbdataformviewitem_p.cpp --- a/src/hbwidgets/dataform/hbdataformviewitem_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/dataform/hbdataformviewitem_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -372,7 +372,7 @@ { mSelected = index; if( index > -1 && mItems.count() < index ) { - emit valueChanged(mViewItem->modelIndex(), mItems.at(index)); + emit valueChanged(mViewItem->modelIndex(), mItems.at(index)); } // Disconnect modelchanged signal since visualization is already updated by user // so if not disconnected , this will trigger visualization change again diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/dataform/hbdatagroup_p.cpp --- a/src/hbwidgets/dataform/hbdatagroup_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/dataform/hbdatagroup_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -321,10 +321,10 @@ if(mPageCombo) { // if we are removing the last page then set current page as 0 if( mPageCombo->findText(page) + 1 == mPageCombo->count()) { - mPageCombo->setCurrentIndex(0); - } else {// set next page as the currrent page - mPageCombo->setCurrentIndex(mPageCombo->findText(page) + 1); - } + mPageCombo->setCurrentIndex(0); + } else {// set next page as the currrent page + mPageCombo->setCurrentIndex(mPageCombo->findText(page) + 1); + } // remove the text from ombobox mPageCombo->removeItem(mPageCombo->findText(page)); } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/dataform/hbdatagroup_p.h --- a/src/hbwidgets/dataform/hbdatagroup_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/dataform/hbdatagroup_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -68,7 +68,7 @@ void initStyleOption( HbStyleOptionDataGroup *option ); virtual QSizeF sizeHint( Qt::SizeHint which, const QSizeF &constraint ) const; virtual void pressStateChanged( bool value, bool animate ); - virtual QVariant itemChange( GraphicsItemChange change, const QVariant &value ); + virtual QVariant itemChange( GraphicsItemChange change, const QVariant &value ); private: Q_DECLARE_PRIVATE_D( d_ptr, HbDataGroup ) diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/dataform/hbdatagroup_p_p.h --- a/src/hbwidgets/dataform/hbdatagroup_p_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/dataform/hbdatagroup_p_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -53,8 +53,8 @@ int activePage(); bool setExpanded( bool expanded ); void setEnabled( bool enabled ); - int pageIndex(const QModelIndex &index) const ; - QModelIndex pageModelIndex(int index) const ; + int pageIndex(const QModelIndex &index) const ; + QModelIndex pageModelIndex(int index) const ; public: static HbDataGroupPrivate *d_ptr( HbDataGroup *item ) { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/defs/bwins/HbWidgetsu.def --- a/src/hbwidgets/defs/bwins/HbWidgetsu.def Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/defs/bwins/HbWidgetsu.def Thu Sep 02 20:44:51 2010 +0300 @@ -45,7 +45,7 @@ ?staticMetaObject@HbVolumeSliderPopup@@2UQMetaObject@@B @ 44 NONAME ; struct QMetaObject const HbVolumeSliderPopup::staticMetaObject ?setOffset@HbTrajectory@@QAEXM@Z @ 45 NONAME ABSENT ; void HbTrajectory::setOffset(float) ?setItems@HbRadioButtonList@@QAEXABVQStringList@@@Z @ 46 NONAME ; void HbRadioButtonList::setItems(class QStringList const &) - ?mouseReleaseEvent@HbRadioButtonList@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 47 NONAME ; void HbRadioButtonList::mouseReleaseEvent(class QGraphicsSceneMouseEvent *) + ?mouseReleaseEvent@HbRadioButtonList@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 47 NONAME ABSENT ; void HbRadioButtonList::mouseReleaseEvent(class QGraphicsSceneMouseEvent *) ??_EHbGlobalConfirmationQuery@@UAE@I@Z @ 48 NONAME ABSENT ; HbGlobalConfirmationQuery::~HbGlobalConfirmationQuery(unsigned int) ?itemChange@HbProgressSlider@@MAE?AVQVariant@@W4GraphicsItemChange@QGraphicsItem@@ABV2@@Z @ 49 NONAME ; class QVariant HbProgressSlider::itemChange(enum QGraphicsItem::GraphicsItemChange, class QVariant const &) ?text@HbDeviceNotificationDialog@@QBE?AVQString@@XZ @ 50 NONAME ; class QString HbDeviceNotificationDialog::text(void) const @@ -4096,4 +4096,12 @@ ?modelChanged@HbSelectionDialogContentWidget@@AAEXABVQModelIndex@@HH@Z @ 4095 NONAME ; void HbSelectionDialogContentWidget::modelChanged(class QModelIndex const &, int, int) ?setMaximumLines@HbLabel@@QAEXH@Z @ 4096 NONAME ; void HbLabel::setMaximumLines(int) ?maximumLines@HbLabel@@QBEHXZ @ 4097 NONAME ; int HbLabel::maximumLines(void) const + ?recreatePrimitives@HbMessageBox@@UAEXXZ @ 4098 NONAME ; void HbMessageBox::recreatePrimitives(void) + ?initPrimitiveData@HbMessageBox@@IAEXPAVHbStylePrimitiveData@@PBVQGraphicsObject@@@Z @ 4099 NONAME ; void HbMessageBox::initPrimitiveData(class HbStylePrimitiveData *, class QGraphicsObject const *) + ?setModel@HbSelectionDialogContentWidget@@QAEXPAVQAbstractItemModel@@@Z @ 4100 NONAME ; void HbSelectionDialogContentWidget::setModel(class QAbstractItemModel *) + ?_q_selectionChanged@HbSelectionDialogContentWidget@@AAEXABVQItemSelection@@0@Z @ 4101 NONAME ; void HbSelectionDialogContentWidget::_q_selectionChanged(class QItemSelection const &, class QItemSelection const &) + ?gestureEvent@HbProgressSlider@@MAEXPAVQGestureEvent@@@Z @ 4102 NONAME ; void HbProgressSlider::gestureEvent(class QGestureEvent *) + ?SetShowLevel@HbDeviceDialogsExtensionSymbian@@SAXPAVCHbDeviceProgressDialogSymbian@@H@Z @ 4103 NONAME ; void HbDeviceDialogsExtensionSymbian::SetShowLevel(class CHbDeviceProgressDialogSymbian *, int) + ?SetShowLevel@HbDeviceDialogsExtensionSymbian@@SAXPAVCHbDeviceNotificationDialogSymbian@@H@Z @ 4104 NONAME ; void HbDeviceDialogsExtensionSymbian::SetShowLevel(class CHbDeviceNotificationDialogSymbian *, int) + ?SetShowLevel@HbDeviceDialogsExtensionSymbian@@SAXPAVCHbDeviceMessageBoxSymbian@@H@Z @ 4105 NONAME ; void HbDeviceDialogsExtensionSymbian::SetShowLevel(class CHbDeviceMessageBoxSymbian *, int) diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/defs/eabi/HbWidgetsu.def --- a/src/hbwidgets/defs/eabi/HbWidgetsu.def Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/defs/eabi/HbWidgetsu.def Thu Sep 02 20:44:51 2010 +0300 @@ -837,7 +837,7 @@ _ZN17HbRadioButtonList14setPreviewModeENS_11PreviewModeE @ 836 NONAME _ZN17HbRadioButtonList16selectionCommandEPK18HbAbstractViewItemPK6QEventb @ 837 NONAME ABSENT _ZN17HbRadioButtonList16staticMetaObjectE @ 838 NONAME DATA 16 - _ZN17HbRadioButtonList17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 839 NONAME + _ZN17HbRadioButtonList17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 839 NONAME ABSENT _ZN17HbRadioButtonList19getStaticMetaObjectEv @ 840 NONAME _ZN17HbRadioButtonList5eventEP6QEvent @ 841 NONAME _ZN17HbRadioButtonList5resetEv @ 842 NONAME @@ -2046,7 +2046,7 @@ _ZThn8_N16HbProgressSlider17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 2045 NONAME _ZThn8_N16HbProgressSliderD0Ev @ 2046 NONAME _ZThn8_N16HbProgressSliderD1Ev @ 2047 NONAME - _ZThn8_N17HbRadioButtonList17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 2048 NONAME + _ZThn8_N17HbRadioButtonList17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 2048 NONAME ABSENT _ZThn8_N17HbRadioButtonListD0Ev @ 2049 NONAME _ZThn8_N17HbRadioButtonListD1Ev @ 2050 NONAME _ZThn8_N17HbSettingFormItemD0Ev @ 2051 NONAME ABSENT @@ -4539,21 +4539,29 @@ _ZThn144_NK23HbProgressSliderPrivate5styleEv @ 4538 NONAME ABSENT _ZThn144_NK23HbProgressSliderPrivate7maximumEv @ 4539 NONAME ABSENT _ZThn144_NK23HbProgressSliderPrivate7minimumEv @ 4540 NONAME ABSENT - _ZThn148_N23HbProgressSliderPrivate11orientationEv @ 4541 NONAME - _ZThn148_N23HbProgressSliderPrivate15emitSliderMovedEi @ 4542 NONAME - _ZThn148_N23HbProgressSliderPrivate17emitSliderPressedEv @ 4543 NONAME - _ZThn148_N23HbProgressSliderPrivate18emitSliderReleasedEv @ 4544 NONAME - _ZThn148_N23HbProgressSliderPrivateD0Ev @ 4545 NONAME - _ZThn148_N23HbProgressSliderPrivateD1Ev @ 4546 NONAME - _ZThn148_NK23HbProgressSliderPrivate11textVisibleEv @ 4547 NONAME - _ZThn148_NK23HbProgressSliderPrivate11toolTipTextEv @ 4548 NONAME - _ZThn148_NK23HbProgressSliderPrivate12boundingRectEv @ 4549 NONAME - _ZThn148_NK23HbProgressSliderPrivate13progressValueEv @ 4550 NONAME - _ZThn148_NK23HbProgressSliderPrivate13textAlignmentEv @ 4551 NONAME - _ZThn148_NK23HbProgressSliderPrivate18invertedAppearanceEv @ 4552 NONAME - _ZThn148_NK23HbProgressSliderPrivate18parentGraphicsItemEv @ 4553 NONAME - _ZThn148_NK23HbProgressSliderPrivate20parentGraphicsWidgetEv @ 4554 NONAME - _ZThn148_NK23HbProgressSliderPrivate5styleEv @ 4555 NONAME - _ZThn148_NK23HbProgressSliderPrivate7maximumEv @ 4556 NONAME - _ZThn148_NK23HbProgressSliderPrivate7minimumEv @ 4557 NONAME + _ZThn148_N23HbProgressSliderPrivate11orientationEv @ 4541 NONAME ABSENT + _ZThn148_N23HbProgressSliderPrivate15emitSliderMovedEi @ 4542 NONAME ABSENT + _ZThn148_N23HbProgressSliderPrivate17emitSliderPressedEv @ 4543 NONAME ABSENT + _ZThn148_N23HbProgressSliderPrivate18emitSliderReleasedEv @ 4544 NONAME ABSENT + _ZThn148_N23HbProgressSliderPrivateD0Ev @ 4545 NONAME ABSENT + _ZThn148_N23HbProgressSliderPrivateD1Ev @ 4546 NONAME ABSENT + _ZThn148_NK23HbProgressSliderPrivate11textVisibleEv @ 4547 NONAME ABSENT + _ZThn148_NK23HbProgressSliderPrivate11toolTipTextEv @ 4548 NONAME ABSENT + _ZThn148_NK23HbProgressSliderPrivate12boundingRectEv @ 4549 NONAME ABSENT + _ZThn148_NK23HbProgressSliderPrivate13progressValueEv @ 4550 NONAME ABSENT + _ZThn148_NK23HbProgressSliderPrivate13textAlignmentEv @ 4551 NONAME ABSENT + _ZThn148_NK23HbProgressSliderPrivate18invertedAppearanceEv @ 4552 NONAME ABSENT + _ZThn148_NK23HbProgressSliderPrivate18parentGraphicsItemEv @ 4553 NONAME ABSENT + _ZThn148_NK23HbProgressSliderPrivate20parentGraphicsWidgetEv @ 4554 NONAME ABSENT + _ZThn148_NK23HbProgressSliderPrivate5styleEv @ 4555 NONAME ABSENT + _ZThn148_NK23HbProgressSliderPrivate7maximumEv @ 4556 NONAME ABSENT + _ZThn148_NK23HbProgressSliderPrivate7minimumEv @ 4557 NONAME ABSENT + _ZN12HbMessageBox17initPrimitiveDataEP20HbStylePrimitiveDataPK15QGraphicsObject @ 4558 NONAME + _ZN12HbMessageBox18recreatePrimitivesEv @ 4559 NONAME + _ZN16HbProgressSlider12gestureEventEP13QGestureEvent @ 4560 NONAME + _ZN30HbSelectionDialogContentWidget19_q_selectionChangedERK14QItemSelectionS2_ @ 4561 NONAME + _ZN30HbSelectionDialogContentWidget8setModelEP18QAbstractItemModel @ 4562 NONAME + _ZN31HbDeviceDialogsExtensionSymbian12SetShowLevelEP26CHbDeviceMessageBoxSymbiani @ 4563 NONAME + _ZN31HbDeviceDialogsExtensionSymbian12SetShowLevelEP30CHbDeviceProgressDialogSymbiani @ 4564 NONAME + _ZN31HbDeviceDialogsExtensionSymbian12SetShowLevelEP34CHbDeviceNotificationDialogSymbiani @ 4565 NONAME diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/devicedialogs/devicedialogs.pri --- a/src/hbwidgets/devicedialogs/devicedialogs.pri Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/devicedialogs/devicedialogs.pri Thu Sep 02 20:44:51 2010 +0300 @@ -34,6 +34,7 @@ PUBLIC_HEADERS += $$PWD/hbdevicenotificationdialogsymbian.h PUBLIC_HEADERS += $$PWD/hbdevicemessageboxsymbian.h PUBLIC_HEADERS += $$PWD/hbdeviceprogressdialogsymbian.h +RESTRICTED_HEADERS += $$PWD/hbdevicedialogsextensionsymbian_r.h PRIVATE_HEADERS += $$PWD/hbdevicenotificationdialog_p.h $$PWD/hbdeviceprogressdialog_p.h $$PWD/hbdevicemessagebox_p.h @@ -44,5 +45,6 @@ SOURCES += $$PWD/hbdevicenotificationdialogsymbian.cpp SOURCES += $$PWD/hbdevicemessageboxsymbian.cpp SOURCES += $$PWD/hbdeviceprogressdialogsymbian.cpp +SOURCES += $$PWD/hbdevicedialogsextensionsymbian.cpp } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/devicedialogs/hbdevicedialogsextensionsymbian.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbwidgets/devicedialogs/hbdevicedialogsextensionsymbian.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,125 @@ +/**************************************************************************** +** +** 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 HbWidgets 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 "hbdevicedialogsextensionsymbian_r.h" +#include "hbdevicemessageboxsymbian.h" +#include "hbdeviceprogressdialogsymbian.h" +#include "hbdevicenotificationdialogsymbian.h" + +class CHbDeviceMessageBoxPrivate; +class CHbDeviceProgressDialogSymbianPrivate; +class CHbDeviceNotificationDialogSymbianPrivate; +void SetShowLevel(CHbDeviceMessageBoxPrivate *aBox, TInt aLevel); +void SetShowLevel(CHbDeviceProgressDialogSymbianPrivate *aDialog, TInt aLevel); +void SetShowLevel(CHbDeviceNotificationDialogSymbianPrivate *aDialog, TInt aLevel); + +#define ARG_UNUSED(x) (void)x; + +/*! + \class HbDeviceDialogsExtensionSymbian + \brief HbDeviceDialogsExtensionSymbian extends property set of stock device dialogs. + + HbDeviceDialogsExtensionSymbian is a restricted API. It is intended for platform applications + to set rarely needed properties of CHbDeviceMessageBoxSymbian, CHbDeviceProgressDialogSymbian + and CHbDeviceNotificationDialogSymbian. + + Use of API functions maybe limited for applications having certain platform security + capabilities. + + \sa CHbDeviceMessageBoxSymbian, CHbDeviceProgressDialogSymbian, CHbDeviceNotificationDialogSymbian + + @alpha + @hbwidgets +*/ + +/*! + Sets a device message box to show on top of normal device-dialogs. + + \param aDialog Device message box. + \param aLevel Show level. Values are defined in HbDeviceDialogPlugin::ShowLevel. + Symbian capability swEvent is required to set level higher than + HbDeviceDialogPlugin::NormalLevel. + + \code + // Show a message box on top of device lock + const TInt KCriticalLevel = 2; + CHbDeviceMessageBoxSymbian *box = + CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EQuestion); + HbDeviceDialogsExtensionSymbian::SetShowLevel(box, KCriticalLevel); + \endcode + + \sa HbDeviceDialogPlugin::ShowLevel +*/ +EXPORT_C void HbDeviceDialogsExtensionSymbian::SetShowLevel(CHbDeviceMessageBoxSymbian *aDialog, + TInt aLevel) +{ + ::SetShowLevel(aDialog->d, aLevel); +} + +/*! + Sets a device progress dialog to show on top of normal device-dialogs. + + \param aDialog Device progress dialog. + \param aLevel Show level. Values are defined in HbDeviceDialogPlugin::ShowLevel. + Symbian capability swEvent is required to set level higher than + HbDeviceDialogPlugin::NormalLevel. + + \code + // Show a progress dialog on top of device lock + const TInt KCriticalLevel = 2; + CHbDeviceProgressDialogSymbian *dialog = CHbDeviceProgressDialogSymbian::NewL(); + HbDeviceDialogsExtensionSymbian::SetShowLevel(dialog, KCriticalLevel); + \endcode + + \sa HbDeviceDialogPlugin::ShowLevel +*/ +EXPORT_C void HbDeviceDialogsExtensionSymbian::SetShowLevel(CHbDeviceProgressDialogSymbian *aDialog, + TInt aLevel) +{ + ::SetShowLevel(aDialog->d, aLevel); +} + +/*! + Sets a device notification dialog to show on top of normal device-dialogs. + + \param aDialog Device notification dialog. + \param aLevel Show level. Values are defined in HbDeviceDialogPlugin::ShowLevel. + Symbian capability swEvent is required to set level higher than + HbDeviceDialogPlugin::NormalLevel. + + \code + // Show a notification dialog on top of device lock + const TInt KCriticalLevel = 2; + CHbDeviceNotificationDialogSymbian *dialog = CHbDeviceNotificationDialogSymbian::NewL(); + HbDeviceDialogsExtensionSymbian::SetShowLevel(dialog, KCriticalLevel); + \endcode + + \sa HbDeviceDialogPlugin::ShowLevel +*/ +EXPORT_C void HbDeviceDialogsExtensionSymbian::SetShowLevel(CHbDeviceNotificationDialogSymbian *aDialog, + TInt aLevel) +{ + ::SetShowLevel(aDialog->d, aLevel); +} diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/devicedialogs/hbdevicedialogsextensionsymbian_r.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbwidgets/devicedialogs/hbdevicedialogsextensionsymbian_r.h Thu Sep 02 20:44:51 2010 +0300 @@ -0,0 +1,46 @@ +/**************************************************************************** +** +** 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 HbWidgets 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 HBDEVICEDIALOGSEXTENSIONSYMBIAN_R_H +#define HBDEVICEDIALOGSEXTENSIONSYMBIAN_R_H + +#if defined(__SYMBIAN32__) || defined(SYMBIAN) || defined(HB_DOXYGEN) + +#include + +class CHbDeviceMessageBoxSymbian; +class CHbDeviceProgressDialogSymbian; +class CHbDeviceNotificationDialogSymbian; + +class HbDeviceDialogsExtensionSymbian +{ +public: + IMPORT_C static void SetShowLevel(CHbDeviceMessageBoxSymbian *aDialog, TInt aLevel); + IMPORT_C static void SetShowLevel(CHbDeviceProgressDialogSymbian *aDialog, TInt aLevel); + IMPORT_C static void SetShowLevel(CHbDeviceNotificationDialogSymbian *aDialog, TInt aLevel); +}; + +#endif // defined(__SYMBIAN32__) || defined(SYMBIAN) || defined(HB_DOXYGEN) +#endif // HBDEVICEDIALOGSEXTENSIONSYMBIAN_R_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.cpp --- a/src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -81,6 +81,7 @@ EIconVisible, ETimeout, EStandardButtons, + EShowLevel, EDismissPolicy, ELastIntProperty = EDismissPolicy, EFirstStringProperty, @@ -385,7 +386,7 @@ if (i == EAcceptText || i == ERejectText) { HBufC *actionData = CreateActionDataLC(property.IsNullAction(), property.StringValue()); parameter = CHbSymbianVariant::NewL(actionData, CHbSymbianVariant::EDes); - CleanupStack::PopAndDestroy(actionData); + CleanupStack::PopAndDestroy(); // actionData } else if (property.Type() == TMessageBoxProperty::EIntProperty) { TInt value = property.IntValue(); parameter = CHbSymbianVariant::NewL(&value, CHbSymbianVariant::EInt); @@ -396,7 +397,7 @@ CleanupStack::PushL(parameter); User::LeaveIfError(parameters->Add( PropertyName(static_cast(i)), parameter)); - CleanupStack::Pop(parameter); + CleanupStack::Pop(); // parameter property.SetModified(false); } } @@ -416,7 +417,7 @@ User::Leave(error); // error can be positive or negative } } - CleanupStack::PopAndDestroy(parameters); + CleanupStack::PopAndDestroy(); // parameters } // Close message box @@ -446,6 +447,7 @@ L"iconVisible", L"timeout", L"standardButtons", + L"showLevel", L"dismissPolicy", L"text", L"iconName", @@ -538,6 +540,12 @@ } } +// Set dialog show level +void SetShowLevel(CHbDeviceMessageBoxPrivate *aBox, TInt aLevel) +{ + aBox->SetPropertyValue(CHbDeviceMessageBoxPrivate::EShowLevel, aLevel); +} + /*! \class CHbDeviceMessageBoxSymbian \brief CHbDeviceMessageBoxSymbian is a Symbian implementation of HbDeviceMessageBox. @@ -763,7 +771,7 @@ CleanupStack::PushL(mboxPrivate); mboxPrivate->ConstructL(aType, aObserver); messageBox->d = mboxPrivate; - CleanupStack::Pop(2, messageBox); // mboxPrivate, messageBox + CleanupStack::Pop(2); // messageBox, mboxPrivate messageBox->SetObserver(aObserver); return messageBox; } @@ -794,7 +802,7 @@ messageBox->SetButtonTextL(ERejectButton, aRejectButtonText); } TButtonId buttonId = messageBox->ExecL(); - CleanupStack::PopAndDestroy(messageBox); + CleanupStack::PopAndDestroy(); // messageBox return buttonId; } @@ -821,7 +829,7 @@ } messageBox->SetStandardButtons(aStandardButtons); TButtonId buttonId = messageBox->ExecL(); - CleanupStack::PopAndDestroy(messageBox); + CleanupStack::PopAndDestroy(); // messageBox return buttonId; } @@ -837,7 +845,7 @@ CleanupStack::PushL(messageBox); messageBox->SetTextL(aText); messageBox->ShowL(); - CleanupStack::PopAndDestroy(messageBox); + CleanupStack::PopAndDestroy(); // messageBox } /*! @@ -852,7 +860,7 @@ CleanupStack::PushL(messageBox); messageBox->SetTextL(aText); messageBox->ShowL(); - CleanupStack::PopAndDestroy(messageBox); + CleanupStack::PopAndDestroy(); // messageBox } /*! @@ -1000,7 +1008,7 @@ */ EXPORT_C void CHbDeviceMessageBoxSymbian::SetAnimationDefinitionL(const TDesC& aAnimationDefinition) { - d->SetPropertyValueL(CHbDeviceMessageBoxPrivate::EAnimationDefinition, aAnimationDefinition); + d->SetPropertyValueL(CHbDeviceMessageBoxPrivate::EAnimationDefinition, aAnimationDefinition); } /*! @@ -1010,7 +1018,7 @@ */ EXPORT_C TPtrC CHbDeviceMessageBoxSymbian::AnimationDefinition() const { - return d->mProperties[CHbDeviceMessageBoxPrivate::EAnimationDefinition].StringValue(); + return d->mProperties[CHbDeviceMessageBoxPrivate::EAnimationDefinition].StringValue(); } /*! diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.h --- a/src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.h Thu Sep 02 20:44:51 2010 +0300 @@ -100,6 +100,7 @@ private: friend class CHbDeviceMessageBoxPrivate; + friend class HbDeviceDialogsExtensionSymbian; CHbDeviceMessageBoxSymbian(); CHbDeviceMessageBoxPrivate* d; }; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/devicedialogs/hbdevicenotificationdialog.cpp --- a/src/hbwidgets/devicedialogs/hbdevicenotificationdialog.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/devicedialogs/hbdevicenotificationdialog.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -119,8 +119,8 @@ \endcode - After this, create a HbDeviceNotificationDialog as described above and - set the definition file and the logical name of the animation: + After this, create a HbDeviceNotificationDialog as described above and + set the definition file and the logical name of the animation: \code QString animationDefinitionXML("c:\animation.axml"); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/devicedialogs/hbdevicenotificationdialogsymbian.cpp --- a/src/hbwidgets/devicedialogs/hbdevicenotificationdialogsymbian.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/devicedialogs/hbdevicenotificationdialogsymbian.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -37,6 +37,7 @@ _LIT(KPluginIdentifier, "com.nokia.hb.devicenotificationdialog/1.0"); _LIT(KKeyTitleTextWrapping, "titleTextWrapping"); _LIT(KKeyAnimationDefinition, "animationDefinition"); +_LIT(KKeyShowLevel, "showLevel"); NONSHARABLE_CLASS(CHbDeviceNotificationDialogSymbianPrivate) : public CBase, public MHbDeviceDialogObserver @@ -68,6 +69,7 @@ TBool iEnable; TInt iTimeout; + TInt iShowLevel; CHbDeviceNotificationDialogSymbian::TextWrapping iWrap; }; @@ -99,6 +101,10 @@ AddVariantL(KKeyTouchActivation, &iEnable, CHbSymbianVariant::EBool); AddVariantL(KKeyTimeOut, &iTimeout, CHbSymbianVariant::EInt); AddVariantL(KKeyTitleTextWrapping, &iWrap, CHbSymbianVariant::EInt); + if (iShowLevel) { // send only if non-default + AddVariantL(KKeyShowLevel, &iShowLevel, CHbSymbianVariant::EInt); + } + TInt error = iDeviceDialog->Show(KPluginIdentifier, *iVariantMap, this); if (error != KErrNone) { User::Leave(error); // error can be positive or negative @@ -162,6 +168,12 @@ } } +// Set dialog show level +void SetShowLevel(CHbDeviceNotificationDialogSymbianPrivate *aDialog, TInt aLevel) +{ + aDialog->iShowLevel = aLevel; +} + /*! \class MHbDeviceNotificationDialogObserver \brief MHbDeviceNotificationDialogObserver is an observer interface for observing CHbDeviceNotificationDialogSymbian. @@ -289,36 +301,36 @@ - GIF (.gif) - MNG (.mng) - - Frame animations - - There is a built-in support for GIF and MNG animations. - - Frame animations can be created by following way: - - \code - Create an animation definition file. - - - - c:\icon1.svg - c:\icon2.svg - c:\icon3.svg - - - - Create CHbDeviceNotificationDialogSymbian in a way described before and - set definition file and animation's logical name. - - _LIT(KAnimationDefinitionXML, "C:\animation.axml"); - _LIT(KLogicalIconName, "frame_anim_looping"); - - iDialog->SetAnimationDefinitionL(KAnimationDefinitionXML); - iDialog->SetIconNameL(KLogicalIconName); - iDialog->ShowL(); - \endcode - \sa HbIconAnimationManager::addDefinitionFile - \note Animation definition files must be stored to a place where they - can be accessed. + - Frame animations + + There is a built-in support for GIF and MNG animations. + + Frame animations can be created by following way: + + \code + Create an animation definition file. + + + + c:\icon1.svg + c:\icon2.svg + c:\icon3.svg + + + + Create CHbDeviceNotificationDialogSymbian in a way described before and + set definition file and animation's logical name. + + _LIT(KAnimationDefinitionXML, "C:\animation.axml"); + _LIT(KLogicalIconName, "frame_anim_looping"); + + iDialog->SetAnimationDefinitionL(KAnimationDefinitionXML); + iDialog->SetIconNameL(KLogicalIconName); + iDialog->ShowL(); + \endcode + \sa HbIconAnimationManager::addDefinitionFile + \note Animation definition files must be stored to a place where they + can be accessed. \stable \hbwidgets @@ -419,7 +431,7 @@ */ EXPORT_C void CHbDeviceNotificationDialogSymbian::SetAnimationDefinitionL(const TDesC& aAnimationDefinition) { - d->AddVariantL(KKeyAnimationDefinition, &aAnimationDefinition, CHbSymbianVariant::EDes); + d->AddVariantL(KKeyAnimationDefinition, &aAnimationDefinition, CHbSymbianVariant::EDes); } /*! diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/devicedialogs/hbdevicenotificationdialogsymbian.h --- a/src/hbwidgets/devicedialogs/hbdevicenotificationdialogsymbian.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/devicedialogs/hbdevicenotificationdialogsymbian.h Thu Sep 02 20:44:51 2010 +0300 @@ -94,6 +94,7 @@ CHbDeviceNotificationDialogSymbianPrivate* d; friend class CHbDeviceNotificationDialogSymbianPrivate; + friend class HbDeviceDialogsExtensionSymbian; }; #endif // (__SYMBIAN32__) || defined(SYMBIAN) || defined(HB_DOXYGEN) diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/devicedialogs/hbdeviceprogressdialogsymbian.cpp --- a/src/hbwidgets/devicedialogs/hbdeviceprogressdialogsymbian.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/devicedialogs/hbdeviceprogressdialogsymbian.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -38,6 +38,7 @@ _LIT(KCancelAction, "cancelAction"); _LIT(KPluginIdentifier, "com.nokia.hb.deviceprogressdialog/1.0"); _LIT(KAnimationDefinition, "animationDefinition"); +_LIT(KShowLevel, "showLevel"); NONSHARABLE_CLASS(CHbDeviceProgressDialogSymbianPrivate) : public CBase, public MHbDeviceDialogObserver @@ -80,6 +81,7 @@ RBuf iText; RBuf iIconName; RBuf iAnimationDefinition; + TInt iShowLevel; struct { RBuf iText; struct { @@ -134,6 +136,9 @@ AddVariantL(KDialogMinimum, &iMinimum, CHbSymbianVariant::EInt, iVariantMap); AddVariantL(KDialogAutoClose, &iAutoClose, CHbSymbianVariant::EBool, iVariantMap); AddVariantL(KDialogValue, &iProgressValue, CHbSymbianVariant::EInt, iVariantMap); + if (iShowLevel) { // send only if non-default + AddVariantL(KShowLevel, &iShowLevel, CHbSymbianVariant::EInt, iVariantMap); + } if (iText.Length() > 0) { @@ -153,7 +158,7 @@ iButton.iFlags.iIsNullModified = false; HBufC *actionData = CreateActionDataLC(iButton.iFlags.iIsNull, iButton.iText); AddVariantL(KCancelAction, actionData, CHbSymbianVariant::EDes, iVariantMap); - CleanupStack::PopAndDestroy(actionData); + CleanupStack::PopAndDestroy(); // actionData } iButton.iFlags.iPressed = false; TInt error = iDeviceDialog->Show(KPluginIdentifier, *iVariantMap, this); @@ -235,7 +240,7 @@ iButton.iFlags.iIsNullModified = false; HBufC *actionData = CreateActionDataLC(iButton.iFlags.iIsNull, iButton.iText); AddVariantL(KCancelAction, actionData, CHbSymbianVariant::EDes, iVariantMap); - CleanupStack::PopAndDestroy(actionData); + CleanupStack::PopAndDestroy(); // actionData } TInt error = iDeviceDialog->Update(*map); @@ -319,6 +324,12 @@ return actionData; } +// Set dialog show level +void SetShowLevel(CHbDeviceProgressDialogSymbianPrivate *aDialog, TInt aLevel) +{ + aDialog->iShowLevel = aLevel; +} + /*! \class MHbDeviceProgressDialogObserver \brief MHbDeviceProgressDialogObserver is an observer interface for observing CHbDeviceProgressDialogSymbian. @@ -402,36 +413,36 @@ - GIF (.gif) - MNG (.mng) - - Frame animations + - Frame animations - There is a built-in support for GIF and MNG animations. + There is a built-in support for GIF and MNG animations. - Frame animations can be created by following way: + Frame animations can be created by following way: - \code - Create an animation definition file. + \code + Create an animation definition file. - - - c:\icon1.svg - c:\icon2.svg - c:\icon3.svg - - + + + c:\icon1.svg + c:\icon2.svg + c:\icon3.svg + + - Create CHbDeviceProgressDialogSymbian in a way described before and - set definition file and animation's logical name. + Create CHbDeviceProgressDialogSymbian in a way described before and + set definition file and animation's logical name. - _LIT(KAnimationDefinitionXML, "C:\animation.axml"); - _LITK(KLogicalIconName, "frame_anim_looping"); + _LIT(KAnimationDefinitionXML, "C:\animation.axml"); + _LITK(KLogicalIconName, "frame_anim_looping"); - iDialog->SetAnimationDefinitionL(KAnimationDefinitionXML); - iDialog->SetIconNameL(KIconName); - iDialog->ShowL(); - \endcode - \sa HbIconAnimationManager::addDefinitionFile - \note Animation definition files must be stored to a place where they - can be accessed. + iDialog->SetAnimationDefinitionL(KAnimationDefinitionXML); + iDialog->SetIconNameL(KIconName); + iDialog->ShowL(); + \endcode + \sa HbIconAnimationManager::addDefinitionFile + \note Animation definition files must be stored to a place where they + can be accessed. \sa HbDeviceProgressDialog, HbDeviceDialog \stable @@ -711,9 +722,9 @@ \sa SetAnimationDefinitionL() */ EXPORT_C TPtrC CHbDeviceProgressDialogSymbian::AnimationDefinition() const - { - return d->iAnimationDefinition; - } + { + return d->iAnimationDefinition; + } /*! Sets progress dialog box button text. The dialog gets updated next time ShowL() or UpdateL() diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/devicedialogs/hbdeviceprogressdialogsymbian.h --- a/src/hbwidgets/devicedialogs/hbdeviceprogressdialogsymbian.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/devicedialogs/hbdeviceprogressdialogsymbian.h Thu Sep 02 20:44:51 2010 +0300 @@ -89,6 +89,7 @@ void ConstructL(TType aType); CHbDeviceProgressDialogSymbianPrivate* d; friend class CHbDeviceProgressDialogSymbianPrivate; + friend class HbDeviceDialogsExtensionSymbian; }; class MHbDeviceProgressDialogObserver diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/editors/hbabstractedit_p.cpp --- a/src/hbwidgets/editors/hbabstractedit_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/editors/hbabstractedit_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -115,7 +115,7 @@ HbEditItem(HbAbstractEdit *parent) : HbWidget(parent), edit(parent) { - setFlag(QGraphicsItem::ItemUsesExtendedStyleOption, true); + setFlag(QGraphicsItem::ItemUsesExtendedStyleOption, true); }; virtual ~HbEditItem() {}; @@ -813,7 +813,7 @@ HbStyleOption opt; q->initStyleOption(&opt); - if (qApp->style()->styleHint(QStyle::SH_RichText_FullWidthSelection, &opt, 0)) { + if (qApp->style()->styleHint(QStyle::SH_RichText_FullWidthSelection, &opt, 0)) { selection.format.setProperty(QTextFormat::FullWidthSelection, true); } ctx.selections.append(selection); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/itemviews/hbabstractitemcontainer_p.cpp --- a/src/hbwidgets/itemviews/hbabstractitemcontainer_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/itemviews/hbabstractitemcontainer_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -530,7 +530,7 @@ { Q_D(HbAbstractItemContainer); - d->q_ptr = this; + d->q_ptr = this; d->init(); } @@ -717,8 +717,8 @@ } // if items have been added/removed in the middle of the buffer, there might be items - // that can be reused at the end of the buffer. The following block will scan for - // those items and move them in correct position + // that can be reused at the end of the buffer. The following block will scan for + // those items and move them in correct position int lastUsedItem = -1; for (int indexCounter = 0; indexCounter < indexList.count(); ++indexCounter) { HbAbstractViewItem *item = d->mItems.at(indexCounter); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/itemviews/hbabstractitemcontainer_p_p.h --- a/src/hbwidgets/itemviews/hbabstractitemcontainer_p_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/itemviews/hbabstractitemcontainer_p_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -93,7 +93,7 @@ void restoreItemPosition(HbAbstractViewItem *item, const QPointF &position); void insertItem(HbAbstractViewItem *item, int pos, const QModelIndex &index, bool animate); - + inline HbModelIterator *modelIterator() const; inline void adjustContent() const; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/itemviews/hbabstractitemview.cpp --- a/src/hbwidgets/itemviews/hbabstractitemview.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/itemviews/hbabstractitemview.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -197,7 +197,7 @@ \var HbAbstractItemView::Disappear Animation related to item removal. Disable this animation in cases you expect many model items to disappear, - for example in cases like filtering or removal of a data source, and you do not wish to see animations. + for example in cases like filtering or removal of a data source, and you do not wish to see animations. */ /*! diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/itemviews/hbabstractitemview_p.cpp --- a/src/hbwidgets/itemviews/hbabstractitemview_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/itemviews/hbabstractitemview_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -498,7 +498,7 @@ When orientation switch occurs, 1) or 2) is applied to view after layout switch: 1) if last item is wholly visible, it will be visible 2) if last item is not fully visible, the first fully visible item before layout switch is made the - first fully visible item + first fully visible item */ void HbAbstractItemViewPrivate::saveIndexMadeVisibleAfterMetricsChange() { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/itemviews/hbabstractviewitem.cpp --- a/src/hbwidgets/itemviews/hbabstractviewitem.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/itemviews/hbabstractviewitem.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -68,7 +68,7 @@ The HbAbstractViewItem class provides an item that is used by HbAbstractItemView class to visualize content within single model index. By default HbAbstractViewItem supports QString and QStringList stored into Qt::DisplayRole role and QIcon, HbIcon or list of them in QVariantList stored into - Qt::DecoratorRole role. + Qt::DecoratorRole role. This class is provided mainly for customization purposes but it also acts as a default item prototype inside HbAbstractItemView. See HbAbstractItemView how to set customized class as a item prototype. @@ -428,63 +428,80 @@ if (!child->isVisible() || child == mNonCachableItem || child == mFrontPixmapPainter || child == mBackPixmapPainter) { continue; } - + if (!itemPainted && child->zValue() >= 0) { - painter->save(); option->exposedRect = q->boundingRect(); q->paint(painter, option, 0); - painter->restore(); itemPainted = true; } - painter->save(); if (child == mFrame) { + QPainter::CompositionMode mode = painter->compositionMode(); painter->setCompositionMode(QPainter::CompositionMode_Source); + painter->translate(child->pos()); + option->exposedRect = child->boundingRect(); + child->paint(painter, option, 0); + painter->setCompositionMode(mode); + painter->translate(-child->pos()); + continue; } - - painter->translate(child->pos()); - - option->exposedRect = child->boundingRect(); - child->paint(painter, option, 0); - - painter->restore(); + paintChildItemsRecursively(child,painter,option); } - mInPaintItems = false; } +void HbAbstractViewItemPrivate::paintChildItemsRecursively(QGraphicsItem *child, QPainter *painter,QStyleOptionGraphicsItem *option) +{ + if (!child->isVisible()) + return; + int i = 0; + QList children = child->childItems(); + int count(children.size()); + painter->translate(child->pos()); + // Draw children behind + for (i = 0; i < count; ++i) { + QGraphicsItem *subChild = children.at(i); + if (!(subChild->flags() & QGraphicsItem::ItemStacksBehindParent)) + break; + paintChildItemsRecursively(subChild, painter,option); + } + option->exposedRect = child->boundingRect(); + child->paint(painter, option, 0); + // Draw children in front + for (; i < count; ++i) { + QGraphicsItem *subChild = children.at(i); + paintChildItemsRecursively(subChild, painter,option); + } + painter->translate(-child->pos()); +} + + void HbAbstractViewItemPrivate::setChildFlags(QGraphicsItem *child, bool pixmapCacheEnabled) { - Q_Q(HbAbstractViewItem); + QGraphicsItem::GraphicsItemFlags itemFlags = child->flags(); + if (pixmapCacheEnabled) { + itemFlags |= QGraphicsItem::ItemHasNoContents; + itemFlags |= QGraphicsItem::ItemIgnoresParentOpacity; + } + else { + itemFlags &= ~QGraphicsItem::ItemHasNoContents; + itemFlags &= ~QGraphicsItem::ItemIgnoresParentOpacity; + } + child->setFlags(itemFlags); + foreach (QGraphicsItem *subChild, child->childItems()) { + setChildFlags(subChild,pixmapCacheEnabled); + } +} - if (child) { - QGraphicsItem::GraphicsItemFlags itemFlags = child->flags(); - if (pixmapCacheEnabled) { - itemFlags |= QGraphicsItem::ItemHasNoContents; - itemFlags |= QGraphicsItem::ItemIgnoresParentOpacity; - } - else { - itemFlags &= ~QGraphicsItem::ItemHasNoContents; - itemFlags &= ~QGraphicsItem::ItemIgnoresParentOpacity; - } - child->setFlags(itemFlags); - } else { - foreach (QGraphicsItem *child, q->childItems()) { - if (child == mNonCachableItem || child == mFrontPixmapPainter || child == mBackPixmapPainter) { - continue; - } - - QGraphicsItem::GraphicsItemFlags itemFlags = child->flags(); - if (pixmapCacheEnabled) { - itemFlags |= QGraphicsItem::ItemHasNoContents; - itemFlags |= QGraphicsItem::ItemIgnoresParentOpacity; - } - else { - itemFlags &= ~QGraphicsItem::ItemHasNoContents; - itemFlags &= ~QGraphicsItem::ItemIgnoresParentOpacity; - } - child->setFlags(itemFlags); +void HbAbstractViewItemPrivate::setChildFlagRecursively(bool pixmapCacheEnabled) +{ + Q_Q(HbAbstractViewItem); + foreach (QGraphicsItem *subChild, q->childItems()) { + if (subChild == mNonCachableItem || subChild == mFrontPixmapPainter || + subChild == mBackPixmapPainter) { + continue; } + setChildFlags(subChild, pixmapCacheEnabled); } } @@ -512,20 +529,10 @@ void HbAbstractViewItemPrivate::releasePixmaps() { - if (mFrontCachePixmap) { - delete mFrontCachePixmap; - mFrontCachePixmap = 0; - } - if (mFrontPixmapPainter) { mFrontPixmapPainter->setPixmap(0); } - if (mBackCachePixmap) { - delete mBackCachePixmap; - mBackCachePixmap = 0; - } - if (mBackPixmapPainter) { mBackPixmapPainter->setPixmap(0); } @@ -587,8 +594,6 @@ if (d && !d->isPrototype()) { sd->mCloneItems.removeOne(this); } - delete d->mFrontCachePixmap; - delete d->mBackCachePixmap; } /*! @@ -774,11 +779,7 @@ { switch (e->type()) { case QEvent::GraphicsSceneResize: { - Q_D(HbAbstractViewItem ); - d->releasePixmaps(); - - updatePixmapCache(); - + Q_D(HbAbstractViewItem ); QGraphicsSceneResizeEvent *resizeEvent = static_cast(e); if (d->mFrontPixmapPainter) { @@ -852,27 +853,22 @@ QVariant HbAbstractViewItem::itemChange(GraphicsItemChange change, const QVariant &value) { switch (change) { - case ItemTransformHasChanged: { - Q_D(HbAbstractViewItem); - + case ItemTransformHasChanged: { QGraphicsLayoutItem *parentLayoutItem = this->parentLayoutItem(); if (parentLayoutItem && parentLayoutItem->isLayout()) { QGraphicsLayout *parentLayout = static_cast(parentLayoutItem); parentLayout->invalidate(); } - d->releasePixmaps(); - - updatePixmapCache(); break; } - case ItemEnabledHasChanged: { + case ItemEnabledHasChanged: { updateChildItems(); break; } - case ItemVisibleHasChanged: { + case ItemVisibleHasChanged: { Q_D(HbAbstractViewItem); if (!value.toBool() && d->usePixmapCache()) { - d->setChildFlags(0, false); + d->setChildFlagRecursively(false); d->releasePixmaps(); d->mResetPixmapCache = true; } @@ -885,8 +881,8 @@ } break; } - default: - break; + default: + break; } return HbWidget::itemChange(change, value); @@ -956,7 +952,7 @@ if (d->mFocusItem) { HbStylePrivate::updatePrimitive(d->mFocusItem, HbStylePrivate::P_ItemViewItem_focus, d->mSharedData->mStyleOption); } - + updatePixmapCache(); } @@ -1242,10 +1238,6 @@ return; } - if (d->polished && !d->repolishOutstanding && !d->mRepolishRequested) { - return; - } - if (sd->mItemView) { setProperty("layoutName", sd->mItemView->layoutName()); } @@ -1348,7 +1340,6 @@ Q_UNUSED(widget); Q_D(HbAbstractViewItem); - if (!d->mInPaintItems) { bool usePixmapCache = d->usePixmapCache(); @@ -1356,12 +1347,16 @@ QRectF deviceBounds = painter->worldTransform().mapRect(boundingRect()); QRect deviceRect = deviceBounds.toRect().adjusted(-1, -1, 1, 1); + if (deviceRect.size() != d->mFrontPixmapPainter->pixmapSize()) { + d->mResetPixmapCache = true; + d->releasePixmaps(); + } + if (d->mResetPixmapCache) { - if (!d->mFrontCachePixmap) { - d->setChildFlags(0, true); - - d->mFrontCachePixmap = new QPixmap(deviceRect.size()); - d->mFrontPixmapPainter->setPixmap(d->mFrontCachePixmap); + if (!d->mFrontPixmapPainter->pixmap()) { + d->setChildFlagRecursively(true); + QPixmap *pixmap = new QPixmap(deviceRect.size()); + d->mFrontPixmapPainter->setPixmap(pixmap); } // Construct an item-to-pixmap transform. @@ -1370,14 +1365,14 @@ if (!p.isNull()) itemToPixmap *= QTransform::fromTranslate(-p.x(), -p.y()); - d->updatePixmap(d->mFrontCachePixmap, painter, itemToPixmap, option, d->mNonCachableItem, 0); + d->updatePixmap(d->mFrontPixmapPainter->pixmap(), painter, itemToPixmap, option, d->mNonCachableItem, 0); if (d->mNonCachableItem) { - if (!d->mBackCachePixmap) { - d->mBackCachePixmap = new QPixmap(deviceRect.size()); + if (!d->mBackPixmapPainter->pixmap()) { + QPixmap *pixmap = new QPixmap(deviceRect.size()); + d->mBackPixmapPainter->setPixmap(pixmap); } - d->mBackPixmapPainter->setPixmap(d->mBackCachePixmap); - d->updatePixmap(d->mBackCachePixmap, painter, itemToPixmap, option, 0, d->mNonCachableItem); + d->updatePixmap(d->mBackPixmapPainter->pixmap(), painter, itemToPixmap, option, 0, d->mNonCachableItem); } else if (d->mBackPixmapPainter) { d->mBackPixmapPainter->setPixmap(0); } @@ -1393,9 +1388,8 @@ d->mFrontPixmapPainter->setDeviceRect(deviceRect); } } else { - if (d->mFrontCachePixmap) { - d->setChildFlags(0, false); - + if (d->mFrontPixmapPainter->pixmap()) { + d->setChildFlagRecursively(false); d->releasePixmaps(); } } @@ -1412,7 +1406,7 @@ { Q_D(HbAbstractViewItem); - if (d->usePixmapCache()) { + if (!d->mResetPixmapCache && d->usePixmapCache()) { d->mResetPixmapCache = true; update(); } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/itemviews/hbabstractviewitem.h --- a/src/hbwidgets/itemviews/hbabstractviewitem.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/itemviews/hbabstractviewitem.h Thu Sep 02 20:44:51 2010 +0300 @@ -119,7 +119,7 @@ virtual void changeEvent(QEvent *event); protected slots: - + void updatePixmapCache(); private: diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/itemviews/hbabstractviewitem_p.h --- a/src/hbwidgets/itemviews/hbabstractviewitem_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/itemviews/hbabstractviewitem_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -61,6 +61,11 @@ setZValue(zValue); } + ~HbViewItemPixmapPainter() + { + delete mPixmap; + } + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) { Q_UNUSED(option); @@ -83,17 +88,25 @@ void setPixmap(QPixmap *pixmap) { - if (pixmap) { - if (!mPixmap) { - setFlag(QGraphicsItem::ItemHasNoContents, false); + if (pixmap != mPixmap) { + if (pixmap) { + if (!mPixmap) { + setFlag(QGraphicsItem::ItemHasNoContents, false); + } + } else { + if (mPixmap) { + setFlag(QGraphicsItem::ItemHasNoContents, true); + } } - } else { - if (mPixmap) { - setFlag(QGraphicsItem::ItemHasNoContents, true); - } + + delete mPixmap; + mPixmap = pixmap; } + } - mPixmap = pixmap; + inline QPixmap *pixmap() const + { + return mPixmap; } void setDeviceRect(const QRect &deviceRect) { @@ -105,6 +118,11 @@ mBoundingRect = QRectF(QPointF(), size); } + inline QSize pixmapSize() const + { + return mDeviceRect.size(); + } + private: QPixmap *mPixmap; @@ -189,8 +207,6 @@ mSharedData(shared), mBackPixmapPainter(0), mFrontPixmapPainter(0), - mBackCachePixmap(0), - mFrontCachePixmap(0), mInPaintItems(false), mNonCachableItem(0), mResetPixmapCache(true) @@ -218,8 +234,6 @@ mSharedData(source.mSharedData), mBackPixmapPainter(0), mFrontPixmapPainter(0), - mBackCachePixmap(0), - mFrontCachePixmap(0), mInPaintItems(false), mNonCachableItem(source.mNonCachableItem), mResetPixmapCache(true) @@ -244,8 +258,6 @@ mMultiSelectionTouchArea = 0; mBackPixmapPainter = 0; mFrontPixmapPainter = 0; - mBackCachePixmap = 0; - mFrontCachePixmap = 0; mInPaintItems = false; mNonCachableItem = source.mNonCachableItem; mResetPixmapCache = true; @@ -278,8 +290,10 @@ void setPressed(bool pressed, bool animate); void paintItems(QPainter *painter, QStyleOptionGraphicsItem *option, QGraphicsItem *startItem, QGraphicsItem *endItem); + void paintChildItemsRecursively(QGraphicsItem *child, QPainter *painter,QStyleOptionGraphicsItem *option); void setChildFlags(QGraphicsItem *child, bool pixmapCacheEnabled); + void setChildFlagRecursively(bool pixmapCacheEnabled); inline bool usePixmapCache() const; @@ -321,9 +335,6 @@ HbViewItemPixmapPainter *mBackPixmapPainter; HbViewItemPixmapPainter *mFrontPixmapPainter; - QPixmap *mBackCachePixmap; - QPixmap *mFrontCachePixmap; - bool mInPaintItems; QGraphicsItem *mNonCachableItem; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/itemviews/hbdatepickerview_p.cpp --- a/src/hbwidgets/itemviews/hbdatepickerview_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/itemviews/hbdatepickerview_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -631,7 +631,7 @@ return; } Q_Q(HbDatePickerView); - mContainer->layout()->activate();//call this to get proper item; + mContainer->layout()->activate();//call this to get proper item; slectItemAt(q->boundingRect().center(),q); } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/itemviews/hbgridlayout_p_p.cpp --- a/src/hbwidgets/itemviews/hbgridlayout_p_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/itemviews/hbgridlayout_p_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -449,9 +449,9 @@ QRectF extRect(data->startScenePos, data->item->boundingRect().size()); HbEffect::start(data->item, "gridviewitem", "reposition", q_ptr, "effectFinished", QVariant(), extRect); } else { - data->startDelay -= ANIMATION_DELAY_RESOLUTION; + data->startDelay -= ANIMATION_DELAY_RESOLUTION; stopTimer = false; - } + } } else { QPointF delta = data->startPos - data->item->pos(); data->item->setTransform(QTransform::fromTranslate(delta.x(), delta.y()), false); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/itemviews/hbgridview.cpp --- a/src/hbwidgets/itemviews/hbgridview.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/itemviews/hbgridview.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -120,11 +120,11 @@ { Q_D(HbGridView); - d->mVisibleIndex = d->indexInTheCenter(); + d->mVisibleIndex = d->firstFullyVisibleIndex(); d->itemContainer()->setRowCount(rowCount); - scrollTo(d->mVisibleIndex, HbAbstractItemView::PositionAtCenter); + scrollTo(d->mVisibleIndex, HbAbstractItemView::PositionAtTop); } /*! @@ -147,11 +147,11 @@ { Q_D(HbGridView); - d->mVisibleIndex = d->indexInTheCenter(); + d->mVisibleIndex = d->firstFullyVisibleIndex(); d->itemContainer()->setColumnCount(columnCount); - scrollTo(d->mVisibleIndex, HbAbstractItemView::PositionAtCenter); + scrollTo(d->mVisibleIndex, HbAbstractItemView::PositionAtTop); } @@ -279,7 +279,7 @@ void HbGridView::orientationAboutToBeChanged() { Q_D(HbGridView); - d->mVisibleIndex = d->indexInTheCenter(); + d->mVisibleIndex = d->firstFullyVisibleIndex(); } /*! @@ -291,10 +291,21 @@ d->mContainer->setPos(0,0); if (d->mSwapDimensionsOnOrientationChange) { d->itemContainer()->orientationChanged(newOrientation); + int indexPosition = d->mModelIterator->indexPosition(d->mVisibleIndex); + int columnsCount = 0; + if (d->mScrollDirections == Qt::Vertical) { + columnsCount = columnCount(); + } else { + columnsCount = rowCount(); + } + int remainder = indexPosition % columnsCount; + if (remainder > columnsCount / 2) { + d->mVisibleIndex = d->mModelIterator->index(indexPosition + columnsCount - remainder); + } } // abstract part is enough - container update buffer - HbAbstractItemView::scrollTo(d->mVisibleIndex, HbAbstractItemView::PositionAtCenter); + HbAbstractItemView::scrollTo(d->mVisibleIndex, HbAbstractItemView::PositionAtTop); d->mVisibleIndex = QModelIndex(); } @@ -395,13 +406,12 @@ { Q_D(HbGridView); // scroll direction changed, calculations need to be done on old value - d->mVisibleIndex = d->indexInTheCenter((d->mScrollDirections == Qt::Vertical) - ? Qt::Horizontal : Qt::Vertical); + d->mVisibleIndex = d->firstFullyVisibleIndex(); d->mContainer->setPos(0,0); d->itemContainer()->scrollDirectionChanged(scrollDirection); // abstract part is enough - container update buffer - HbAbstractItemView::scrollTo(d->mVisibleIndex, HbAbstractItemView::PositionAtCenter); + HbAbstractItemView::scrollTo(d->mVisibleIndex, HbAbstractItemView::PositionAtTop); d->mVisibleIndex = QModelIndex(); } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/itemviews/hbgridview_p.cpp --- a/src/hbwidgets/itemviews/hbgridview_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/itemviews/hbgridview_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -223,41 +223,9 @@ } } -QModelIndex HbGridViewPrivate::indexInTheCenter(Qt::Orientations scrollDirection) const +QModelIndex HbGridViewPrivate::firstFullyVisibleIndex() const { - Q_Q(const HbGridView); - QModelIndex centerViewModelIndex; // nearest to center of the screen - if (!mContainer->items().isEmpty()) { - qreal centerPos; - HbGridItemContainer *container = itemContainer(); - if (scrollDirection == Qt::Vertical) { - // calculating row: - centerPos = -container->pos().y() + q->boundingRect().height() / 2 - // take rather item that is just above of view center instead of bottom one - - container->viewLayout()->effectiveSizeHint(Qt::MinimumSize).height() / 2; - // calculate item row - centerPos /= container->viewLayout()->effectiveSizeHint(Qt::MinimumSize).height(); - //calculate item index - centerPos *= itemContainer()->columnCount(); - // go to center column - centerPos += itemContainer()->columnCount() / 2; - } else { - // calculating row: - centerPos = -container->pos().x() + q->boundingRect().width() / 2 - // take rather item that is just on the left of view center instead of right one - - container->viewLayout()->effectiveSizeHint(Qt::MinimumSize).width() / 2; - // calculate buffer row - centerPos /= container->viewLayout()->effectiveSizeHint(Qt::MinimumSize).width(); - //calculate item index - centerPos *= itemContainer()->rowCount(); - // go to center row - centerPos += itemContainer()->rowCount() / 2; - } - int centerIndex = qRound(centerPos); - if (centerIndex >= container->items().size()) { - centerIndex = container->items().size() / 2; - } - centerViewModelIndex = container->items().at(centerIndex)->modelIndex(); - } - return centerViewModelIndex; + QModelIndex first, last; + mContainer->firstAndLastVisibleModelIndex(first, last, true); + return first; } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/itemviews/hbgridview_p.h --- a/src/hbwidgets/itemviews/hbgridview_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/itemviews/hbgridview_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -59,8 +59,7 @@ inline qreal getScrollDirectionContainerPos() const; inline qreal getScrollDirectionItemSize() const; - inline QModelIndex indexInTheCenter() const; - QModelIndex indexInTheCenter(Qt::Orientations scrollDirection) const; + QModelIndex firstFullyVisibleIndex() const; public: bool mIconVisible; @@ -119,9 +118,4 @@ : mContainer->items().first()->size().width(); } -QModelIndex HbGridViewPrivate::indexInTheCenter() const -{ - return indexInTheCenter(mScrollDirections); -} - #endif /*HBGRIDVIEW_P_H*/ diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/itemviews/hblistitemcontainer_p.cpp --- a/src/hbwidgets/itemviews/hblistitemcontainer_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/itemviews/hblistitemcontainer_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -254,7 +254,7 @@ /*! Sets the modelIndexes of \a count container items starting from item at \a containerStartRow row of the container - to model's indexes starting from \a modelStartRow + to model's indexes starting from \a modelStartRow */ void HbListItemContainer::setItemModelIndexes(int containerStartRow, int modelStartRow, int count) { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/itemviews/hblistlayout_p.cpp --- a/src/hbwidgets/itemviews/hblistlayout_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/itemviews/hblistlayout_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -258,9 +258,9 @@ } /*! - \reimp - - Invalidates the smallest item cache. + \reimp + + Invalidates the smallest item cache. */ void HbListLayout::invalidate() { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/itemviews/hblistview_p.cpp --- a/src/hbwidgets/itemviews/hblistview_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/itemviews/hblistview_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -250,7 +250,7 @@ } } case Qt::GestureFinished: - case Qt::GestureCanceled: { + case Qt::GestureCanceled: { if (arrangeModeEnabled && mDraggedItem) { QObject::disconnect(q, SIGNAL(scrollPositionChanged(QPointF)), q, SLOT(scrolling(QPointF))); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/itemviews/hblistviewitem.cpp --- a/src/hbwidgets/itemviews/hblistviewitem.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/itemviews/hblistviewitem.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -579,7 +579,7 @@ /*! Returns secondary text item maximum and minimum row counts. - The default maximum row count is 1 and minimum row count is 1. + The default maximum row count is 1 and minimum row count is 1. \note This function does not return values from .css although they were effective. diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/itemviews/hbradiobuttonlist.cpp --- a/src/hbwidgets/itemviews/hbradiobuttonlist.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/itemviews/hbradiobuttonlist.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -126,14 +126,12 @@ QModelIndex mCurrentIndex; //Note that this is not the same as d->mHitItem HbRadioButtonList::PreviewMode mPreviewMode; - bool mPreviewGoingOn; bool mStartUp; }; HbRadioButtonListPrivate::HbRadioButtonListPrivate() : HbListViewPrivate(), mPreviewMode(HbRadioButtonList::NoPreview), - mPreviewGoingOn(false), mStartUp(true) { } @@ -314,7 +312,26 @@ Q_D( HbRadioButtonList ); if(d->mPreviewMode == HbRadioButtonList::Preview && d->mCurrentIndex != modelIndex){ - QTimer::singleShot(HB_RADIOBUTTONLIST_PREVIEW_TIMER, this, SLOT(_q_itemPreviewTimerExpired())); + QTimer::singleShot(HB_RADIOBUTTONLIST_PREVIEW_TIMER, this, SLOT(_q_itemPreviewTimerExpired())); + QModelIndexList selected; + + if (d->mCurrentIndex.isValid()) { + selected.append(d->mCurrentIndex); + } else { + selected = d->mSelectionModel->selectedIndexes(); + } + int count = selected.count(); + for (int i=0; isetCheckState(Qt::Unchecked); + } + } + + HbAbstractViewItem *item = itemByIndex(modelIndex); + if (item) { + itemByIndex(modelIndex)->setCheckState(Qt::Checked); + } d->mCurrentIndex=modelIndex; }else { //Now we let the activate signal go to the application @@ -326,25 +343,6 @@ /*! \reimp */ -void HbRadioButtonList::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) -{ - Q_D(HbRadioButtonList); - if(d->mPreviewMode == HbRadioButtonList::Preview ){ - HbAbstractViewItem *hitItem = d->itemAt(event->scenePos()); - if (hitItem){ - if (hitItem->modelIndex() == d->mCurrentIndex) { - d->mPreviewGoingOn=false; - } else { - d->mPreviewGoingOn=true; - } - } - } - HbListView::mouseReleaseEvent(event); -} - -/*! - \reimp -*/ QItemSelectionModel::SelectionFlags HbRadioButtonList::selectionCommand(const HbAbstractViewItem *item, const QEvent *event) { @@ -355,7 +353,7 @@ || event->type() != QEvent::GraphicsSceneMouseRelease){ return QItemSelectionModel::NoUpdate; } else { - if(d->mPreviewGoingOn==true) { + if(d->mPreviewMode == HbRadioButtonList::Preview && d->mCurrentIndex != item->modelIndex()){ return QItemSelectionModel::NoUpdate; } else { return QItemSelectionModel::ClearAndSelect; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/itemviews/hbradiobuttonlist.h --- a/src/hbwidgets/itemviews/hbradiobuttonlist.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/itemviews/hbradiobuttonlist.h Thu Sep 02 20:44:51 2010 +0300 @@ -82,7 +82,6 @@ HbRadioButtonList(HbRadioButtonListPrivate &dd, HbAbstractItemContainer *container, QGraphicsItem *parent); void emitActivated(const QModelIndex &modelIndex); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); QItemSelectionModel::SelectionFlags selectionCommand( const HbAbstractViewItem *item, const QEvent *event); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/itemviews/hbtreeitemcontainer_p.cpp --- a/src/hbwidgets/itemviews/hbtreeitemcontainer_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/itemviews/hbtreeitemcontainer_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -565,6 +565,7 @@ newPos.setY(newPos.y() - item->preferredHeight()); setPos(newPos); } + d->adjustContent(); } else { item->deleteLater(); } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/itemviews/hbtreeitemcontainer_p.h --- a/src/hbwidgets/itemviews/hbtreeitemcontainer_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/itemviews/hbtreeitemcontainer_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -65,7 +65,7 @@ virtual HbAbstractViewItem *createDefaultPrototype() const; virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const; - + protected slots: void animationFinished(const HbEffect::EffectStatus &status); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/itemviews/hbtreelayout_p.cpp --- a/src/hbwidgets/itemviews/hbtreelayout_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/itemviews/hbtreelayout_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -315,9 +315,9 @@ } /*! - \reimp - - Invalidates smallest item height cache. + \reimp + + Invalidates smallest item height cache. */ void HbTreeLayout::invalidate() { diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/itemviews/hbtreeviewitem.cpp --- a/src/hbwidgets/itemviews/hbtreeviewitem.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/itemviews/hbtreeviewitem.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -288,7 +288,7 @@ if (d->mExpanded != expanded) { d->mExpanded = expanded; - if (sd->mItemView != 0) { + if (sd->mItemView != 0) { HbTreeView *treeView = qobject_cast(sd->mItemView); if (treeView) { treeView->setExpanded(this->modelIndex(), expanded); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/popups/hbcolorgridviewitem.cpp --- a/src/hbwidgets/popups/hbcolorgridviewitem.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/popups/hbcolorgridviewitem.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -149,7 +149,7 @@ void HbColorGridViewItemPrivate::updateChildItems() { createPrimitives(); - updatePrimitives(); + updatePrimitives(); } HbColorGridViewItem::HbColorGridViewItem(QGraphicsItem *parent) : diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/popups/hbmessagebox.cpp --- a/src/hbwidgets/popups/hbmessagebox.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/popups/hbmessagebox.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -39,6 +39,8 @@ #include #include #include +#include +#include #ifdef Q_OS_SYMBIAN #include @@ -50,12 +52,11 @@ { Q_OBJECT public: - HbLabel *mTextEdit; HbMessageBoxWidget(QGraphicsItem* parent =0):HbLabel(parent){ setTextWrapping(Hb::TextWordWrap); } HbMessageBoxWidget(const QString& text, QGraphicsItem *parent=0):HbLabel(text, parent){ - HbStyle::setItemName(this, "text"); + HbStyle::setItemName(this, "text"); } }; class HbMessageBoxScrollArea : public HbScrollArea @@ -85,17 +86,16 @@ Q_OBJECT public: HbMessageBoxPrivate *d; - QGraphicsItem *mIconItem; + QGraphicsObject *mIconItem; HbMessageBoxScrollArea *mScrollArea; HbMessageBoxContentWidget(HbMessageBoxPrivate *priv, QGraphicsItem* parent =0) : HbWidget(parent),d(priv),mIconItem(0),mScrollArea(0) { mScrollArea = new HbMessageBoxScrollArea(this); - mIconItem = HbStylePrivate::createPrimitive(HbStylePrivate::P_MessageBox_icon, this); + mIconItem = style()->createPrimitive(HbStyle::PT_IconItem, "icon", this); setProperty("hasIcon",true); HbStyle::setItemName(mScrollArea, "scrollArea"); - HbStyle::setItemName(mIconItem, "icon"); } void triggerPolish() @@ -367,6 +367,44 @@ option->messageBoxType = d->mMessageBoxType; } +void HbMessageBox::initPrimitiveData(HbStylePrimitiveData *primitiveData, const QGraphicsObject *primitive) +{ + Q_D(HbMessageBox); + HbWidgetBase::initPrimitiveData(primitiveData, primitive); + QString itemName = HbStyle::itemName(primitive); + if (itemName == QLatin1String("icon")) { + HbStyleIconPrimitiveData *data = hbstyleprimitivedata_cast(primitiveData); + data->icon = icon(); + + if (data->icon.value().isNull()) { + switch (d->mMessageBoxType) { + case HbStyleOptionMessageBox::MessageTypeInformation: + data->icon = HbIcon(QLatin1String("qtg_large_info")); + break; + case HbStyleOptionMessageBox::MessageTypeQuestion: + data->icon = HbIcon(QLatin1String("qtg_large_help")); + break; + case HbStyleOptionMessageBox::MessageTypeWarning: + data->icon = HbIcon(QLatin1String("qtg_large_warning")); + break; + default: + break; + } + } + } +} + +void HbMessageBox::recreatePrimitives() +{ + Q_D(HbMessageBox); + if (d->mMessageBoxContentWidget->mIconItem) { + delete d->mMessageBoxContentWidget->mIconItem; + d->mMessageBoxContentWidget->mIconItem = 0; + d->mMessageBoxContentWidget->mIconItem = style()->createPrimitive(HbStyle::PT_IconItem, "icon",d->mMessageBoxContentWidget); + d->mMessageBoxContentWidget->setProperty("hasIcon",true); + } +} + /*! \reimp */ @@ -374,11 +412,13 @@ { Q_D(HbMessageBox); HbDialog::updatePrimitives(); - HbStyleOptionMessageBox option; - initStyleOption(&option); + if (d->mMessageBoxContentWidget->mIconItem) { - HbStylePrivate::updatePrimitive(d->mMessageBoxContentWidget->mIconItem, HbStylePrivate::P_MessageBox_icon, &option); + HbStyleIconPrimitiveData data; + initPrimitiveData(&data, d->mMessageBoxContentWidget->mIconItem); + style()->updatePrimitive(d->mMessageBoxContentWidget->mIconItem, &data, this); } + } /*! @@ -426,16 +466,15 @@ if (icon != d->mIcon){ d->mIcon = icon; if (d->mMessageBoxContentWidget->mIconItem) { - HbStyleOptionMessageBox option; - initStyleOption(&option); - HbStylePrivate::updatePrimitive(d->mMessageBoxContentWidget->mIconItem, HbStylePrivate::P_MessageBox_icon, &option); + HbStyleIconPrimitiveData data; + initPrimitiveData(&data, d->mMessageBoxContentWidget->mIconItem); + style()->updatePrimitive(d->mMessageBoxContentWidget->mIconItem, &data, this); } if(iconVisible() ) { d->mMessageBoxContentWidget->mIconItem->show(); d->mMessageBoxContentWidget->setProperty("hasIcon",true); } } - } /*! diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/popups/hbmessagebox.h --- a/src/hbwidgets/popups/hbmessagebox.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/popups/hbmessagebox.h Thu Sep 02 20:44:51 2010 +0300 @@ -139,11 +139,13 @@ QGraphicsItem *parent = 0 ); public slots: + void recreatePrimitives(); void updatePrimitives(); protected: HbMessageBox(HbMessageBoxPrivate &dd, QGraphicsItem *parent); void initStyleOption(HbStyleOptionMessageBox *option) const; + void initPrimitiveData(HbStylePrimitiveData *primitiveData, const QGraphicsObject *primitive); private: Q_PRIVATE_SLOT(d_func(), void _q_buttonClicked()) diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/popups/hbmessagebox_p.h --- a/src/hbwidgets/popups/hbmessagebox_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/popups/hbmessagebox_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -41,14 +41,14 @@ ~HbMessageBoxPrivate(); void init(); - void _q_appearEffectEnded(HbEffect::EffectStatus status); + void _q_appearEffectEnded(HbEffect::EffectStatus status); HbIcon mIcon; HbMessageBoxContentWidget *mMessageBoxContentWidget; HbMessageBox::MessageBoxType mMessageBoxType; - bool mIconVisible; + bool mIconVisible; QMap mActionList; HbMessageBox::StandardButtons mStandardButtons; - QString mBoxText; + QString mBoxText; public slots: void _q_buttonClicked(); }; diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/popups/hbnotificationdialog.cpp --- a/src/hbwidgets/popups/hbnotificationdialog.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/popups/hbnotificationdialog.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -104,7 +104,7 @@ HbNotificationDialog is a concrete class. For the content, you can use the default content widgets which provides two rows of text (title spanning both lines, or title and text) and optionally an icon. - You can use the default content widget by invoking the HbNotificationDialog with its + You can use the default content widget by invoking the HbNotificationDialog with its static launch-methods or by using the methods setText(), setTitle() and setIcon(). Alternatively, you can create a separate widget, and set it to the dialog with the inherited method diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/popups/hbselectiondialog.h --- a/src/hbwidgets/popups/hbselectiondialog.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/popups/hbselectiondialog.h Thu Sep 02 20:44:51 2010 +0300 @@ -41,30 +41,30 @@ class HB_WIDGETS_EXPORT HbSelectionDialog : public HbDialog { - Q_OBJECT + Q_OBJECT Q_PROPERTY(HbAbstractItemView::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode) Q_PROPERTY(QStringList items READ stringItems WRITE setStringItems) Q_PROPERTY(QList selectedItems READ selectedItems WRITE setSelectedItems) public: - enum { Type = Hb::ItemType_SelectionDialog }; - int type() const { return Type; } - - explicit HbSelectionDialog(QGraphicsItem* parent=0); + enum { Type = Hb::ItemType_SelectionDialog }; + int type() const { return Type; } + + explicit HbSelectionDialog(QGraphicsItem* parent=0); ~HbSelectionDialog(); void setSelectionMode(HbAbstractItemView::SelectionMode mode); HbAbstractItemView::SelectionMode selectionMode() const; - void setStringItems(const QStringList &items,int currentIndex = 0); + void setStringItems(const QStringList &items,int currentIndex = 0); QStringList stringItems() const; - + void setWidgetItems(const QList &items,bool transferOwnership = false,int currentIndex = 0); - QList widgetItems() const; + QList widgetItems() const; - void setModel(QAbstractItemModel* model); - QAbstractItemModel* model() const; - + void setModel(QAbstractItemModel* model); + QAbstractItemModel* model() const; + QList selectedItems() const; void setSelectedItems(const QList items); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/popups/hbselectiondialog_p.cpp --- a/src/hbwidgets/popups/hbselectiondialog_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/popups/hbselectiondialog_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -36,12 +36,12 @@ #include HbSelectionDialogMarkWidget::HbSelectionDialogMarkWidget(QGraphicsItem *parent):HbWidget(parent),mBackgroundItem(0){ - chkMark = new HbCheckBox(this); - chkMark->setText(hbTrId("txt_common_list_mark_all_items")); - lbCounter = new HbTextItem(this); - HbStyle::setItemName(chkMark,"checkbox"); - HbStyle::setItemName(lbCounter,"counter"); - createPrimitives(); + chkMark = new HbCheckBox(this); + chkMark->setText(hbTrId("txt_common_list_mark_all_items")); + lbCounter = new HbTextItem(this); + HbStyle::setItemName(chkMark,"checkbox"); + HbStyle::setItemName(lbCounter,"counter"); + createPrimitives(); } void HbSelectionDialogMarkWidget::createPrimitives() @@ -69,7 +69,7 @@ { switch ( change ) { case ItemVisibleHasChanged: { - updatePrimitives( ); + updatePrimitives( ); } break; @@ -108,13 +108,13 @@ void HbSelectionDialogContentWidget::_q_listWidgetItemSelected(HbListWidgetItem *item) { - Q_UNUSED(item) + Q_UNUSED(item) } void HbSelectionDialogContentWidget::_q_listItemSelected(QModelIndex index) { Q_UNUSED(index) - if(mListView->selectionMode()== HbAbstractItemView::SingleSelection){ + if(mListView->selectionMode()== HbAbstractItemView::SingleSelection){ d->close(); } updateCounter(); @@ -123,32 +123,44 @@ int HbSelectionDialogContentWidget::selectedItemCount() const { int selectedItems = 0; - if(mListView){ - QItemSelectionModel* selectionModel = mListView->selectionModel(); - if(selectionModel){ - selectedItems = selectionModel->selectedRows().count(); - } - } + if(mListView){ + QItemSelectionModel* selectionModel = mListView->selectionModel(); + if(selectionModel){ + selectedItems = selectionModel->selectedRows().count(); + } + } return selectedItems; } int HbSelectionDialogContentWidget::totalItemCount() const { - int nCount = 0; - if(mListView && mListView->model()){ - nCount = mListView->model()->rowCount(); - } - return nCount; + int nCount = 0; + if(mListView && mListView->model()){ + nCount = mListView->model()->rowCount(); + } + return nCount; } +void HbSelectionDialogContentWidget::setModel(QAbstractItemModel* model) +{ + if(mListView){ + HbListWidget* mView = qobject_cast(mListView); + if(!mView){ //can not set model on HbListWidget + QObject::disconnect(mListView->selectionModel(),SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),this,SLOT(_q_selectionChanged(const QItemSelection&, const QItemSelection&))); + mListView->setModel(model); + if(model) + QObject::connect(mListView->selectionModel(),SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),this,SLOT(_q_selectionChanged(const QItemSelection&, const QItemSelection&))); + } + } +} void HbSelectionDialogContentWidget::updateCounter() { - if(!mListView) return; + if(!mListView) return; if(mListView->selectionMode()!= HbAbstractItemView::MultiSelection) return; if(markWidget){ int totalItems = totalItemCount(); int selectedItems = selectedItemCount(); - markWidget->updatePrimitives(); + markWidget->updatePrimitives(); markWidget->lbCounter->setText(QString(QString::number(selectedItems) + "/" + QString::number(totalItems))); //update checked state of "MarkAll" checkbox if (totalItems > 0 && (selectedItems == totalItems)){ @@ -191,21 +203,24 @@ void HbSelectionDialogContentWidget::showMarkWidget(bool bShow) { - if(bShow){ - if(!markWidget){ - markWidget = new HbSelectionDialogMarkWidget(this); - HbStyle::setItemName(markWidget,"markwidget"); - setProperty("multiSelection",true); - connect(markWidget->chkMark,SIGNAL(stateChanged ( int )),this,SLOT(_q_checkboxclicked(int))); - repolish(); - updateCounter(); - } + if(bShow){ + if(!markWidget){ + markWidget = new HbSelectionDialogMarkWidget(this); + } + else{ + markWidget->show(); + } + HbStyle::setItemName(markWidget,"markwidget"); + connect(markWidget->chkMark,SIGNAL(stateChanged ( int )),this,SLOT(_q_checkboxclicked(int))); + repolish(); + updateCounter(); } else{ - delete markWidget; markWidget = 0; - HbStyle::setItemName(markWidget,""); - setProperty("multiSelection",false); - repolish(); + if(markWidget){ + HbStyle::setItemName(markWidget,""); + markWidget->hide(); + repolish(); + } } } @@ -216,60 +231,73 @@ QObject::connect(mListView->model(),SIGNAL(rowsInserted(const QModelIndex& ,int,int)),this,SLOT(modelChanged(const QModelIndex&,int,int))); } +void HbSelectionDialogContentWidget::_q_selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) +{ + Q_UNUSED(selected); + Q_UNUSED(deselected); + updateCounter(); +} + void HbSelectionDialogContentWidget::modelChanged(const QModelIndex &parent, int start,int end) { - Q_UNUSED(parent); - Q_UNUSED(start); - Q_UNUSED(end); - updateCounter(); + Q_UNUSED(parent); + Q_UNUSED(start); + Q_UNUSED(end); + updateCounter(); } void HbSelectionDialogContentWidget::createListWidget() { - if(mListView){ - HbListWidget* mView = qobject_cast(mListView); - if(!mView){ - delete mListView; - mListView = new HbListWidget(this); - HbStyle::setItemName(mListView, "list"); - connectSlots(); - } - } - else{ - mListView = new HbListWidget(this); - HbStyle::setItemName(mListView, "list"); - connectSlots(); - } + if(mListView){ + QObject::disconnect(mListView->selectionModel(),SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),this,SLOT(_q_selectionChanged(const QItemSelection&, const QItemSelection&))); + HbListWidget* mView = qobject_cast(mListView); + if(!mView){ + delete mListView; + mListView = new HbListWidget(this); + HbStyle::setItemName(mListView, "list"); + connectSlots(); + repolish(); + } + } + else{ + mListView = new HbListWidget(this); + HbStyle::setItemName(mListView, "list"); + connectSlots(); + repolish(); + } + QObject::connect(mListView->selectionModel(),SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),this,SLOT(_q_selectionChanged(const QItemSelection&, const QItemSelection&))); } void HbSelectionDialogContentWidget::createListView() { - if(mListView){ - HbListView* mView = qobject_cast(mListView); - if(!mView){ - delete mListView; - mListView = new HbListView(this); - HbStyle::setItemName(mListView, "list"); - connectSlots(); - } - } - else{ - mListView = new HbListView(this); - HbStyle::setItemName(mListView, "list"); - connectSlots(); - } + if(mListView){ + HbListWidget* mView = qobject_cast(mListView); + if(mView){ + delete mListView; + mListView = new HbListView(this); + HbStyle::setItemName(mListView, "list"); + connectSlots(); + repolish(); + } + } + else{ + mListView = new HbListView(this); + HbStyle::setItemName(mListView, "list"); + connectSlots(); + repolish(); + } } HbSelectionDialogPrivate::HbSelectionDialogPrivate() :HbDialogPrivate() { bOwnItems = false; - action1 = action2 = 0; + action1 = action2 = 0; } HbSelectionDialogPrivate::~HbSelectionDialogPrivate() { - clearItems(bOwnItems); + clearItems(bOwnItems); } void HbSelectionDialogPrivate::init() @@ -278,14 +306,14 @@ Q_Q(HbSelectionDialog); bOwnItems = false; - mSelectionMode = HbAbstractItemView::SingleSelection; + mSelectionMode = HbAbstractItemView::SingleSelection; HbSelectionDialogContentWidget* contentWidget = new HbSelectionDialogContentWidget(this); q->setContentWidget(contentWidget); q->setDismissPolicy(HbPopup::NoDismiss); q->setTimeout(HbPopup::NoTimeout); q->setModal(true); - showActions(mSelectionMode); + showActions(mSelectionMode); } void HbSelectionDialogPrivate::showActions(HbAbstractItemView::SelectionMode selectionMode) @@ -332,49 +360,49 @@ HbSelectionDialogContentWidget* cWidget = qobject_cast(q->contentWidget()); if(cWidget && cWidget->mListView){ cWidget->mListView->setSelectionMode(mSelectionMode); - if(mode == HbAbstractItemView::MultiSelection) - cWidget->showMarkWidget(true); - else - cWidget->showMarkWidget(false); - } - showActions(mSelectionMode); + if(mode == HbAbstractItemView::MultiSelection) + cWidget->showMarkWidget(true); + else + cWidget->showMarkWidget(false); + } + showActions(mSelectionMode); } break; case HbAbstractItemView::NoSelection: - break; - } + break; + } } void HbSelectionDialogPrivate::clearItems(bool keepItems) { - Q_Q(HbSelectionDialog); - HbSelectionDialogContentWidget* cWidget = qobject_cast(q->contentWidget()); - if(cWidget){ - HbListWidget* mWidget = qobject_cast(cWidget->mListView); - if(mWidget){ - if(keepItems){ - int nRows = 0; - QAbstractItemModel* itemModel = mWidget->model(); - if(itemModel){ - nRows = itemModel->rowCount(); - while(nRows){ - mWidget->takeItem(0); - nRows = itemModel->rowCount(); - } - } - } - else{ - mWidget->clear(); - } - bOwnItems = false; - return; - } - HbListView* mView = qobject_cast(cWidget->mListView); - if(mView){ - cWidget->mListView->setModel(0); - } - } + Q_Q(HbSelectionDialog); + HbSelectionDialogContentWidget* cWidget = qobject_cast(q->contentWidget()); + if(cWidget){ + HbListWidget* mWidget = qobject_cast(cWidget->mListView); + if(mWidget){ + if(keepItems){ + int nRows = 0; + QAbstractItemModel* itemModel = mWidget->model(); + if(itemModel){ + nRows = itemModel->rowCount(); + while(nRows){ + mWidget->takeItem(0); + nRows = itemModel->rowCount(); + } + } + } + else{ + mWidget->clear(); + } + bOwnItems = false; + return; + } + HbListView* mView = qobject_cast(cWidget->mListView); + if(mView){ + cWidget->setModel(0); + } + } } QList HbSelectionDialogPrivate::widgetItems() const @@ -406,16 +434,16 @@ if(!cWidget) return; int nRows = 0; - cWidget->createListWidget(); - setSelectionMode(mSelectionMode); + cWidget->createListWidget(); + setSelectionMode(mSelectionMode); if(cWidget->mListView){ int count = items.size(); - if(count > 0) clearItems(bOwnItems); //Clear the existing items first + if(count > 0) clearItems(bOwnItems); //Clear the existing items first for (int i = 0; i < count; ++i) { HbListWidgetItem* modelItem = new HbListWidgetItem(); QString str = items.at(i); modelItem->setText(str); - HbListWidget* widget = (HbListWidget*)cWidget->mListView; + HbListWidget* widget = (HbListWidget*)cWidget->mListView; widget->addItem(modelItem); QAbstractItemModel* itemModel = cWidget->mListView->model(); @@ -451,11 +479,10 @@ HbSelectionDialogContentWidget* cWidget = qobject_cast(q->contentWidget()); if(cWidget){ - cWidget->createListView(); - setSelectionMode(mSelectionMode); - cWidget->mListView->setModel(model); - cWidget->updateCounter(); - cWidget->connectSlots(); + cWidget->createListView(); + setSelectionMode(mSelectionMode); + cWidget->setModel(model); + cWidget->updateCounter(); } } @@ -465,12 +492,12 @@ HbSelectionDialogContentWidget* cWidget = qobject_cast(q->contentWidget()); if(cWidget){ - cWidget->createListWidget(); - setSelectionMode(mSelectionMode); + cWidget->createListWidget(); + setSelectionMode(mSelectionMode); if(cWidget->mListView){ - HbListWidget* widget = (HbListWidget*)cWidget->mListView; + HbListWidget* widget = (HbListWidget*)cWidget->mListView; int count = items.count(); - if(count > 0) clearItems(bOwnItems); //Clear the existing items first + if(count > 0) clearItems(bOwnItems); //Clear the existing items first for(int i = 0; i < count; i++){ widget->addItem(items[i]); } @@ -478,7 +505,7 @@ } bOwnItems = transferOwnership; - cWidget->updateCounter(); + cWidget->updateCounter(); } } @@ -488,7 +515,7 @@ HbSelectionDialogContentWidget* cWidget = qobject_cast(q->contentWidget()); if(cWidget && cWidget->mListView){ - return cWidget->mListView->model(); + return cWidget->mListView->model(); } return 0; } @@ -510,16 +537,16 @@ QItemSelectionModel *model = 0; model = selectionModel(); if(model){ - model->clearSelection(); + model->clearSelection(); Q_FOREACH(QVariant i,items) { model->select(model->model()->index(i.toInt(),0), QItemSelectionModel::Select); } - HbSelectionDialogContentWidget* cWidget = qobject_cast(q->contentWidget()); - if(cWidget){ - cWidget->updateCounter(); - } - } + HbSelectionDialogContentWidget* cWidget = qobject_cast(q->contentWidget()); + if(cWidget){ + cWidget->updateCounter(); + } + } } QList HbSelectionDialogPrivate::selectedItems() const @@ -554,6 +581,6 @@ void HbSelectionDialogPrivate::close() { Q_Q(HbSelectionDialog); - q->accept(); //emit the signal + q->accept(); //emit the signal } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/popups/hbselectiondialog_p.h --- a/src/hbwidgets/popups/hbselectiondialog_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/popups/hbselectiondialog_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -42,7 +42,7 @@ class HbSelectionDialogPrivate : public HbDialogPrivate { - Q_DECLARE_PUBLIC(HbSelectionDialog) + Q_DECLARE_PUBLIC(HbSelectionDialog) public: HbSelectionDialogPrivate(); ~HbSelectionDialogPrivate(); @@ -51,79 +51,81 @@ private: void init(); - void setStringItems(const QStringList &items,int currentIndex); + void setStringItems(const QStringList &items,int currentIndex); QStringList stringItems() const; - void setWidgetItems(const QList &items,bool transferOwnership,int currentIndex); + void setWidgetItems(const QList &items,bool transferOwnership,int currentIndex); QList widgetItems() const; void setSelectedItems(const QList items); QList selectedItems() const; - void setModel(QAbstractItemModel* model); - QAbstractItemModel* model() const; + void setModel(QAbstractItemModel* model); + QAbstractItemModel* model() const; QItemSelectionModel* selectionModel() const; QModelIndexList selectedModelIndexes() const; - void clearItems(bool keepItems); - void showActions(HbAbstractItemView::SelectionMode selectionMode); + void clearItems(bool keepItems); + void showActions(HbAbstractItemView::SelectionMode selectionMode); public: bool bOwnItems; - HbAbstractItemView::SelectionMode mSelectionMode; + HbAbstractItemView::SelectionMode mSelectionMode; void close(); private: - HbAction *action1; - HbAction *action2; + HbAction *action1; + HbAction *action2; }; class HbSelectionDialogMarkWidget : public HbWidget { - Q_OBJECT + Q_OBJECT public: QGraphicsItem *mBackgroundItem; HbCheckBox* chkMark; - HbTextItem* lbCounter; - HbSelectionDialogMarkWidget(QGraphicsItem *parent = 0); - ~HbSelectionDialogMarkWidget(); - void createPrimitives(); - void updatePrimitives(); - QVariant itemChange( GraphicsItemChange change, const QVariant &value ); - QGraphicsItem* primitive(HbStyle::Primitive primitive) const; + HbTextItem* lbCounter; + HbSelectionDialogMarkWidget(QGraphicsItem *parent = 0); + ~HbSelectionDialogMarkWidget(); + void createPrimitives(); + void updatePrimitives(); + QVariant itemChange( GraphicsItemChange change, const QVariant &value ); + QGraphicsItem* primitive(HbStyle::Primitive primitive) const; }; class HB_AUTOTEST_EXPORT HbSelectionDialogContentWidget :public HbWidget { - Q_OBJECT - Q_PROPERTY( bool multiSelection READ multiSelection WRITE setMultiSelection ) + Q_OBJECT + Q_PROPERTY( bool multiSelection READ multiSelection WRITE setMultiSelection ) private: - int selectedItemCount() const; - int totalItemCount() const; + int selectedItemCount() const; + int totalItemCount() const; public: - void createListWidget(); - void createListView(); - void connectSlots(); - HbListView* mListView; + void createListWidget(); + void createListView(); + void connectSlots(); + HbListView* mListView; HbSelectionDialogPrivate* d; HbSelectionDialogContentWidget(HbSelectionDialogPrivate *priv); enum { Type = Hb::ItemType_SelectionDialogContentWidget }; int type() const { return Type; } - void showMarkWidget(bool bShow); - bool multiSelection(){return bMultiSelection;}; - void setMultiSelection(bool bValue){bMultiSelection = bValue;}; - bool bMultiSelection; - void updateCounter(); + void showMarkWidget(bool bShow); + bool multiSelection(){return bMultiSelection;}; + void setMultiSelection(bool bValue){bMultiSelection = bValue;}; + bool bMultiSelection; + void updateCounter(); + void setModel(QAbstractItemModel* model); private: - HbSelectionDialogMarkWidget* markWidget; + HbSelectionDialogMarkWidget* markWidget; private slots: - void _q_listWidgetItemSelected(HbListWidgetItem *item); - void _q_listItemSelected(QModelIndex index); - void _q_checkboxclicked(int value); - void modelChanged(const QModelIndex &parent, int start,int end); + void _q_listWidgetItemSelected(HbListWidgetItem *item); + void _q_listItemSelected(QModelIndex index); + void _q_selectionChanged(const QItemSelection &selected, const QItemSelection &deselected); + void _q_checkboxclicked(int value); + void modelChanged(const QModelIndex &parent, int start,int end); }; class HbMarkWidget : public HbWidget { public: HbCheckBox* chkMark; - HbTextItem* lbCounter; + HbTextItem* lbCounter; }; #endif //HBSELECTIONDIALOGPRIVATE_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/sliders/hbabstractslidercontrol.cpp --- a/src/hbwidgets/sliders/hbabstractslidercontrol.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/sliders/hbabstractslidercontrol.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -574,12 +574,12 @@ d->position = position; if (!d->tracking) update(); - if (d->pressed) { + if (d->pressed) { emit sliderMoved(position); if(singleStep() != 0 ) { HbWidgetFeedback::continuousTriggered(this, Hb::ContinuousDragged); } - } + } if (d->tracking && !d->blocktracking) triggerAction(SliderMove); } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/sliders/hbabstractslidercontrol_p.h --- a/src/hbwidgets/sliders/hbabstractslidercontrol_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/sliders/hbabstractslidercontrol_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -58,7 +58,7 @@ Q_Q(HbAbstractSliderControl); // NOTE: the widget parameter is not used by // QStyle::styleHint(QStyle::SH_Slider_StopMouseOverSlider) - if (qApp->style()->styleHint(QStyle::SH_Slider_StopMouseOverSlider, 0, 0)) { + if (qApp->style()->styleHint(QStyle::SH_Slider_StopMouseOverSlider, 0, 0)) { if (qAbs(position - pressValue) < step) { repeatAction = HbAbstractSliderControl::SliderNoAction; q->setSliderPosition(pressValue); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/sliders/hbprogressbar_p.h --- a/src/hbwidgets/sliders/hbprogressbar_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/sliders/hbprogressbar_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -47,8 +47,8 @@ void createTextPrimitives(); virtual void setRange(int minimum, int maximum); virtual void setOrientation(Qt::Orientation orientation); - virtual void setProgressValue(int value); - virtual void setEnableFlag(bool flag); + virtual void setProgressValue(int value); + virtual void setEnableFlag(bool flag); #ifdef HB_EFFECTS void _q_delayedHide(HbEffect::EffectStatus status); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/sliders/hbprogressslider.cpp --- a/src/hbwidgets/sliders/hbprogressslider.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/sliders/hbprogressslider.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -29,7 +29,7 @@ #include #include #include "hbglobal_p.h" - +#include #include #include @@ -39,6 +39,10 @@ #define HB_PRGRESSSLIDER_ITEM_TYPE "HB_PROGRESSSLIDER" #endif +#ifdef HB_GESTURE_FW +#include +#endif + HbProgressSliderPrivate::HbProgressSliderPrivate() { mDownState=false; @@ -109,11 +113,11 @@ HbEffectInternal::add(HB_PRGRESSSLIDER_ITEM_TYPE,"progressslider_trackrelease", "progressslider_trackrelease"); #endif - q->grabGesture(Qt::TapGesture); - +#ifdef HB_GESTURE_FW if(QGraphicsObject *touchArea = mTouchAreaItem->toGraphicsObject()) { touchArea->grabGesture(Qt::TapGesture); } +#endif } void HbProgressSliderPrivate::emitSliderPressed() @@ -125,6 +129,20 @@ void HbProgressSliderPrivate::emitSliderReleased() { Q_Q(HbProgressSlider); + if(mDownState){ + mDownState = false; + HbStyleOptionProgressSlider option; + q->initStyleOption(&option); + if (mFrame) { + HbStylePrivate::updatePrimitive(mFrame, HbStylePrivate::P_ProgressSlider_frame, &option); + } + HbWidgetFeedback::triggered(q, Hb::InstantReleased); + +#ifdef HB_EFFECTS + // HbEffect::start(q, HB_PRGRESSSLIDER_ITEM_TYPE, "progressslider_trackrelease"); +#endif + } + emit q->sliderReleased(); } @@ -295,6 +313,7 @@ HbProgressSlider::HbProgressSlider(QGraphicsItem *parent) : HbProgressBar(*new HbProgressSliderPrivate,parent) { + HbEffect::disable(this); Q_D( HbProgressSlider ); d->q_ptr = this; d->init(); @@ -315,6 +334,8 @@ else{ d->handle->setPos(0,boundingRect().height()); } + + HbEffect::disable(this); } @@ -326,6 +347,7 @@ HbProgressSlider::HbProgressSlider(HbProgressSliderPrivate &dd,QGraphicsItem *parent) : HbProgressBar( dd,parent) { + HbEffect::disable(this); Q_D( HbProgressSlider ); d->init(); @@ -339,6 +361,8 @@ else{ d->handle->setPos(0,boundingRect().height()); } + + HbEffect::disable(this); } @@ -437,6 +461,7 @@ */ void HbProgressSlider::mousePressEvent(QGraphicsSceneMouseEvent *event) { +#ifndef HB_GESTURE_FW Q_D(HbProgressSlider); QRectF rect = d->mTouchAreaItem->sceneBoundingRect( ); @@ -456,7 +481,7 @@ HbWidgetFeedback::triggered(this, Hb::InstantPressed); d->handle->handleTrackPress(event); - emit trackPressed(); + emit trackPressed(); event->accept(); #ifdef HB_EFFECTS HbEffect::start(this, HB_PRGRESSSLIDER_ITEM_TYPE, "progressslider_trackpress"); @@ -464,6 +489,9 @@ } else { event->ignore(); } +#else + Q_UNUSED(event) +#endif } /*! @@ -471,6 +499,7 @@ */ void HbProgressSlider::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { +#ifndef HB_GESTURE_FW Q_D(HbProgressSlider); if(flags().testFlag(ItemIsFocusable)) { @@ -484,7 +513,7 @@ HbWidgetFeedback::triggered(this, Hb::InstantReleased); d->handle->handleTrackRelease(event); - emit trackReleased(); + emit trackReleased(); event->accept(); #ifdef HB_EFFECTS HbEffect::start(this, HB_PRGRESSSLIDER_ITEM_TYPE, "progressslider_trackrelease"); @@ -492,7 +521,86 @@ } else { event->ignore(); } +#else + Q_UNUSED(event) +#endif } + +#ifdef HB_GESTURE_FW +void HbProgressSlider::gestureEvent(QGestureEvent *event) +{ + Q_D (HbProgressSlider); + + if(event->gesture(Qt::TapGesture)) { + + HbTapGesture *tapGesture = static_cast(event->gesture(Qt::TapGesture)); + switch(tapGesture->state()) { + case Qt::GestureStarted :{ + QRectF rect = d->mTouchAreaItem->sceneBoundingRect( ); + // return if point is outside track touch area + if ( !rect.contains( event->mapToGraphicsScene(tapGesture->position( ) ) ) ) { + event->ignore( ); + return; + } + if(flags().testFlag(ItemIsFocusable)) { + #ifdef HB_EFFECTS + HbEffect::start(this, HB_PRGRESSSLIDER_ITEM_TYPE, "progressslider_trackpress"); + #endif + d->mDownState = true; + HbStyleOptionProgressSlider option; + initStyleOption(&option); + d->handle->setPressedState(); + if (d->mFrame) { + HbStylePrivate::updatePrimitive(d->mFrame, HbStylePrivate::P_ProgressSlider_frame, &option); + } + + HbWidgetFeedback::triggered(this, Hb::InstantPressed); + d->handle->handleTrackPress(event); + emit trackPressed(); + event->accept(); + + } + else { + event->ignore(); + } + } + break; + + case Qt::GestureFinished:{ + if(flags().testFlag(ItemIsFocusable)) { + #ifdef HB_EFFECTS + HbEffect::start(this, HB_PRGRESSSLIDER_ITEM_TYPE, "progressslider_trackrelease"); + #endif + + d->mDownState = false; + + HbStyleOptionProgressSlider option; + initStyleOption(&option); + if (d->mFrame) { + HbStylePrivate::updatePrimitive(d->mFrame, HbStylePrivate::P_ProgressSlider_frame, &option); + } + + HbWidgetFeedback::triggered(this, Hb::InstantReleased); + d->handle->setReleasedState(); + d->handle->handleTrackRelease(event); + emit trackReleased(); + event->accept(); + + + } else { + event->ignore(); + } + + } + break; + default:break; + } + } + +} +#endif + + /*! \reimp */ @@ -597,6 +705,7 @@ */ void HbProgressSlider::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { +#ifndef HB_GESTURE_FW Q_D(HbProgressSlider); QRectF rect = d->mTouchAreaItem->sceneBoundingRect( ); // return if point is outside track touch area @@ -611,35 +720,10 @@ } else { event->ignore(); } - +#else + Q_UNUSED(event) +#endif } -/*! - \reimp - */ -bool HbProgressSlider::sceneEventFilter(QGraphicsItem *obj,QEvent *event) -{ - Q_D(HbProgressSlider); - if( obj == d->mTouchAreaItem) { - if (!isEnabled() ) { - return false; - } - if (event->type() == QEvent::GraphicsSceneMousePress){ - mousePressEvent((QGraphicsSceneMouseEvent *) event); - return true; - } - else if (event->type() == QEvent::GraphicsSceneMouseRelease){ - mouseReleaseEvent((QGraphicsSceneMouseEvent *) event); - return true; - } - - else if (event->type() == QEvent::GraphicsSceneMouseMove){ - mouseMoveEvent((QGraphicsSceneMouseEvent *) event); - return true; - } - } - return false; -} - /*! @beta @@ -734,3 +818,20 @@ } } +bool HbProgressSlider::sceneEventFilter(QGraphicsItem *obj,QEvent *event) +{ + Q_D(HbProgressSlider); + bool accepted = false; + + if( obj == d->mTouchAreaItem) + if (!isEnabled() ) { + return false; + } + + if(obj == static_cast(d->mTouchAreaItem)) { + if(event->type() == QEvent::Gesture ) { + gestureEvent(static_cast( event )); + } + } + return accepted; +} diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/sliders/hbprogressslider.h --- a/src/hbwidgets/sliders/hbprogressslider.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/sliders/hbprogressslider.h Thu Sep 02 20:44:51 2010 +0300 @@ -66,8 +66,8 @@ void sliderPressed(); void sliderReleased(); void sliderMoved(int value); - void trackPressed(); - void trackReleased(); + void trackPressed(); + void trackReleased(); public slots : void setSliderValue(int value); @@ -77,8 +77,9 @@ HbProgressSlider(HbProgressSliderPrivate &dd,QGraphicsItem *parent = 0); void mousePressEvent(QGraphicsSceneMouseEvent *event); void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - void mouseMoveEvent(QGraphicsSceneMouseEvent *event); - void showEvent( QShowEvent * event ); + void mouseMoveEvent(QGraphicsSceneMouseEvent *event); + void gestureEvent(QGestureEvent *event); + void showEvent( QShowEvent *event ); QVariant itemChange(GraphicsItemChange change,const QVariant & value); bool sceneEventFilter(QGraphicsItem *obj,QEvent *event); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/sliders/hbprogressslider_p.h --- a/src/hbwidgets/sliders/hbprogressslider_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/sliders/hbprogressslider_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -44,7 +44,7 @@ void emitSliderReleased(); void setProgressValue(int value); void emitSliderMoved(int newValue); - void setEnableFlag(bool flag); + void setEnableFlag(bool flag); QRectF boundingRect() const; HbStyle* style() const; QGraphicsItem* parentGraphicsItem() const; @@ -56,7 +56,7 @@ QString toolTipText() const; Qt::Alignment textAlignment() const; bool textVisible()const; - bool mToolTipTextVisibleUser; + bool mToolTipTextVisibleUser; Qt::Orientation orientation(); void setRange(int minimum, int maximum); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/sliders/hbprogresssliderhandle_p.cpp --- a/src/hbwidgets/sliders/hbprogresssliderhandle_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/sliders/hbprogresssliderhandle_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -60,6 +60,7 @@ q(parent), mHandleIcon() { + HbEffect::disable(this); mFlags = 0; mFlags |= TextVisible; @@ -102,14 +103,10 @@ } -void HbProgressSliderHandle::gestureEvent(QGestureEvent *event) -{ - Q_UNUSED(event); - // HbWidgetBase::gestureEvent() ignores, overriding to accept -} void HbProgressSliderHandle::mousePressEvent(QGraphicsSceneMouseEvent *event) { +#ifndef HB_GESTURE_FW HbWidget::mousePressEvent(event); #ifdef HB_EFFECTS @@ -144,10 +141,14 @@ HbToolTip::showText(locale.toString(slider->sliderValue()),this, QRectF(mItemCurPos,QSize(0,0)),q->textAlignment()); } +#else + Q_UNUSED(event) +#endif } void HbProgressSliderHandle::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { +#ifndef HB_GESTURE_FW HbWidget::mouseReleaseEvent(event); HbStyleOptionProgressSliderHandle option; @@ -170,33 +171,14 @@ event->accept(); setHandlePosForValue(q->progressValue()); q->emitSliderReleased(); -} - -void HbProgressSliderHandle::handleTrackRelease(QGraphicsSceneMouseEvent * event) -{ - Q_UNUSED(event); - setHandlePosForValue(q->progressValue()); -} - -void HbProgressSliderHandle::handleTrackPress(QGraphicsSceneMouseEvent * event) -{ - QPointF newPos = q->parentGraphicsItem()->mapFromScene(event->scenePos()); - if((newPos.x() >= q->boundingRect().x()) && (newPos.x() <= q->boundingRect().width())) { - if(q->orientation() == Qt::Horizontal){ - mItemCurPos = QPointF(newPos.x() - boundingRect().width()/2, pos().y()); - } - else{ - mItemCurPos = QPointF(pos().x(), newPos.y()-boundingRect().height()/2); - } - - mItemCurPos = normalizedPos(mItemCurPos,false); - setPos(mItemCurPos); - processItemChange(mItemCurPos); - } +#else + Q_UNUSED(event) +#endif } void HbProgressSliderHandle::mouseMoveEvent ( QGraphicsSceneMouseEvent * event ) { +#ifndef HB_GESTURE_FW HbWidget::mouseMoveEvent(event); mFlags |=HandleMoving; QPointF scenePos = event->scenePos(); @@ -241,6 +223,171 @@ HbToolTip::showText(locale.toString(slider->sliderValue()),this, QRectF(mItemCurPos,QSize(0,0)),q->textAlignment()); } +#else + Q_UNUSED(event) +#endif +} + +void HbProgressSliderHandle::handleTrackRelease(QGestureEvent *event) +{ + Q_UNUSED(event); + setHandlePosForValue(q->progressValue()); +} + +void HbProgressSliderHandle::handleTrackPress(QGestureEvent *event) +{ + HbTapGesture *gesture = static_cast(event->gesture(Qt::TapGesture)); + QPointF newPos = q->parentGraphicsItem()->mapFromScene(event->mapToGraphicsScene(gesture->position())); + + //QPointF newPos = q->parentGraphicsItem()->mapFromScene(event->scenePos()); + if((newPos.x() >= q->boundingRect().x()) && (newPos.x() <= q->boundingRect().width())) { + if(q->orientation() == Qt::Horizontal){ + mItemCurPos = QPointF(newPos.x() - boundingRect().width()/2, pos().y()); + } + else{ + mItemCurPos = QPointF(pos().x(), newPos.y()-boundingRect().height()/2); + } + + mItemCurPos = normalizedPos(mItemCurPos,false); + setPos(mItemCurPos); + processItemChange(mItemCurPos); + } +} + + +/*! + reimp + +*/ +void HbProgressSliderHandle::gestureEvent(QGestureEvent *event) +{ + if(HbTapGesture *tap = qobject_cast(event->gesture(Qt::TapGesture))) { + switch(tap->state()) { + case Qt::GestureStarted: { + mMousePressPos = mapFromScene(event->mapToGraphicsScene(tap->position( ))); + if(q->textVisible()) { // User called it + if(!q->toolTipText().isNull()) { + HbToolTip::showText(q->toolTipText(),this, QRectF(mMousePressPos,QSize(0,0)),q->textAlignment()); + } + } + else { // show default + HbExtendedLocale locale; + HbProgressSlider *slider = (HbProgressSlider*)q->parentGraphicsWidget(); + HbToolTip::showText(locale.toString(slider->sliderValue()),this, QRectF(mMousePressPos,QSize(0,0)),q->textAlignment()); + } + #ifdef HB_EFFECTS + HbEffect::start(this, HB_PRGRESSSLIDERHANDLE_ITEM_TYPE, "progressslider_handlepress"); + #endif + mFlags |= HbProgressSliderHandle::MousePressed; + HbStyleOptionProgressSliderHandle option; + initStyleOption(&option); + option.pressedState = true; + if (mHandleIconItem) { + HbStylePrivate::updatePrimitive(mHandleIconItem, HbStylePrivate::P_ProgressSliderHandle_icon, &option); + } + mMousePressPos = mapFromScene(event->mapToGraphicsScene(tap->position( ))); + HbWidgetFeedback::triggered(q->parentGraphicsWidget(), Hb::InstantPressed, Hb::ModifierSliderHandle); + event->accept(); + + q->emitSliderPressed(); + } + break; + case Qt::GestureFinished:{ + HbStyleOptionProgressSliderHandle option; + initStyleOption(&option); + option.pressedState = false; + if (mHandleIconItem) { + HbStylePrivate::updatePrimitive(mHandleIconItem, HbStylePrivate::P_ProgressSliderHandle_icon, &option); + } + if (isHandleMoving()) { + HbWidgetFeedback::continuousStopped(q->parentGraphicsWidget(), Hb::ContinuousDragged); + } + HbWidgetFeedback::triggered(q->parentGraphicsWidget(), Hb::InstantReleased, Hb::ModifierSliderHandle); + #ifdef HB_EFFECTS + HbEffect::start(this, HB_PRGRESSSLIDERHANDLE_ITEM_TYPE, "progressslider_handlerelease"); + #endif + mFlags &= ~HbProgressSliderHandle::MousePressed; + mFlags &=~HandleMoving; + event->accept(); + setHandlePosForValue(q->progressValue()); + q->emitSliderReleased(); + } + break; + default: + break; + } + } + if (HbPanGesture *panGesture = qobject_cast(event->gesture(Qt::PanGesture))) { + switch(panGesture->state( )) { + case Qt::GestureStarted: + case Qt::GestureUpdated:{ + mFlags |=HandleMoving; + QPointF scenePos =mapToParent( mapFromScene(panGesture->sceneOffset( )+panGesture->sceneStartPos( ))); + if(scenePos.x() == oldCord.x()) { + return; + } + oldCord = scenePos; + //if(q->orientation() == Qt::Horizontal){ + mItemCurPos = QPointF((scenePos.x() - mMousePressPos.x()), pos().y()); + HbWidgetFeedback::continuousTriggered(qobject_cast(q->parentGraphicsWidget()), Hb::ContinuousDragged); + if(mItemCurPos.x()+boundingRect().width() < q->boundingRect().width() && mItemCurPos.x()>q->boundingRect().topLeft().x() ){ + setPos(mItemCurPos); + //} + //else{ + // processItemChange(mItemCurPos); + //} + } + if (!mTouchItem->boundingRect().contains(parentItem()->mapFromScene(scenePos))) { + #ifdef HB_EFFECTS + HbEffect::start(this, HB_PRGRESSSLIDERHANDLE_ITEM_TYPE, "progressslider_handleoutofbound"); + #endif + } + event->accept(); + if(q->textVisible()) { // User called it + if(q->toolTipText().isNull()) { + // Dont show any tooltip. + } + else { + HbToolTip::showText(q->toolTipText(),this, QRectF(mItemCurPos,QSize(0,0)),q->textAlignment()); + } + } + else { // show default + HbExtendedLocale locale; + HbProgressSlider *slider = (HbProgressSlider*)q->parentGraphicsWidget(); + HbToolTip::showText(locale.toString(slider->sliderValue()),this, QRectF(mItemCurPos,QSize(0,0)),q->textAlignment()); + } + q->emitSliderMoved(pointToValue(mItemCurPos)); + } + break; + case Qt::GestureFinished: + case Qt::GestureCanceled: { + HbStyleOptionProgressSliderHandle option; + option.pressedState = false; + initStyleOption(&option); + if (mHandleIconItem) { + HbStylePrivate::updatePrimitive(mHandleIconItem, HbStylePrivate::P_ProgressSliderHandle_icon, &option); + } + if (isHandleMoving()) { + HbWidgetFeedback::continuousStopped(q->parentGraphicsWidget(), Hb::ContinuousDragged); + } + else { + HbWidgetFeedback::triggered(q->parentGraphicsWidget(), Hb::InstantReleased, Hb::ModifierSliderHandle); + } + #ifdef HB_EFFECTS + HbEffect::start(this, HB_PRGRESSSLIDERHANDLE_ITEM_TYPE, "progressslider_handlerelease"); + #endif + mFlags &= ~HbProgressSliderHandle::MousePressed; + mFlags &=~HandleMoving; + event->accept(); + setHandlePosForValue(q->progressValue()); + q->emitSliderReleased(); + } + break; + default: + break; + } + } + } int HbProgressSliderHandle::pointToValue(QPointF point) const @@ -249,15 +396,10 @@ qreal effectiveWidth; point = normalizedPos(point,q->invertedAppearance()); qreal givenPixel; - if(q->orientation() == Qt::Horizontal){ - effectiveWidth = rect.width() - boundingRect().width(); - givenPixel = point.x(); - } - else{ - effectiveWidth = rect.height() - boundingRect().height(); - givenPixel = effectiveWidth-point.y(); - } - + + effectiveWidth = rect.width() - boundingRect().width(); + givenPixel = point.x(); + qreal tickPerPixel = (qreal)(q->maximum()-q->minimum())/effectiveWidth; qreal tickForGivenPixel = givenPixel * tickPerPixel; tickForGivenPixel = qRound(tickForGivenPixel); @@ -285,24 +427,12 @@ QRectF r2 = boundingRect(); qreal width; - if(q->orientation()== Qt::Horizontal){ - width = r1.width() - r2.width(); - - } - else{ - width = r1.height() - r2.height(); - - } + width = r1.width() - r2.width(); if(q->maximum() != q->minimum()){ qreal pixelpertick = width/(qreal)(q->maximum()-q->minimum()); qreal noOfTicks = qreal(value - q->minimum()); qreal xpos = noOfTicks * pixelpertick; - if(q->orientation() == Qt::Horizontal){ - return QPointF(xpos, r1.top()); - } - else{ - return QPointF(r1.left(),width-xpos); - } + return QPointF(xpos, r1.top()); } else{ return QPointF(0,0); @@ -312,25 +442,17 @@ QPointF HbProgressSliderHandle::normalizedPos(const QPointF& pos,bool inverted) const { Q_UNUSED(inverted); + QPointF newPos = pos; - if(q->orientation() == Qt::Horizontal){ - if (newPos.x() < HandleMargin) { + + if (newPos.x() < HandleMargin) { newPos.setX( HandleMargin ); - } - - if (newPos.x() > q->boundingRect().width() - boundingRect().width() - HandleMargin) { - newPos.setX(q->boundingRect().width() - boundingRect().width() - HandleMargin); - } } - else{ - if (newPos.y() < HandleMargin) { - newPos.setY( HandleMargin ); - } - if (newPos.y() > q->boundingRect().height() - boundingRect().height() - HandleMargin) { - newPos.setY(q->boundingRect().height() - boundingRect().height() - HandleMargin); - } + if (newPos.x() > q->boundingRect().width() - boundingRect().width() - HandleMargin) { + newPos.setX(q->boundingRect().width() - boundingRect().width() - HandleMargin); } + return newPos; } @@ -350,12 +472,7 @@ // value is the new position QPointF pt = value.toPointF(); int newValue = pointToValue(pt); - if(q->orientation() == Qt::Horizontal){ - pt.setY(q->boundingRect().top()); - } - else{ - pt.setX(q->boundingRect().left()); - } + pt.setY(q->boundingRect().top()); q->emitSliderMoved(newValue); QPointF newPos = pt; return normalizedPos(newPos,false); @@ -368,21 +485,12 @@ QPointF newPos = valueToHandlePos(progressValue); QPointF pos = normalizedPos(newPos,q->invertedAppearance()); if(q->invertedAppearance()) { - if(q->orientation() == Qt::Horizontal){ qreal xVal = q->boundingRect().width() - pos.x() - boundingRect().width(); pos.setX(xVal); - } - else{ - qreal yVal = q->boundingRect().height() - pos.y() - boundingRect().height(); - pos.setY(yVal); - } - } - qreal yPos = qreal (q->boundingRect().height()-boundingRect().height()) /2 ; setPos(pos.x(),yPos); - } - + } } @@ -424,4 +532,22 @@ option->handleIcon = mHandleIcon; option->pressedState = false; } +void HbProgressSliderHandle::setPressedState() +{ + HbStyleOptionProgressSliderHandle option; + initStyleOption(&option); + option.pressedState = true; + if (mHandleIconItem) { + HbStylePrivate::updatePrimitive(mHandleIconItem, HbStylePrivate::P_ProgressSliderHandle_icon, &option); + } +} +void HbProgressSliderHandle::setReleasedState() +{ + HbStyleOptionProgressSliderHandle option; + initStyleOption(&option); + option.pressedState = false; + if (mHandleIconItem) { + HbStylePrivate::updatePrimitive(mHandleIconItem, HbStylePrivate::P_ProgressSliderHandle_icon, &option); + } +} diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/sliders/hbprogresssliderhandle_p.h --- a/src/hbwidgets/sliders/hbprogresssliderhandle_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/sliders/hbprogresssliderhandle_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -77,16 +77,16 @@ enum { Type = HbPrivate::ItemType_ProgressSliderHandle }; int type() const { return Type; } void setHandleIcon(const HbIcon &icon); - void handleTrackRelease(QGraphicsSceneMouseEvent * event); - void handleTrackPress(QGraphicsSceneMouseEvent * event); + void handleTrackRelease(QGestureEvent *event); + void handleTrackPress(QGestureEvent *event); QVariant processItemChange(const QVariant &value); void setHandlePosForValue(int progressValue); QPointF normalizedPos(const QPointF& pos,bool inverted) const; bool isHandlePressed() const; bool isHandleMoving() const; - QGraphicsItem* primitive(HbStyle::Primitive primitive) const; - + void setPressedState(); + void setReleasedState(); public slots: void updatePrimitives(); @@ -106,6 +106,7 @@ QGraphicsItem *mHandleIconItem; QGraphicsItem *mTouchItem; HbIcon mHandleIcon; + QPointF oldCord; }; #endif //HBPROGRESSSLIDERHANDLE_P_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/sliders/hbratingslider.cpp --- a/src/hbwidgets/sliders/hbratingslider.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/sliders/hbratingslider.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -741,6 +741,12 @@ option->progressValue = d->mCurrentValue; option->disableState = !isEnabled(); option->pressedState = d->mMousePressed; + if(layoutDirection() == Qt::RightToLeft) { + option->inverted = true; + } + else { + option->inverted = false; + } } } @@ -773,14 +779,21 @@ */ void HbRatingSlider::changeEvent(QEvent *event) { + Q_D(HbRatingSlider); HbWidget::changeEvent(event); switch (event->type()) { case QEvent::LayoutDirectionChange: - updatePrimitives(); + { + HbStyleOptionRatingSlider option; + initStyleOption(&option); + if (d->mTrack) { + HbStylePrivate::updatePrimitive(d->mTrack, HbStylePrivate::P_RatingSlider_track, &option); + } + } break; case QEvent::EnabledChange: updatePrimitives(); - break; + break; default: break; } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/sliders/hbratingslider_p.h --- a/src/hbwidgets/sliders/hbratingslider_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/sliders/hbratingslider_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -35,20 +35,20 @@ HbRatingSliderPrivate(); ~HbRatingSliderPrivate(); void init(); - int calculateProgressValue(qreal pos); - void createLookupTable(); - bool mMousePressed; - int *mLookupValues; - bool mReadOnly; - int mNumberOfIcons; - int mStepCount; - int mCurrentValue; + int calculateProgressValue(qreal pos); + void createLookupTable(); + bool mMousePressed; + int *mLookupValues; + bool mReadOnly; + int mNumberOfIcons; + int mStepCount; + int mCurrentValue; QGraphicsItem *mFrame; QGraphicsItem *mTrack; QGraphicsItem *mLayoutItem; - QString mUnratedIconName; - QGraphicsItem *mTouchArea; - QString mRatedIconName; + QString mUnratedIconName; + QGraphicsItem *mTouchArea; + QString mRatedIconName; }; #endif //HBRATINGSLIDER_P_H diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/sliders/hbslider.cpp --- a/src/hbwidgets/sliders/hbslider.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/sliders/hbslider.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -637,11 +637,11 @@ void HbSliderPrivate::updateTickMarks( ) { if (tickmarksLeft) { - tickmarksLeft->createTicks(); + tickmarksLeft->createTicks(); tickmarksLeft->updateTicks(); } if (tickmarksRight) { - tickmarksRight->createTicks(); + tickmarksRight->createTicks(); tickmarksRight->updateTicks(); } } @@ -1725,7 +1725,7 @@ case 5: If you want to remove the whole tickLabel then set the empty string as the argument. Note:: if the major tickinterval of the slider is very small, the tick labels may overlap, - application needs to take care of this. + application needs to take care of this. \sa majorTickLabels( ) */ @@ -1757,8 +1757,8 @@ @beta Sets the minor ticklabels of the slider. see setMajorTickLabels for detailed description. - Note:: if the minor tickinterval of the slider is very small, the tick labels may overlap, - application needs to take care of this. + Note:: if the minor tickinterval of the slider is very small, the tick labels may overlap, + application needs to take care of this. \sa minorTickLabels( ),setMajorTickLabels( ) diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/sliders/hbslider.h --- a/src/hbwidgets/sliders/hbslider.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/sliders/hbslider.h Thu Sep 02 20:44:51 2010 +0300 @@ -162,7 +162,7 @@ bool isTrackFilled() const; virtual QGraphicsItem * primitive(HbStyle::Primitive primitive) const; - virtual void gestureEvent(QGestureEvent *event); + virtual void gestureEvent(QGestureEvent *event); public slots: void setOrientation(Qt::Orientation orientation); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/sliders/hbslidercontrol.cpp --- a/src/hbwidgets/sliders/hbslidercontrol.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/sliders/hbslidercontrol.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -302,7 +302,7 @@ Protected constructor for initialization from derived ctor. */ HbSliderControl::HbSliderControl(HbSliderControlPrivate &dd,QGraphicsItem *parent) - :HbAbstractSliderControl(dd,parent) + :HbAbstractSliderControl(dd,parent) { } @@ -906,7 +906,7 @@ case Qt::GestureStarted: case Qt::GestureUpdated:{ QPointF startPoint = event->mapToGraphicsScene(panGesture->offset()+panGesture->startPos( ) ); - //if the position is on thumb , then start moving the thumb + //if the position is on thumb , then start moving the thumb if( ( d->onHandle( startPoint) && d->grooveTouchArea->sceneBoundingRect( ).contains( startPoint))||isSliderDown( ) ) { qreal handlePos = 0; qreal span = 0; @@ -966,7 +966,7 @@ updatePrimitives( ); d->handle->updatePrimitives(); d->handleMoving = false; - int pressValue = sliderPosition(); + int pressValue = sliderPosition(); setRepeatAction( SliderNoAction,static_cast( pressValue ) ); event->ignore(); HbWidgetFeedback::triggered(this, Hb::InstantReleased); @@ -989,21 +989,21 @@ if (!isEnabled() ) { return false; } - if (event->type() == QEvent::Gesture){ + if (event->type() == QEvent::Gesture){ gestureEvent( (QGestureEvent *) (event)); return true; } } else if ( obj == d->handle) { event->ignore(); - if (event->type() == QEvent::Gesture){ + if (event->type() == QEvent::Gesture){ QGestureEvent *gestureEvent = static_cast (event); foreach(QGesture *g, gestureEvent->gestures()) { gestureEvent->ignore(g); } } } - return false; + return false; } @@ -1131,26 +1131,26 @@ QGraphicsItem* HbSliderControl::handleItem( ) const { Q_D( const HbSliderControl ); - if(d->handle) { - return d->handle->handleItem(); - } - return NULL; + if(d->handle) { + return d->handle->handleItem(); + } + return NULL; } void HbSliderControl::setHandleVisible(bool isVisible) { Q_D( HbSliderControl ); - if(isVisible) { - d->handle->setVisible(true); - } else { - d->handle->setVisible(false); - } + if(isVisible) { + d->handle->setVisible(true); + } else { + d->handle->setVisible(false); + } } bool HbSliderControl::handleVisible( ) const { Q_D( const HbSliderControl ); - return d->handle->isVisible(); + return d->handle->isVisible(); } /*! diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/sliders/hbsliderhandle.cpp --- a/src/hbwidgets/sliders/hbsliderhandle.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/sliders/hbsliderhandle.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -107,9 +107,9 @@ */ HbSliderHandle::~HbSliderHandle() { - if(mHandleItem) { - mHandleItem->removeSceneEventFilter(this); - } + if(mHandleItem) { + mHandleItem->removeSceneEventFilter(this); + } } @@ -149,19 +149,19 @@ void HbSliderHandle::setHandleItem(QGraphicsItem *item) { - if(!item) { - return; - } - if(mHandleItem) { - delete mHandleItem; + if(!item) { + return; + } + if(mHandleItem) { + delete mHandleItem; mHandleItem =0; - } + } setHandlesChildEvents(false); mHandleItem = item; - mHandleItem->setParentItem(this); - HbStyle::setItemName(mHandleItem,"widget"); + mHandleItem->setParentItem(this); + HbStyle::setItemName(mHandleItem,"widget"); //((QGraphicsWidget*)mHandleItem)->setGeometry(gItem->geometry());//TODO:geometry from css if(scene()) { @@ -194,7 +194,7 @@ bool HbSliderHandle::sceneEventFilter(QGraphicsItem *obj,QEvent *event) { //TODO: touch area does not work with the current filtering mechanism. find better solution - if( obj == mHandleItem) { + if( obj == mHandleItem) { if(event->type() == QEvent::GraphicsSceneMouseMove){ mouseMoveEvent ((QGraphicsSceneMouseEvent *) event) ; return true; @@ -205,12 +205,12 @@ mouseReleaseEvent((QGraphicsSceneMouseEvent *) event); return true; } - } + } if( obj == touchItem ) { if (!isEnabled() ) { return false; } - if (event->type() == QEvent::Gesture){ + if (event->type() == QEvent::Gesture){ gestureEvent( (QGestureEvent *) (event)); return true; } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/sliders/hbslidertickmarks.cpp --- a/src/hbwidgets/sliders/hbslidertickmarks.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/sliders/hbslidertickmarks.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -243,7 +243,7 @@ iconItem->update(); } } - update(boundingRect()); + update(boundingRect()); } /* ! @@ -283,17 +283,17 @@ Q_D (HbSliderTickmarks); if (d->majorTickHeight == 0 || d->sliderOrientation!= d->slider->orientation() ) { d->sliderOrientation = d->slider->orientation(); - params.addParameter("fixed-width-major"); - params.addParameter("fixed-height-major"); - params.addParameter("fixed-width-minor"); - params.addParameter("fixed-height-minor"); - HbWidget::polish(params); - d->majorTickWidth = params.value("fixed-width-major").toReal(); - d->majorTickHeight = params.value("fixed-height-major").toReal(); - d->minorTickWidth = params.value("fixed-width-minor").toReal(); - d->minorTickHeight = params.value("fixed-height-minor").toReal(); + params.addParameter("fixed-width-major"); + params.addParameter("fixed-height-major"); + params.addParameter("fixed-width-minor"); + params.addParameter("fixed-height-minor"); + HbWidget::polish(params); + d->majorTickWidth = params.value("fixed-width-major").toReal(); + d->majorTickHeight = params.value("fixed-height-major").toReal(); + d->minorTickWidth = params.value("fixed-width-minor").toReal(); + d->minorTickHeight = params.value("fixed-height-minor").toReal(); } else { - HbWidget::polish(params); + HbWidget::polish(params); updateTicks(); } } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/sliders/hbslidertickmarkslabel.cpp --- a/src/hbwidgets/sliders/hbslidertickmarkslabel.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/sliders/hbslidertickmarkslabel.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -156,7 +156,7 @@ opt.orientation = d->slider->orientation(); opt.text = (d->slider->majorTickLabels( )).at(i); HbStylePrivate::updatePrimitive(textItem,HbStylePrivate::P_SliderTickMark_majorlabel,&opt); - } + } int minimum = d->slider->minimum(); int maximum = d->slider->maximum(); int majorTickInterval = d->slider->majorTickInterval ( ); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/widgets/hbcheckbox.cpp --- a/src/hbwidgets/widgets/hbcheckbox.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/widgets/hbcheckbox.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -40,37 +40,6 @@ #include #endif - -/* - Spacer class. -*/ -class HbCheckBoxSpacer: public HbWidgetBase -{ - -public: - HbCheckBoxSpacer( QGraphicsItem *parent = 0 ); - QSizeF sizeHint( Qt::SizeHint which, const QSizeF &constraint = QSizeF( ) ) const; -}; - -HbCheckBoxSpacer::HbCheckBoxSpacer( QGraphicsItem *parent ) - : HbWidgetBase( parent ) -{ -#if QT_VERSION >= 0x040600 - setFlag(QGraphicsItem::ItemHasNoContents, true); -#endif -} - -QSizeF HbCheckBoxSpacer::sizeHint( Qt::SizeHint which, const QSizeF &constraint ) const -{ - Q_UNUSED( constraint ); - - if ( which == Qt::MaximumSize ) { - return QSizeF( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX ); - } - return QSizeF( 0.f, 0.f ); -} - - /* private class */ @@ -169,7 +138,8 @@ toggle state. Checkbox has default icon for checked,unchecked and partiallyChecked states. - The text can be set in the constructor or with setText(). + The text can be set in the constructor or with setText().For long text checkbox will show + multiline text,default checkbox will have text up to three lines. Example usage: \code @@ -202,9 +172,6 @@ d->q_ptr = this; setCheckable( true ); d->createPrimitives( ); - // creattion of top and bottom spacer. - HbStyle::setItemName( new HbCheckBoxSpacer( this ), "topSpacer" ); - HbStyle::setItemName( new HbCheckBoxSpacer( this ), "bottomSpacer" ); #ifdef HB_GESTURE_FW grabGesture( Qt::TapGesture ); #endif @@ -225,10 +192,6 @@ d->mText = text; setCheckable( true ); d->createPrimitives( ); - // creattion of top and bottom spacer. - HbStyle::setItemName( new HbCheckBoxSpacer(this), "topSpacer"); - HbStyle::setItemName( new HbCheckBoxSpacer(this), "bottomSpacer"); - } /*! diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/widgets/hbdatetimepicker.cpp --- a/src/hbwidgets/widgets/hbdatetimepicker.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/widgets/hbdatetimepicker.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -311,14 +311,14 @@ Expression Output h The hour without a leading zero (0 to 23 or 1 to 12). hh The hour with a leading zero (00 to 23 or 01 to 12). - H The hour without a leading zero (0 to 23, even with AM/PM display). - HH The hour with a leading zero (00 to 23, even with AM/PM display). + H The hour without a leading zero (0 to 23, even with AM/PM display). + HH The hour with a leading zero (00 to 23, even with AM/PM display). m The minute without a leading zero (0 to 59). mm The minute with a leading zero (00 to 59). s The second without a leading zero (0 to 59). ss The second with a leading zero (00 to 59). - AP or A Displays AM and PM. - ap or a Displays am and pm. + AP or A Displays AM and PM. + ap or a Displays am and pm. \note Currently you must include separators in the format; for example, 'dd.mm.yy'. @@ -329,9 +329,9 @@ { Q_D(HbDateTimePicker); - if(d->isFormatValid(format)){ + if(d->isFormatValid(format)){ d->mFormat = format; - d->parseDisplayFormat(format); + d->processDisplaySections(); d->rearrangeTumbleViews(); d->emitDateTimeChange(); }//End If format is valid diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/widgets/hbdatetimepicker_p.cpp --- a/src/hbwidgets/widgets/hbdatetimepicker_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/widgets/hbdatetimepicker_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -127,6 +127,9 @@ appendSeparator(&newSeparators, format, index, i - index, lastQuote); i += sn.count - 1; index = i + 1; + if(newDisplay & hour) { + return false; // error in format + } newDisplay |= hour; } break; @@ -137,6 +140,9 @@ appendSeparator(&newSeparators, format, index, i - index, lastQuote); i += sn.count - 1; index = i + 1; + if(newDisplay & MinuteSection) { + return false; // error in format + } newDisplay |= MinuteSection; } break; @@ -147,6 +153,9 @@ appendSeparator(&newSeparators, format, index, i - index, lastQuote); i += sn.count - 1; index = i + 1; + if(newDisplay & SecondSection) { + return false; // error in format + } newDisplay |= SecondSection; } break; @@ -158,6 +167,9 @@ appendSeparator(&newSeparators, format, index, i - index, lastQuote); i += sn.count - 1; index = i + 1; + if(newDisplay & MSecSection) { + return false; // error in format + } newDisplay |= MSecSection; } break; @@ -168,6 +180,9 @@ const SectionNode sn = { AmPmSection, i - add, (cap ? 1 : 0) }; newSectionNodes.append(sn); appendSeparator(&newSeparators, format, index, i - index, lastQuote); + if(newDisplay & AmPmSection) { + return false; // error in format + } newDisplay |= AmPmSection; if (i + 1 < format.size() && format.at(i+1) == (cap ? QLatin1Char('P') : QLatin1Char('p'))) { @@ -186,6 +201,9 @@ appendSeparator(&newSeparators, format, index, i - index, lastQuote); i += sn.count - 1; index = i + 1; + if(newDisplay & sn.type) { + return false; //error in format + } newDisplay |= sn.type; } } @@ -197,6 +215,9 @@ newSeparators.append(unquote(format.mid(index, i - index))); i += sn.count - 1; index = i + 1; + if(newDisplay & MonthSection) { + return false; // error in format + } newDisplay |= MonthSection; } break; @@ -208,6 +229,9 @@ appendSeparator(&newSeparators, format, index, i - index, lastQuote); i += sn.count - 1; index = i + 1; + if(newDisplay & (DayOfWeekSection | DaySection)) { + return false; // error in format, dd and ddd not yet supported in same format + } newDisplay |= sn.type; } break; @@ -350,10 +374,13 @@ mIntervals[QDateTimeEdit::MinuteSection]=1; //read the format from locale - mFormat = localeDateTimeFormat(dateTimeMode); + QString newFormat = localeDateTimeFormat(dateTimeMode); //parse the format and set the sections in order - parseDisplayFormat(mFormat); + if(isFormatValid(newFormat)) { + mFormat=newFormat; + processDisplaySections(); + } //create primitives createPrimitives(); @@ -382,16 +409,16 @@ if(newDisplayFormat == mFormat) { return false; } - return true; + + return mParser.parseFormat(newDisplayFormat); } /* this will reset the display sections and re add them in order mentioned in the display format passed. this also sets the mIs24HourFormat var. */ -void HbDateTimePickerPrivate::parseDisplayFormat(const QString &format) +void HbDateTimePickerPrivate::processDisplaySections() { - if(mParser.parseFormat(format)) { for(int i=0;iindex(mMinuteModel->rowCount() - 1).data().toInt(), - start,end, - &HbDateTimePickerPrivate::localeMinute, - mIntervals[QDateTimeEdit::MinuteSection]); + mMinuteOffset,mMinuteModel->index(mMinuteModel->rowCount() - 1).data().toInt(), + start,end, + &HbDateTimePickerPrivate::localeMinute, + mIntervals[QDateTimeEdit::MinuteSection]); mMinuteOffset = start; //Select the nearest value when the range is set. @@ -1226,7 +1252,7 @@ << newStart << " newEnd=" << newEnd << " interval=" << interval; #endif - bool b1=false,b2=false; + bool b1=false,b2=false; int oldinterval=model->rowCount()>1 ? (model->index(1,0).data().toInt(&b1)-model->index(0,0).data().toInt(&b2)):0; #ifdef HBDATETIMEPICKER_DEBUG qDebug() << "resizeModel:sameoldInterval=" << oldinterval; @@ -1260,10 +1286,10 @@ } return;//optimizing inserts when interval is set } else { - if(b1 && b2) { - model->removeRows(0,model->rowCount()); + if(b1 && b2) { + model->removeRows(0,model->rowCount()); oldStart = oldEnd = 0; - } + } } if((model->rowCount() == 0) && (newEnd-newStart>=0)) { @@ -1627,7 +1653,7 @@ qDebug() << "_q_minutesChanged:" << index; qDebug() << mLocale.toInt(mMinuteModel->index(mMinuteOffset+index,0).data().toString(),bOk, 10); #endif - QTime newTime(mDateTime.time().hour(),mLocale.toInt(mMinuteModel->index(index,0).data().toString(),bOk, 10),mDateTime.time().second()); + QTime newTime(mDateTime.time().hour(),mLocale.toInt(mMinuteModel->index(index,0).data().toString(),bOk, 10),mDateTime.time().second()); if(newTime.isValid()) { mDateTime.setTime(newTime); } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/widgets/hbdatetimepicker_p.h --- a/src/hbwidgets/widgets/hbdatetimepicker_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/widgets/hbdatetimepicker_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -117,7 +117,7 @@ void init(QVariant::Type type = QVariant::Date); QString localeDateTimeFormat(const QVariant::Type &mode); bool isFormatValid(const QString &newFormat); - void parseDisplayFormat(const QString &format); + void processDisplaySections(); void rearrangeTumbleViews(); void makeConnections(); void removeConnections(); diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/widgets/hbgroupbox.cpp --- a/src/hbwidgets/widgets/hbgroupbox.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/widgets/hbgroupbox.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -456,7 +456,7 @@ Q_D ( const HbGroupBox ); if(d->mGroupBoxType == GroupBoxCollapsingContainer) return d->collapsed; - + return false; } @@ -495,7 +495,7 @@ Q_D( const HbGroupBox ); if(d->mHeadingWidget && d->mGroupBoxType == GroupBoxSimpleLabel) return d->mHeadingWidget->marqueeEnabled; - + return false; } @@ -555,7 +555,7 @@ Returns groupbox content widget - There is no default content widget. + There is no default content widget. GroupBox takes care of the ownership of the content widget being set @@ -599,7 +599,7 @@ default: return 0; } - return 0; + return 0; } /*! diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/widgets/hbgroupbox_p.h --- a/src/hbwidgets/widgets/hbgroupbox_p.h Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/widgets/hbgroupbox_p.h Thu Sep 02 20:44:51 2010 +0300 @@ -38,11 +38,11 @@ GroupBoxCollapsingContainer = 0x03, GroupBoxTypeUnknown = 0x04 }; - + /* private class definition */ -class HbGroupBoxPrivate : public HbWidgetPrivate +class HbGroupBoxPrivate : public HbWidgetPrivate { Q_DECLARE_PUBLIC(HbGroupBox) diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/widgets/hbgroupboxcontentwidget_p.cpp --- a/src/hbwidgets/widgets/hbgroupboxcontentwidget_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/widgets/hbgroupboxcontentwidget_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -252,7 +252,7 @@ // set dynamic property for contentwidget, if it is scrollable content // if content is scrollable, then groupBox leaves out margin spacing b/w heading // and content area, otherwise zero margin spacing will be taken - HbScrollArea* scrollContent = qobject_cast( mContent ); + HbScrollArea* scrollContent = qobject_cast( mContent ); if(scrollContent) setProperty("scrollableContent",true); else diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/widgets/hbgroupboxheadingwidget_p.cpp --- a/src/hbwidgets/widgets/hbgroupboxheadingwidget_p.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/widgets/hbgroupboxheadingwidget_p.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -184,7 +184,7 @@ if( groupBoxType == GroupBoxSimpleLabel ){ // marquee is disabled by default for simple label - marqueeEnabled = false; + marqueeEnabled = false; } } diff -r 4633027730f5 -r e6ad4ef83b23 src/hbwidgets/widgets/hbpushbutton.cpp --- a/src/hbwidgets/widgets/hbpushbutton.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbwidgets/widgets/hbpushbutton.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -48,69 +48,116 @@ /*! @beta @hbwidgets + \class HbPushButton - \brief The HbPushButton widget provides a button with command. + \brief The HbPushButton class provides a push button widget, which enables the + user to perform a command. + + A push button widget enables a user to perform an important command. + A push button has a rectangular shape and typically there is a text + describing its command, an icon, and a tooltip shown on the button as in the + following picture. - \image html hbpushbutton.png A pushbutton with text ,icon and tooltip provided . + \image html hbpushbutton.png A push button with a text, an icon, and a tooltip. + + You can set the text and the icon of a push button with HbPushButton() + constructors and change them later with setText() and setIcon(). A push + button also can have an additional text which you can set with + setAdditionalText(). You can set the alignment of the text and additional text + with setTextAlignment() and setAdditionalTextAlignment(). The default value + for the alignment of the text and additional text is the horizontally and vertically + centered alignment. The push button layouts with \a stretched value \c true + and \c false (default) are the following: - A push button enable users to perform important commands easily. - A push button has a rectangular shape and typically displays a text label describing its command. - Push Button can appear in any container except toolbars where ToolButton HbToolButton is used and palettes. - A simple push button can be created as shown in the example below. - \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,16} - - A Push buttons display a textual label. Pushbutton also - can have icon.These can be set using the constructors and changed later using setText(),setIcon( ). - In addition to this a push button also displays additional text label. - Additional text can be set using setAdditionalText(). - Aligning of icon , text and additional text can be changed using setStretched()true/false property. - Default with setStretched()=false it will place icon and text vertically. - - \image html buttonIconTextV.png A pushbutton with icon ,text. - - and along with additional text will place icon horizontally to both texts ,where both text comes vertically aligned. - - \image html buttonIconTextAdditionalTextV.png A pushbutton with icon ,text and additional text. + - Icon and text: + - \a stretched = \c true: The icon and the text are horizontally aligned. + \image html buttonIconTextH.png A stretched push button with an icon and a text. + - \a stretched = \c false: The icon and the text are vertically aligned. + \image html buttonIconTextV.png A non-stretched push button with an icon and a text. + - Icon, text and additional text: + - \a stretched = \c true: The icon and both texts are horizontally aligned in one + line. + \image html buttonIconTextAdditionalTextH.png A stretched push button with an icon, a text and an additional text. + - \a stretched = \c false: Both texts are vertically aligned and an icon is + horizontally aligned in relation to the texts. + \image html buttonIconTextAdditionalTextV.png A non-stretched push button with an icon, a text and an additional text. + - Text and additional text + - \a stretched = \c true: Not applicable. + - \a stretched = \c false: Both texts are vertically aligned. You can use this + layout for a dialer or a virtual keypad button, for example. + \image html buttonTextAdditional.png A non-stretched push button with a text and an additional text. + + Note that a push button does not have a stretched layout by default. - For setStretched()=true, it will stretch layout to have icon and text horizontally,side by side. - - \image html buttonIconTextH.png A pushbutton with icon ,text. + A toggle button is a special type of a push button. The push button becomes + a 'toggle button' -type push button, a 'toggle button' for short, if you set + the \c Checkable property value of a push button to \c true. A toggle button + can be in \c normal, \c highlighted , \c disabled, or \c latched state (see + state descriptions below). Normally you use a toggle button as an on-off + button that varies between \c normal (off) and \c latched (on) states as the + user presses the toggle button. - and along with additional text will place all of them to Horizontally in one line . - - \image html buttonIconTextAdditionalTextH.png A pushbutton with custom icon ,text and additional text. + A push button can have the following states: + - normal: the push button does not have focus (i.e. it is not highlighted) + but the user can press it down. + - highlighted: the push button has focus. + - pressed: the push button is pressed down. + - latched: the push button stays pressed down even though the user does not + press it. + - disabled: the user cannot press down the push button. - Pushbutton can have both text and additoinal text placed vertically,this can be used in case Dialer button or - Virtual key pad buttons with stretched = false.Pushbutton doesn't supports both text in one line - stretched = true is not valid. - Pushbutton will not have stretch layout by default. - - \image html buttonTextAdditional.png A pushbutton with additional text and text. + A push button emits the pressed(), released(), clicked() and toggled() + signals which are inherited from HbAbstractButton as well as + HbPushButton::longPress() signal when a push button is pressed for a long + time. You can use a push button in any container except toolbars with + HbToolButton objects and palettes. + + + \section _usecases_hbpushbutton Using the HbPushButton class + + \subsection _uc_hbpushbutton_001 Creating a push button. + + The following code snippet creates a simple push button. + + \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,16} + + \subsection _uc_hbpushbutton_002 Adding buttons to the layout. + + The push button is derived from HbWidget so it can be added to any + QGraphicsLayout object for defining the layout. The following code snippet + adds a button with "Stop" text and an another button with an image and "Play" + text to a QGraphicsLinearLayout object. Note that QGraphicsLinearLayout + inherits QGraphicsLayout. - Pushbutton can have different states like normal, pressed, disabled, latched and focused. - A push button emits the signal clicked() when it is activated by tapping it. - Push buttons also provide less commonly used signals, for example, pressed() and - released() and emits longPress() on long press. - - Alignment of the text within the text and additionaltext items can be set using - setTextAlignment() and setAdditionalText(), default text alignment is Qt::AlignHCenter | Qt::AlignVCenter - - The push button is derived from HbWidget so it can be added to any QGraphicsLayout - instance for layouting. \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,17} - Push button can also be used as toggle button , following is code snippet - \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,30} + \subsection _uc_hbpushbutton_003 Using a push button as a toggle button. + + The following code snippet creates a push button which is used as a toggle + button. The button has a text, an icon, a tooltip, and its \c Checkable + property value is set to \c true. + + \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,30} - and onOffButton as - \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,29} + \subsection _uc_hbpushbutton_004 Using a push button as an on-off button. + + The following code snippet creates a push button which is used as an on-off + button. The button has an icon, a text, and a tooltip. - Push button will come up with additional text following is code snippet. - 1. Push button with icon , text and additionalText + \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,29} + + \subsection _uc_hbpushbutton_005 Creating a push button with an icon, a text, and an additional text. + + The following code snippet creates a push button with with an icon, a text + and, an additional text. + \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,35} - 2. Pushbutton with additionalText and text. + \subsection _uc_hbpushbutton_006 Creating a push button with a text and an additional text. + + The following code snippet creates a push button with a text, and an additional text. + \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,36} \sa HbAbstractButton , HbToolButton @@ -118,13 +165,15 @@ /*! - \reimp + \fn int HbPushButton::type() const */ /*! \fn void HbPushButton::longPress( QPointF ) - This signal is emitted in case of longpress. + + This signal is emitted when the user presses the push button for a long + time. */ HbPushButtonPrivate::HbPushButtonPrivate() : @@ -235,8 +284,7 @@ } /*! - @beta - Constructs a new HbPushButton with \a parent. + Constructs a push button with \a parent. */ HbPushButton::HbPushButton( QGraphicsItem *parent ) : HbAbstractButton( *new HbPushButtonPrivate, parent ) @@ -249,8 +297,7 @@ } /*! - @beta - Constructs a new HbPushButton with \a text and \a parent. + Constructs a push button with \a text and \a parent. */ HbPushButton::HbPushButton( const QString &text, QGraphicsItem *parent ) : HbAbstractButton( *new HbPushButtonPrivate, parent ) @@ -265,8 +312,7 @@ } /*! - @beta - Constructs a new HbPushButton with \a icon, \a text and \a parent. + Constructs a push button with \a icon, \a text, and \a parent. */ HbPushButton::HbPushButton( const HbIcon &icon, const QString &text, QGraphicsItem *parent ) : HbAbstractButton( *new HbPushButtonPrivate, parent ) @@ -281,7 +327,7 @@ } /*! - Destructs the push button. + Destructor. */ HbPushButton::~HbPushButton( ) { @@ -289,10 +335,8 @@ } /*! - @beta - Sets the \a background of the button. - - \note The background can contain different images for pressed and released states. + Sets the \a background shown on a push button. The background of a push + button can have different images for pressed and released states. \sa background() */ @@ -309,8 +353,7 @@ } /*! - @beta - Returns the background of the button. + Returns the background shown on a push button. \sa setBackground() */ @@ -321,11 +364,10 @@ } /*! - @beta - Sets the \a framebackground of the button. - - \note The background can contain different types of frame drawers(Nine piece, - three piece or single).Ownership is transferred to the Pushbutton + Sets the \a frame background shown on a push button. The frame background + of a push button can have the following types of frame drawers: 9-piece, 3- + piece horizontal, 3-piece vertical, and single. The ownership is transferred + to the push button. \sa frameBackground() */ @@ -342,8 +384,7 @@ } /*! - @beta - Returns the background of the button. + Returns the background shown on a push button. \sa setBackground() */ @@ -355,8 +396,7 @@ /*! - @beta - Sets the \a text shown on the button. + Sets the \a text shown on a push button. \sa text() */ @@ -384,8 +424,7 @@ /*! - @beta - Returns the text shown on the button. + Returns the text shown on a push button. \sa setText() */ @@ -397,15 +436,18 @@ /*! - @beta - Sets the \a additional text shown on the button. - Additional text is only shown in case - 1. with icon and text in Qt::Horizontal alignment. - 2. with icon and text where both the texts are aligned vertically and icon placed horizontally in relation to texts. - 3. with additionalText and text in Qt::Vertical alignment. + Sets the additional text shown on a push button, defined by \a + additionalText. Additional text is only shown on the button in the following + cases: + + - Icon, text, and additional text are horizontally aligned in one line. + - Text and additional text are vertically aligned and icon is horizontally + aligned in relation to the texts. + - Text and additional text are vertically aligned. \sa additionalText() */ + void HbPushButton::setAdditionalText( const QString &additionalText ) { Q_D( HbPushButton ); @@ -429,8 +471,7 @@ } /*! - @beta - Returns the additional text shown on the button. + Returns the additional text shown on a push button. \sa setAdditionalText() */ @@ -441,10 +482,9 @@ } /*! - @beta - Sets the \a icon shown on the button. - - \note The icon can contain images for different modes. + + Sets the \a icon shown on a push button. Each icon mode can have a + different image. \sa icon() */ @@ -474,8 +514,8 @@ } /*! - @beta - Returns the icon shown on the button. + Returns the icon shown on a push button. + \sa setIcon() */ @@ -486,21 +526,21 @@ } /*! - @beta - Set the text alignment for primarytext. - The default alignment is Qt::AlignHCenter | Qt::AlignVCenter. + Sets the alignment for the text. The default alignment is + horizontally and vertically aligned. + \sa textAlignment() */ void HbPushButton::setTextAlignment( Qt::Alignment alignment ) { Q_D( HbPushButton ); - //HbWidgetBase* textItem = static_cast(d->textItem); + //HbWidgetBase* textItem = static_cast(d->textItem); if( !d->textItem ) { //need to create text item if user call alignment api before setText. d->textItem = HbStylePrivate::createPrimitive( HbStylePrivate::P_PushButton_text, this); } - //HbWidgetBasePrivate *textItem_p = HbWidgetBasePrivate::d_ptr(textItem); + //HbWidgetBasePrivate *textItem_p = HbWidgetBasePrivate::d_ptr(textItem); // check for textitem and api protection flag if( alignment != d->textAlignment ){ //take the alignment @@ -517,8 +557,8 @@ } /*! - @beta - Returns the text alignment for primary text. + Returns the text alignment for the text. + \sa setTextAlignment() */ Qt::Alignment HbPushButton::textAlignment( ) const @@ -529,16 +569,16 @@ /*! - @beta - Set the text alignment for additional text. - The default alignment is Qt::AlignHCenter | Qt::AlignVCenter. + Sets the \a alignment for the additional text. The default alignment is + horizontally and vertically centered alignment. + \sa additionalTextAlignment() */ void HbPushButton::setAdditionalTextAlignment( Qt::Alignment alignment ) { Q_D( HbPushButton ); - //HbWidgetBase* additionalTextItem = static_cast(d->additionalTextItem); + //HbWidgetBase* additionalTextItem = static_cast(d->additionalTextItem); if(!d->additionalTextItem) { //need to create text item if user call alignment api before setAdditionalText. d->additionalTextItem = HbStylePrivate::createPrimitive( HbStylePrivate::P_PushButton_additionaltext, this); @@ -558,8 +598,8 @@ } /*! - @beta - Returns the text alignment for additional text + Returns the text alignment for the additional text. + \sa setAdditionalTextAlignment() */ Qt::Alignment HbPushButton::additionalTextAlignment( ) const @@ -569,16 +609,20 @@ } /*! - @beta - Sets the stretched layout for button by default it set to true. setStretched true/false. - For the case icon and text with value false will appear icon and text vertically aligned. - and with value true will appear icon and text horizontally aligned. - For the case icon , text and additional text with value false will appear like - both text will be vertically aligned and icon will be horizontally. - and with value true icon , text and additionaltext will come horizontally aligned in one line - For the case text and additonaltext(dialer button case ) only value false is applicable and both texts will - appeare vertically - + Sets the alignment of an icon, a text and an additional text for stretched and non- + stretched layouts of a push button. The push button layouts with \a + stretched value \c true and \c false (default) are the following: + + - Icon and text: + - \c true: Icon and text are horizontally aligned. + - \c false: Icon and text are vertically aligned. + - Icon, text and additional text: + - \c true: Icon and both texts are horizontally aligned in one line. + - \c false: Both texts are vertically aligned and icon is horizontally aligned. + - Text and additonal text (a dialer push button case): + - \c true: Not applicable. + - \c false: Both texts are vertically aligned. + \sa isStretched() */ void HbPushButton::setStretched( bool stretched ) @@ -591,8 +635,9 @@ } /*! - @beta - Returns the whether button has streteched layout or not. + Returns \c true if the push button has streteched layout, otherwise returns + \c false. + \sa setStretched () */ bool HbPushButton::isStretched() const @@ -603,10 +648,9 @@ /*! - \deprecated HbPushButton::primitive(HbStyle::Primitive) - is deprecated. + \deprecated HbPushButton::primitive(HbStyle::Primitive) is deprecated. - \reimp + */ QGraphicsItem *HbPushButton::primitive( HbStyle::Primitive primitive ) const { @@ -631,12 +675,12 @@ } /*! - \reimp + */ void HbPushButton::recreatePrimitives() { Q_D( HbPushButton ); - HbWidget::recreatePrimitives(); + HbWidget::recreatePrimitives(); delete d->frameItem; d->frameItem = 0; @@ -654,8 +698,9 @@ d->createPrimitives( ); setFrameBackground( 0 ); } + /*! - \reimp + */ void HbPushButton::updatePrimitives() { @@ -694,11 +739,13 @@ { } -/*! - \reimp - Initializes \a option with the values from this HbPushButton. - This method is useful for subclasses when they need a HbStyleOptionPushButton, - but don't want to fill in all the information themselves. +/*! + + Initializes the style option push button defined by \a option with the push + button values. This method is useful for setting the style option push button + values of the subclasses. + + \param option Style option push button to be initialized. */ void HbPushButton::initStyleOption( HbStyleOptionPushButton *option ) const { @@ -724,7 +771,7 @@ } /*! - \reimp + */ void HbPushButton::keyPressEvent(QKeyEvent *event) { @@ -760,7 +807,7 @@ /*! - \reimp + */ void HbPushButton::keyReleaseEvent(QKeyEvent *event) { @@ -792,7 +839,7 @@ } /*! - \reimp + */ void HbPushButton::mousePressEvent( QGraphicsSceneMouseEvent *event ) { @@ -817,7 +864,7 @@ #ifndef HB_GESTURE_FW /*! - \reimp + */ void HbPushButton::mouseReleaseEvent( QGraphicsSceneMouseEvent *event ) { @@ -837,7 +884,7 @@ } /*! - \reimp + */ void HbPushButton::mouseMoveEvent( QGraphicsSceneMouseEvent *event ) { @@ -858,6 +905,7 @@ #ifdef HB_GESTURE_FW + void HbPushButton::gestureEvent( QGestureEvent *event ) { Q_D(HbPushButton); @@ -907,14 +955,15 @@ /*! - \reimp + */ void HbPushButton::resizeEvent( QGraphicsSceneResizeEvent *event ) { HbAbstractButton::resizeEvent( event ); } + /*! - reimp + */ void HbPushButton::polish( HbStyleParameters ¶ms ) @@ -929,7 +978,7 @@ /*! - \reimp + */ void HbPushButton::focusInEvent( QFocusEvent *event ) { @@ -951,7 +1000,7 @@ } /*! - \reimp + */ void HbPushButton::focusOutEvent( QFocusEvent *event ) { @@ -963,7 +1012,7 @@ } /*! - \reimp + */ QVariant HbPushButton::itemChange(GraphicsItemChange change, const QVariant &value) { @@ -984,7 +1033,7 @@ } /*! - Overloaded hit detection to include touch area + Overloaded hit detection to include touch area. */ bool HbPushButton::hitButton( const QPointF &pos ) const { diff -r 4633027730f5 -r e6ad4ef83b23 src/platforms/symbian/configurations/symbian_configurations.pri --- a/src/platforms/symbian/configurations/symbian_configurations.pri Wed Aug 18 10:05:37 2010 +0300 +++ b/src/platforms/symbian/configurations/symbian_configurations.pri Thu Sep 02 20:44:51 2010 +0300 @@ -28,15 +28,15 @@ # Backup registration files symbian { - BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/backup_20022E82/backup_registration.xml $${EPOCROOT}epoc32/winscw/c/private/20022E82/backup_registration.xml" - BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/backup_20022E82/backup_registration.xml $${EPOCROOT}epoc32/data/z/private/20022E82/backup_registration.xml" + hbPrjExport("$${PWD}/backup_20022E82/backup_registration.xml", "$${EPOCROOT}epoc32/winscw/c/private/20022E82/backup_registration.xml") + hbPrjExport("$${PWD}/backup_20022E82/backup_registration.xml", "$${EPOCROOT}epoc32/data/z/private/20022E82/backup_registration.xml") } # Configuration files symbian { - BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/hbtheme_confml/hbtheme.confml MW_LAYER_CONFML(hbtheme.confml) - BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/hbtheme_confml/CI_hbtheme.confml MW_LAYER_CONFML(CI_hbtheme.confml) - BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/hbtheme_confml/hbtheme.implml MW_LAYER_CRML(hbtheme.implml) - BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/hbtheme_confml/hbtheme.py MW_LAYER_CRML(scripts/hbtheme.py) - BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/hbtheme_confml/hbtheme_20022e82.crml MW_LAYER_CRML(hbtheme_20022e82.crml) + hbPrjExport("$${PWD}/hbtheme_confml/hbtheme.confml", "MW_LAYER_CONFML(hbtheme.confml)") + hbPrjExport("$${PWD}/hbtheme_confml/CI_hbtheme.confml", "MW_LAYER_CONFML(CI_hbtheme.confml)") + hbPrjExport("$${PWD}/hbtheme_confml/hbtheme.implml", "MW_LAYER_CRML(hbtheme.implml)") + hbPrjExport("$${PWD}/hbtheme_confml/hbtheme.py", "MW_LAYER_CRML(scripts/hbtheme.py)") + hbPrjExport("$${PWD}/hbtheme_confml/hbtheme_20022e82.crml", "MW_LAYER_CRML(hbtheme_20022e82.crml)") } diff -r 4633027730f5 -r e6ad4ef83b23 src/platforms/symbian/installs/symbian_deployment.pri --- a/src/platforms/symbian/installs/symbian_deployment.pri Wed Aug 18 10:05:37 2010 +0300 +++ b/src/platforms/symbian/installs/symbian_deployment.pri Thu Sep 02 20:44:51 2010 +0300 @@ -40,8 +40,8 @@ orbitBinaries.pkg_prerules = vendorinfo orbitHeader orbitBinaries.sources = hbthemechanger.exe hbsplashgenerator.exe hbdevicedialogappserver.exe \ - HbDeviceNotificationDialogPlugin.dll HbIndicatorMenuPlugin.dll HbDeviceProgressDialogPlugin.dll HbDeviceMessageBoxPlugin.dll \ - hbthemeserveroogmplugin.dll hbthemeserver.exe HbIm.dll + HbDeviceNotificationDialogPlugin.dll HbIndicatorMenuPlugin.dll HbDeviceProgressDialogPlugin.dll HbDeviceMessageBoxPlugin.dll \ + hbthemeserveroogmplugin.dll hbthemeserver.exe HbIm.dll orbitBinaries.path = !:/sys/bin DEPLOYMENT += orbitBinaries