Binary file bin/hbthemeindexer_symbian.exe has changed
--- a/bin/synchb.py Thu May 27 13:10:59 2010 +0300
+++ b/bin/synchb.py Fri Jun 11 13:58:22 2010 +0300
@@ -89,12 +89,11 @@
print(e)
def include_directive(header):
- return "#include \"%s\"\n" % header
+ return "#include \"%s\"\n" % header.replace("\\", "/")
def write_header(header, include, path):
filename = os.path.basename(header)
filepath = os.path.join(path, filename)
- relpath = os.path.relpath(header, path).replace("\\", "/")
skip = False
if os.path.exists(filepath):
directive = include_directive(include)
@@ -115,6 +114,7 @@
self.name = name
self.headers = []
self.privates = []
+ self.restricted = []
def read(self, path):
entries = os.listdir(path)
@@ -123,10 +123,12 @@
if os.path.isdir(entrypath):
self.read(entrypath)
elif os.path.isfile(entrypath):
- if entry.endswith("_p_p.h"):
+ if re.match(entry, ".*?_[pr]_[pr]\.h"):
continue
elif entry.endswith("_p.h"):
self.privates.append(entrypath)
+ elif entry.endswith("_r.h"):
+ self.restricted.append(entrypath)
elif entry.endswith(".h"):
self.headers.append(entrypath)
@@ -136,6 +138,11 @@
self._makedirs(path)
written += self._write(path, self.headers, True)
+ if len(self.restricted) > 0:
+ restpath = os.path.join(path, "restricted")
+ self._makedirs(restpath)
+ written += self._write(restpath, self.restricted, True)
+
if len(self.privates) > 0:
privpath = os.path.join(path, "private")
self._makedirs(privpath)
@@ -145,12 +152,12 @@
def _write(self, path, headers, convenience):
written = []
for header in headers:
- write_header(header, header, path)
+ write_header(header, os.path.relpath(header, path), path)
written.append(os.path.join(path, os.path.basename(header)))
if convenience:
classes = []
content = read_file(header)
- for match in re.finditer("(?:class|namespace)\s+(?:HB_[^_]+_EXPORT\s+)?(Hb\w*)(\s*;)?", content):
+ for match in re.finditer("(?:class|namespace)\s+(?:HB_[^_]+(?:_RESTRICTED)?_EXPORT\s+)?(Hb\w*)(\s*;)?", content):
if not match.group(2):
classes.append(match.group(1))
for match in re.finditer("#pragma hb_header\((\w+)\)", content):
--- a/config.tests/symbian/sgimagelite/sgimagelite.pro Thu May 27 13:10:59 2010 +0300
+++ b/config.tests/symbian/sgimagelite/sgimagelite.pro Fri Jun 11 13:58:22 2010 +0300
@@ -30,6 +30,8 @@
DEPENDPATH += .
INCLUDEPATH += .
CONFIG -= qt
+CONFIG += no_icon
+QMAKE_LIBS = -llibc -llibm -leuser -llibdl
#INCLUDEPATH += $${EPOCROOT}epoc32/include
# Input
--- a/configure.py Thu May 27 13:10:59 2010 +0300
+++ b/configure.py Fri Jun 11 13:58:22 2010 +0300
@@ -64,13 +64,14 @@
def run_process(args, cwd=None):
code = 0
output = ""
- if os.name == "nt":
- env = os.environ.copy()
+
+ env = os.environ.copy()
+ if "EPOCROOT" in env:
epocroot = env.get("EPOCROOT")
- if epocroot:
- if not epocroot.endswith("\\") or epocroot.endswith("/"):
- env["EPOCROOT"] = "%s/" % epocroot
-
+ if not (epocroot.endswith("\\") or epocroot.endswith("/")):
+ env["EPOCROOT"] = "%s/" % epocroot
+
+ if os.name == "nt":
args = ["cmd.exe", "/C"] + args
try:
@@ -82,17 +83,11 @@
code = process.wait()
output = process.fromchild.read()
else:
- if os.name == "nt":
- process = subprocess.Popen(args, env=env, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
- (stdout, stderr) = process.communicate()
- code = process.returncode
- output = stdout + stderr
- else:
- process = subprocess.Popen(args, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
- (stdout, stderr) = process.communicate()
- code = process.returncode
- output = stdout + stderr
-
+ process = subprocess.Popen(args, env=env, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
+ (stdout, stderr) = process.communicate()
+ code = process.returncode
+ output = stdout + stderr
+
if cwd != None:
os.chdir(oldcwd)
except:
@@ -715,10 +710,10 @@
if platform.name() == "symbian":
if os.path.isdir("/s60"):
config.set_value("HB_EXPORT_DIR", "hb/%1/%2")
- config.set_value("HB_PRIVATE_EXPORT_DIR", "hb/%1/private/%2")
+ config.set_value("HB_RESTRICTED_EXPORT_DIR", "hb/%1/restricted/%2")
else:
config.set_value("HB_EXPORT_DIR", "$${EPOCROOT}epoc32/include/mw/hb/%1/%2")
- config.set_value("HB_PRIVATE_EXPORT_DIR", "$${EPOCROOT}epoc32/include/mw/hb/%1/private/%2")
+ config.set_value("HB_RESTRICTED_EXPORT_DIR", "$${EPOCROOT}epoc32/include/mw/hb/%1/restricted/%2")
if options.developer:
add_remove_part("tests", True)
@@ -831,6 +826,7 @@
args += ["--exclude", "\"*.qrc\""]
args += ["--exclude", "\"*~\""]
args += ["--exclude", "variant/*"]
+ args += ["--exclude", "\"*css.bin\""]
if options.verbose:
print("INFO: Running %s" % " ".join(args))
os.system("python %s" % " ".join(args))
@@ -857,15 +853,6 @@
if options.qmakebin:
qmake = options.qmakebin
- # modify epocroot for symbian to have compatibility between qmake and raptor
- epocroot = os.environ.get("EPOCROOT")
- replace_epocroot = epocroot
- if epocroot:
- if epocroot.endswith("\\") or epocroot.endswith("/"):
- replace_epocroot = epocroot
- else:
- replace_epocroot = "%s/" % epocroot
-
profile = os.path.join(sourcedir, "hb.pro")
cachefile = os.path.join(currentdir, ".qmake.cache")
if options.msvc:
@@ -881,12 +868,20 @@
else:
print("\nRunning qmake...")
try:
- # replace the epocroot for the qmake runtime
- if replace_epocroot:
- os.putenv("EPOCROOT", replace_epocroot)
- ret = os.system("%s -cache %s %s" % (qmake, cachefile, profile))
- if replace_epocroot:
- os.putenv("EPOCROOT", epocroot)
+
+ # modify epocroot for symbian to have compatibility between qmake and raptor
+ env = os.environ.copy()
+ if "EPOCROOT" in env:
+ epocroot = env.get("EPOCROOT")
+ if not (epocroot.endswith("\\") or epocroot.endswith("/")):
+ os.putenv("EPOCROOT", "%s/" % epocroot)
+ ret = os.system("%s -cache %s %s" % (qmake, cachefile, profile))
+ os.putenv("EPOCROOT", epocroot)
+ else:
+ ret = os.system("%s -cache %s %s" % (qmake, cachefile, profile))
+ else:
+ ret = os.system("%s -cache %s %s" % (qmake, cachefile, profile))
+
except KeyboardInterrupt:
ret = -1
if ret != 0:
@@ -907,7 +902,19 @@
print("\nRunning %s %s" % (qmake, profile))
else:
print("\nRunning qmake in tsrc...")
- os.system("%s %s" % (qmake, profile))
+
+ # epocroot cecking also for tests
+ env = os.environ.copy()
+ if "EPOCROOT" in env:
+ epocroot = env.get("EPOCROOT")
+ if not (epocroot.endswith("\\") or epocroot.endswith("/")):
+ os.putenv("EPOCROOT", "%s/" % epocroot)
+ os.system("%s %s" % (qmake, profile))
+ os.putenv("EPOCROOT", epocroot)
+ else:
+ os.system("%s %s" % (qmake, profile))
+ else:
+ os.system("%s %s" % (qmake, profile))
os.chdir(currentdir)
# create output dirs
--- a/hb.prf Thu May 27 13:10:59 2010 +0300
+++ b/hb.prf Fri Jun 11 13:58:22 2010 +0300
@@ -30,7 +30,7 @@
symbian:CONFIG += symbian_i18n skin_icon
include(hb_install.prf)
-include(docml2bin.prf)
+#include(docml2bin.prf)
CONFIG(debug, debug|release) {
win32:SUFFIX = d
--- a/hb.pro Thu May 27 13:10:59 2010 +0300
+++ b/hb.pro Fri Jun 11 13:58:22 2010 +0300
@@ -25,6 +25,7 @@
#############################################################################
#
+
TEMPLATE = subdirs
CONFIG += root
@@ -34,12 +35,22 @@
SUBDIRS += tutorials
}
-feature.files += $$HB_SOURCE_DIR/hb.prf
-feature.files += $$HB_BUILD_DIR/hb_install.prf
-feature.files += $$HB_MKSPECS_DIR/hb_functions.prf
-feature.files += $$HB_MKSPECS_DIR/docml2bin.prf
-feature.path = $$HB_FEATURES_DIR
-INSTALLS += feature
+!symbian {
+ feature.files += $$HB_SOURCE_DIR/hb.prf
+ feature.files += $$HB_BUILD_DIR/hb_install.prf
+ feature.files += $$HB_MKSPECS_DIR/hb_functions.prf
+ feature.files += $$HB_MKSPECS_DIR/docml2bin.prf
+ feature.path = $$HB_FEATURES_DIR
+ INSTALLS += feature
+}
+else {
+ tmp = $$split(HB_FEATURES_DIR, :)
+ HB_SYMBIAN_PRF_EXPORT_DIR = $$last(tmp)
+ BLD_INF_RULES.prj_exports += "hb.prf $$HB_SYMBIAN_PRF_EXPORT_DIR/hb.prf"
+ BLD_INF_RULES.prj_exports += "hb_install.prf $$HB_SYMBIAN_PRF_EXPORT_DIR/hb_install.prf"
+ BLD_INF_RULES.prj_exports += "mkspecs/hb_functions.prf $$HB_SYMBIAN_PRF_EXPORT_DIR/hb_functions.prf"
+ BLD_INF_RULES.prj_exports += "mkspecs/docml2bin.prf $$HB_SYMBIAN_PRF_EXPORT_DIR/docml2bin.prf"
+}
QMAKE_DISTCLEAN += $$hbNativePath($$HB_BUILD_DIR/.qmake.cache)
QMAKE_DISTCLEAN += $$hbNativePath($$HB_BUILD_DIR/hb_install.prf)
@@ -51,34 +62,13 @@
symbian {
exists(rom):include(rom/rom.pri)
- install.depends += index hbvar
- #install.depends += cssbinary
+ install.depends += hbvar
+# install.depends += cssbinary
install.commands += $$QMAKE_COPY $$hbNativePath($$HB_SOURCE_DIR/hb.prf) $$hbNativePath($$[QMAKE_MKSPECS]/features)
install.commands += && $$QMAKE_COPY $$hbNativePath($$HB_BUILD_DIR/hb_install.prf) $$hbNativePath($$[QMAKE_MKSPECS]/features)
+ install.commands += && $$QMAKE_COPY $$hbNativePath($$HB_SOURCE_DIR/mkspecs/hb_functions.prf) $$hbNativePath($$[QMAKE_MKSPECS]/features)
+ install.commands += && $$QMAKE_COPY $$hbNativePath($$HB_BUILD_DIR/mkspecs/docml2bin.prf) $$hbNativePath($$[QMAKE_MKSPECS]/features)
QMAKE_EXTRA_TARGETS += install
- BLD_INF_RULES.prj_exports += "sis/hb_stub.sis /epoc32/data/z/system/install/hb_stub.sis"
-}
-
-# theme indexing
-
-symbian:HB_THEMES_DIR = $${EPOCROOT}epoc32/data/z/resource/hb/themes
-else:HB_THEMES_DIR = $(HB_THEMES_DIR)/themes
-isEmpty(HB_THEMES_DIR):index.commands += echo HB_THEMES_DIR environment variable not set
-else {
- index.path = .
- index.name = hbdefault
- index.source = $$PWD/src/hbcore/resources/themes/icons/hbdefault
- index.targets = $$HB_THEMES_DIR
- symbian {
- index.targets += $${EPOCROOT}epoc32/release/winscw/urel/z/resource/hb/themes
- index.targets += $${EPOCROOT}epoc32/release/winscw/udeb/z/resource/hb/themes
- }
- for(index.target, index.targets) {
- !isEmpty(index.commands):index.commands += &&
- index.commands += $$hbToolCommand(hbthemeindexer) -n $$index.name -s $$index.source -t $$index.target
- }
- QMAKE_EXTRA_TARGETS += index
- INSTALLS += index
}
# css binary generation
@@ -98,7 +88,7 @@
}
QMAKE_EXTRA_TARGETS += cssbinary
-# INSTALLS += cssbinary
+#INSTALLS += cssbinary
!contains(HB_NOMAKE_PARTS, tests):exists(tsrc) {
test.depends = sub-src
--- a/layers.sysdef.xml Thu May 27 13:10:59 2010 +0300
+++ b/layers.sysdef.xml Fri Jun 11 13:58:22 2010 +0300
@@ -5,6 +5,11 @@
<SystemDefinition name="hb" schema="1.5.1">
<systemModel>
+ <layer name="tools_layer">
+ <module name="hbconf">
+ <unit unitID="qtdo.hb.hbconf" mrp="" bldFile="&layer_real_source_path;/src/symbian_installs" name="hbconf" />
+ </module>
+ </layer>
<layer name="mw_layer">
<module name="qtdo.hb">
<unit name="qtdo.hb" unitID="qtdo.hb" bldFile="&layer_real_source_path;" mrp=""/>
--- a/mkspecs/hb_functions.prf Thu May 27 13:10:59 2010 +0300
+++ b/mkspecs/hb_functions.prf Fri Jun 11 13:58:22 2010 +0300
@@ -48,8 +48,10 @@
LIBRARY = $$last(PARTS)
INCLUDEPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}
+ INCLUDEPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}/restricted
INCLUDEPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}/private
DEPENDPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}
+ DEPENDPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}/restricted
DEPENDPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}/private
LIBS *= -L$${HB_BUILD_DIR}/lib
@@ -66,7 +68,7 @@
}
# params: <collection>
-# NOTE: PUBLIC_HEADERS, INTERNAL_HEADERS, CONVENIENCE_HEADERS
+# NOTE: exports PUBLIC_HEADERS, RESTRICTED_HEADERS and CONVENIENCE_HEADERS
# eg. hbExportHeaders(hbcore)
defineTest(hbExportHeaders) {
for(PUBLIC_HEADER, PUBLIC_HEADERS) {
@@ -74,12 +76,11 @@
EXPORT_PATH = $$sprintf($$HB_EXPORT_DIR, $$1, $$basename(PUBLIC_HEADER))
BLD_INF_RULES.prj_exports *= "$$PUBLIC_HEADER $$EXPORT_PATH"
}
- # DO NOT EXPORT PRIVATE HEADERS!
- #for(INTERNAL_HEADER, INTERNAL_HEADERS) {
- # INTERNAL_HEADER = $$section(INTERNAL_HEADER, ":", 1)
- # EXPORT_PATH = $$sprintf($$HB_PRIVATE_EXPORT_DIR, $$1, $$basename(INTERNAL_HEADER))
- # BLD_INF_RULES.prj_exports *= "$$INTERNAL_HEADER $$EXPORT_PATH"
- #}
+ for(RESTRICTED_HEADER, RESTRICTED_HEADERS) {
+ RESTRICTED_HEADER = $$section(RESTRICTED_HEADER, ":", 1)
+ EXPORT_PATH = $$sprintf($$HB_RESTRICTED_EXPORT_DIR, $$1, $$basename(RESTRICTED_HEADER))
+ BLD_INF_RULES.prj_exports *= "$$RESTRICTED_HEADER $$EXPORT_PATH"
+ }
for(CONVENIENCE_HEADER, CONVENIENCE_HEADERS) {
CONVENIENCE_HEADER = $$section(CONVENIENCE_HEADER, ":", 1)
EXPORT_PATH = $$sprintf($$HB_EXPORT_DIR, $$1, $$basename(CONVENIENCE_HEADER))
--- a/src/hbapps/hbthemechanger/hbthemechanger.pro Thu May 27 13:10:59 2010 +0300
+++ b/src/hbapps/hbthemechanger/hbthemechanger.pro Fri Jun 11 13:58:22 2010 +0300
@@ -36,6 +36,7 @@
# dependencies
hbAddLibrary(hbcore/HbCore)
hbAddLibrary(hbwidgets/HbWidgets)
+hbAddLibrary(hbutils/HbUtils)
# Input
HEADERS += themechangerdefs.h
@@ -45,11 +46,6 @@
symbian {
TARGET.CAPABILITY += WriteDeviceData
- HEADERS += themeclientsymbian.h
- SOURCES += themeclientsymbian.cpp
-} else {
- HEADERS += themeclientqt.h
- SOURCES += themeclientqt.cpp
}
# installation
--- a/src/hbapps/hbthemechanger/themechangermain.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbapps/hbthemechanger/themechangermain.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -28,11 +28,6 @@
#include "themechangerdefs.h"
#include "themeselectionlist.h"
#include <QTextStream>
-#ifdef Q_OS_SYMBIAN
-#include "themeclientsymbian.h"
-#else
-#include "themeclientqt.h"
-#endif
#ifdef THEME_CHANGER_TIMER_LOG
void debugOutput(QtMsgType type, const char *msg)
@@ -70,15 +65,8 @@
// Includes decorators such as signal strength and battery life indicator.
HbMainWindow mainWindow;
-#ifdef Q_OS_SYMBIAN
- ThemeClientSymbian* client = new ThemeClientSymbian();
-#else
- // Create the theme server that does the notifiation to all the QT apps
- ThemeClientQt* client = new ThemeClientQt();
-#endif
-
// Show the list of themes available
- ThemeSelectionList *themelist=new ThemeSelectionList(client);
+ ThemeSelectionList *themelist=new ThemeSelectionList();
themelist->displayThemes();
mainWindow.addView( themelist );
--- a/src/hbapps/hbthemechanger/themeclientqt.cpp Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +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 HbApps 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 <QLocalSocket>
-#include <QDebug>
-#include <hbinstance.h>
-
-#include "themeclientqt.h"
-#include "themechangerdefs.h"
-#include "hbthemecommon_p.h"
-
-/**
- * Constructor
- */
-ThemeClientQt::ThemeClientQt()
-{
-#ifdef THEME_CHANGER_TRACES
- qDebug() << Q_FUNC_INFO;
-#endif
- localSocket = new QLocalSocket();
- connected = false;
-}
-
-bool ThemeClientQt::connectToServer()
-{
- localSocket->connectToServer(THEME_SERVER_NAME);
- bool success = localSocket->waitForConnected(3000);
-#ifdef THEME_CHANGER_TRACES
- qDebug() << "ThemeClientQt:: Socket Connect status: " <<success;
-#endif
- connected = success;
- return success;
-}
-
-/**
- * Destructor
- */
-ThemeClientQt::~ThemeClientQt()
-{
- if (connected) {
- localSocket->disconnectFromServer();
- }
- delete localSocket;
-}
-
-/**
- * changeTheme
- */
-void ThemeClientQt::changeTheme(const QString &newtheme)
-{
-#ifdef THEME_CHANGER_TRACES
- qDebug() <<"ThemeClientQt::changeTheme("<<newtheme<<") called";
-#endif
- if( (themeName==newtheme) || (newtheme =="") ) {
-#ifdef THEME_CHANGER_TRACES
- qDebug() <<"ThemeClientQt:: return Sametheme applied";
-#endif
- return;
- }
- QByteArray outputByteArray;
- QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
- HbThemeServerRequest requestType = EThemeSelection;
- outputDataStream << (int)requestType;
- outputDataStream << newtheme;
- themeName = newtheme;
- localSocket->write(outputByteArray);
-#ifdef THEME_CHANGER_TRACES
- qDebug()<<"ThemeClientQt::ThemeName written to server";
-#endif
- localSocket->flush();
-}
-
-
-/**
- * isConnected
- */
-bool ThemeClientQt::isConnected()
-{
- return connected;
-}
--- a/src/hbapps/hbthemechanger/themeclientqt.h Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +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 HbApps 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 THEMECLIENTQT_H
-#define THEMECLIENTQT_H
-
-#include <QObject>
-#include <QString>
-
-class QLocalSocket;
-
-class ThemeClientQt : public QObject
-{
-
- Q_OBJECT
-
-public:
- ThemeClientQt();
- bool connectToServer();
- bool isConnected();
- ~ThemeClientQt();
-
-public slots:
- void changeTheme(const QString &newtheme);
-
-private:
- QLocalSocket* localSocket;
- QString themeName;
- bool connected;
-};
-
-
-#endif // THEMECLIENTQT_H
--- a/src/hbapps/hbthemechanger/themeclientsymbian.cpp Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +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 HbApps 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 "themeclientsymbian.h"
-#include <e32property.h>
-#include <QDebug>
-
-
-const TUint kDefaultMessageSlots=4;
-
-
-/**
- * Constructor
- */
-ThemeClientSymbian::ThemeClientSymbian(): connected(false)
-{
-}
-
-
-/**
- * Connects to the server using 4 message slots.
- */
-bool ThemeClientSymbian::connectToServer()
-{
- qDebug() << "HbSymbianThemeClient::Connect ++";
-
- TInt error = CreateSession(KThemeServerName,Version(),kDefaultMessageSlots);
-
- if (KErrNone != error) {
- qDebug() << "ThemeClientSymbian:: could not create session" << error;
- }
- connected = (KErrNone == error);
- return (KErrNone == error);
-}
-
-
-/**
- * Returns the earliest version number of the server that we can tal to.
- */
-TVersion ThemeClientSymbian::Version(void) const
-{
- return(TVersion(KThemeServerMajorVersionNumber,KThemeServerMinorVersionNumber,KThemeServerBuildVersionNumber));
-}
-
-
-/**
- * Closing the server and tidying up.
- */
-void ThemeClientSymbian::Close()
-{
- RSessionBase::Close();
-}
-
-/**
- * changeTheme
- */
-TInt ThemeClientSymbian::changeTheme(const QString& aString )
-{
- TInt err = KErrGeneral;
- RProperty themeRequestProp;
-
- User::LeaveIfError( themeRequestProp.Attach( KServerUid3, KNewThemeForThemeChanger ) );
-
- TBuf<256> newThemenameChangeRequest;
- _LIT(KThemeRequestFormatter, "%d:%S");
- TBuf<256> newThemename(aString.utf16());
- newThemenameChangeRequest.Format( KThemeRequestFormatter, EThemeSelection, &newThemename);
- err = themeRequestProp.Set(newThemenameChangeRequest);
- themeRequestProp.Close();
- return err;
-}
-
-bool ThemeClientSymbian::isConnected()
-{
- return connected;
-}
--- a/src/hbapps/hbthemechanger/themeclientsymbian.h Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +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 HbApps 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 THEMECLIENTSYMBIAN_H
-#define THEMECLIENTSYMBIAN_H
-
-#include <QString>
-#include <e32base.h>
-#include "hbthemecommon_symbian_p.h"
-#include "hbthemecommon_p.h"
-
-class ThemeClientSymbian : public RSessionBase
-{
-public:
- ThemeClientSymbian();
- bool connectToServer();
- TVersion Version() const;
- TInt changeTheme(const QString& aString);
- void Close();
- bool isConnected();
- bool connected;
-};
-
-#endif /* THEMECLIENTSYMBIAN_H */
--- a/src/hbapps/hbthemechanger/themeselectionlist.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbapps/hbthemechanger/themeselectionlist.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -31,6 +31,7 @@
#include <hbaction.h>
#include <hbicon.h>
#include <hblistwidgetitem.h>
+#include <restricted/hbthemeservices_r.h>
#include <QDebug>
#include <QTime>
#include <QThread>
@@ -41,18 +42,11 @@
/**
* Constructor
*/
-ThemeSelectionList::ThemeSelectionList(
-#ifdef Q_OS_SYMBIAN
- ThemeClientSymbian* client
-#else
- ThemeClientQt* client
-#endif
- ):
+ThemeSelectionList::ThemeSelectionList():
oldItemIndex(-1),
themelist(new HbListWidget(this)),
rightMark(new HbIcon(QString("qtg_small_tick"))),
- noMark(new HbIcon(QString(""))),
- client(client)
+ noMark(new HbIcon(QString("")))
{
connect(themelist, SIGNAL(activated(HbListWidgetItem *)),this, SLOT(setChosen(HbListWidgetItem *)));
setWidget(themelist);
@@ -83,7 +77,6 @@
// Set the theme to the applied theme before exiting.
setChosen(themelist->item(oldItemIndex));
delete noMark;
-
noMark=NULL;
delete rightMark;
rightMark=NULL;
@@ -92,6 +85,10 @@
themelist->reset();
delete themelist;
themelist=NULL;
+
+ // Delete preview thubnails
+ qDeleteAll(thumbnails);
+ thumbnails.clear();
}
@@ -116,9 +113,8 @@
QSettings iniSetting(iconThemePath.path()+"/index.theme",QSettings::IniFormat);
iniSetting.beginGroup("Icon Theme");
QString hidden = iniSetting.value("Hidden").toString();
- QString name = iniSetting.value("Name").toString();
iniSetting.endGroup();
- if((hidden == "true") ||( hidden == "")||(name!=themefolder) ) {
+ if((hidden == "true") ||( hidden == "")) {
iconthemeslist.removeOne(themefolder);
}
}
@@ -128,19 +124,52 @@
}
if(!entryAdded){
- iconthemeslist.insert(0,"hbdefault"); //adding one default entry
+ //adding one default entry
+ HbListWidgetItem *item = new HbListWidgetItem();
+ item->setText("hbdefault");
+ item->setSecondaryText("hbdefault");
+ QString thumbPath(":/themes/icons/hbdefault/scalable/qtg_graf_theme_preview_thumbnail.svg");
+ HbIcon *icon = new HbIcon(thumbPath);
+ thumbnails.append(icon);
+ item->setIcon(*icon);
+ if (HbInstance::instance()->theme()->name() == "hbdefault") {
+ item->setSecondaryIcon(*rightMark);
+ themelist->addItem(item);
+ oldItemIndex=themelist->count()-1;
+ themelist->setCurrentRow(oldItemIndex);
+ } else {
+ item->setSecondaryIcon(*noMark);
+ themelist->addItem(item);
+ }
entryAdded = true;
}
list=iconthemeslist;
for (int i=0; i <list.count();i++) {
// populate theme list with existing themes
- if((HbInstance::instance()->theme()->name())==(list.at(i))) {
- themelist->addItem(*rightMark,list.at(i));
+ HbListWidgetItem *item = new HbListWidgetItem();
+
+ QSettings iniSetting(root.path()+"/themes/icons/"+list.at(i)+"/index.theme",QSettings::IniFormat);
+ iniSetting.beginGroup("Icon Theme");
+ QString name = iniSetting.value("Name").toString();
+ iniSetting.endGroup();
+ item->setText(name);
+
+ item->setSecondaryText(root.path()+"/themes/icons/"+list.at(i));
+ QString thumbPath(root.path()+"/themes/icons/"+list.at(i)+"/scalable/qtg_graf_theme_preview_thumbnail.svg");
+ HbIcon *icon = new HbIcon(thumbPath);
+ thumbnails.append(icon);
+ item->setIcon(*icon);
+
+
+ if (QFileInfo(HbThemeServices::themePath()) == QFileInfo(item->secondaryText())) {
+ item->setSecondaryIcon(*rightMark);
+ themelist->addItem(item);
oldItemIndex=themelist->count()-1;
themelist->setCurrentRow(oldItemIndex);
}
else {
- themelist->addItem(*noMark,list.at(i));
+ item->setSecondaryIcon(*noMark);
+ themelist->addItem(item);
}
}
}
@@ -149,21 +178,20 @@
if(!themePresent) {
QStringList defaultList;
defaultList.insert(0,"hbdefault"); //adding one default entry
- themelist->addItem(*rightMark,defaultList.at(0));
+ HbListWidgetItem *item = new HbListWidgetItem();
+ item->setText(defaultList.at(0));
+ item->setSecondaryText(defaultList.at(0));
+ QString thumbPath(":/themes/icons/hbdefault/scalable/qtg_graf_theme_preview_thumbnail.svg");
+ HbIcon *icon = new HbIcon(thumbPath);
+ thumbnails.append(icon);
+ item->setIcon(*icon);
+ item->setSecondaryIcon(*rightMark);
+ themelist->addItem(item);
QString themeName=HbInstance::instance()->theme()->name();
if (themeName != "hbdefault")
{
- if (!client->isConnected()) {
- bool success = client->connectToServer();
- if (success) {
- emit newThemeSelected("hbdefault");
- }
- }
- else {
- emit newThemeSelected("hbdefault");
- }
+ emit newThemeSelected("hbdefault");
}
-
}
}
@@ -172,28 +200,17 @@
*/
void ThemeSelectionList::setChosen(HbListWidgetItem *item)
{
- QString str=item->text();
-
#ifdef THEME_CHANGER_TRACES
- qDebug() << "ThemeSelectionList::Setchosen with ThemeName: "<<str;
+ qDebug() << "ThemeSelectionList::Setchosen with ThemeName: "<<item->secondaryText();
#endif
- if(iCurrentTheme != str ) {
+ if(iCurrentTheme != item->secondaryText()) {
#ifdef THEME_CHANGER_TIMER_LOG
timer.start();
- qDebug() << "Selected theme: " << str;
+ qDebug() << "Selected theme: " << item->secondaryText();
#endif
- iCurrentTheme = str;
- if (!client->isConnected()) {
- bool success = client->connectToServer();
- if (success) {
- QThread::currentThread()->setPriority(QThread::HighPriority);
- emit newThemeSelected(str);
- }
- }
- else {
- QThread::currentThread()->setPriority(QThread::HighPriority);
- emit newThemeSelected(str);
- }
+ iCurrentTheme = item->secondaryText();
+ QThread::currentThread()->setPriority(QThread::HighPriority);
+ emit newThemeSelected(item->secondaryText());
}
else
{
@@ -208,9 +225,11 @@
void ThemeSelectionList::applySelection()
{
if(oldItemIndex!=themelist->currentRow()) {
- themelist->setIcon(themelist->currentRow(),*rightMark);
+ HbListWidgetItem *item = themelist->item(themelist->currentRow());
+ item->setSecondaryIcon(*rightMark);
if(oldItemIndex >= 0) {
- themelist->setIcon(oldItemIndex,*noMark);
+ HbListWidgetItem *olditem = themelist->item(oldItemIndex);
+ olditem->setSecondaryIcon(*noMark);
}
oldItemIndex = themelist->currentRow();
}
@@ -248,7 +267,7 @@
*/
void ThemeSelectionList::sendThemeName(const QString& name)
{
- client->changeTheme(name);
+ HbThemeServices::setTheme(name);
}
/**
@@ -281,9 +300,6 @@
qDebug() << "Theme changed applied in " << timer.elapsed() << " msec";
idleTimer->stop();
QThread::currentThread()->setPriority(QThread::NormalPriority);
- if (!client->isConnected()) {
- client->connectToServer();
- }
}
void ThemeSelectionList::themeChanged()
--- a/src/hbapps/hbthemechanger/themeselectionlist.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbapps/hbthemechanger/themeselectionlist.h Fri Jun 11 13:58:22 2010 +0300
@@ -33,11 +33,6 @@
#include <hbview.h>
#include <hblistwidget.h>
-#ifdef Q_OS_SYMBIAN
-#include "themeclientsymbian.h"
-#else
-#include "themeclientqt.h"
-#endif
#include "themechangerdefs.h"
class HbIcon;
@@ -47,12 +42,7 @@
Q_OBJECT
public:
-#ifdef Q_OS_SYMBIAN
- ThemeSelectionList(ThemeClientSymbian* client);
-#else
- ThemeSelectionList(ThemeClientQt* client);
-#endif
-
+ ThemeSelectionList();
~ThemeSelectionList();
signals:
void newThemeSelected(const QString &newthemepath);
@@ -78,11 +68,7 @@
HbIcon* rightMark;
HbIcon* noMark;
HbAction *action;
-#ifdef Q_OS_SYMBIAN
- ThemeClientSymbian* client;
-#else
- ThemeClientQt* client;
-#endif
+ QList<HbIcon*> thumbnails;
QFileSystemWatcher *watcher;
QString iCurrentTheme;
--- a/src/hbcommon.pri Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcommon.pri Fri Jun 11 13:58:22 2010 +0300
@@ -54,11 +54,20 @@
# integrity check for public/private headers
contains(TEMPLATE, .*lib$) {
for(pubheader, $$list($$lower($$unique(PUBLIC_HEADERS)))) {
- contains(pubheader, .*_p.h$):warning($$basename(pubheader) is listed in PUBLIC_HEADERS but has a \"_p.h\" suffix.)
+ contains(pubheader, .*_[pr].h$):warning($$basename(pubheader) is listed in PUBLIC_HEADERS but has a \"_[pr].h\" suffix.)
+ }
+ for(restheader, $$list($$lower($$unique(RESTRICTED_HEADERS)))) {
+ !contains(restheader, .*_r.h$):warning($$basename(restheader) is listed in RESTRICTED_HEADERS but has no \"_r.h\" suffix.)
}
for(privheader, $$list($$lower($$unique(PRIVATE_HEADERS)))) {
!contains(privheader, .*_p.h$):warning($$basename(privheader) is listed in PRIVATE_HEADERS but has no \"_p.h\" suffix.)
}
+ !isEmpty(INTERNAL_HEADERS) {
+ warning(INTERNAL_HEADERS is obsolete. Use PUBLIC|RESTRICTED|PRIVATE_HEADERS for the following headers:)
+ for(intheader, $$list($$unique(INTERNAL_HEADERS))) {
+ warning($$intheader)
+ }
+ }
}
# common extra targets
--- a/src/hbcore/activity/activity.pri Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/activity/activity.pri Fri Jun 11 13:58:22 2010 +0300
@@ -30,7 +30,8 @@
PUBLIC_HEADERS += $$PWD/hbactivitymanager.h
-INTERNAL_HEADERS += $$PWD/hbactivitymanager_p.h \
- $$PWD/hbactivityplugininterface_p.h \
+PRIVATE_HEADERS += $$PWD/hbactivitymanager_p.h
+
+RESTRICTED_HEADERS += $$PWD/hbactivityplugininterface_r.h
SOURCES += $$PWD/hbactivitymanager.cpp \
--- a/src/hbcore/activity/hbactivitymanager.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/activity/hbactivitymanager.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -32,18 +32,18 @@
#include "hbmainwindow.h"
#include "hbinstance.h"
-#include "hbactivityplugininterface_p.h"
+#include "hbactivityplugininterface_r.h"
/*!
@stable
@hbcore
\class HbActivityManager
\brief HbActivityManager is an access point for Activities features.
-
+
Activities can be described as stored application states (for example bookmarks
in web browser) or actions that can be performed using application (play next
song, start new game).
-
+
The HbActivityManager class allows to use Activities features in Hb application.
It can be used to access, add, remove and modify activities. It also notifies the
application about activity change requests from other applications.
@@ -69,27 +69,27 @@
HbActivityPluginInterface *HbActivityManagerPrivate::activityPlugin() const
{
if (!mActivityPlugin) {
- foreach (const QString &path, QCoreApplication::libraryPaths()) {
+ foreach(const QString & path, QCoreApplication::libraryPaths()) {
QString pluginPath;
QString libPath = QDir(path).filePath(QLatin1String("hbactivityplugin"));
#ifdef Q_OS_SYMBIAN
libPath += QLatin1String(".qtplugin");
- QLibrary library(libPath);
+ QLibrary library(libPath);
if (QFile::exists(libPath) && library.load()) {
library.unload();
pluginPath = libPath;
}
#else
- QLibrary library(libPath);
+ QLibrary library(libPath);
if (library.load()) {
library.unload();
pluginPath = library.fileName();
- }
-#endif
+ }
+#endif
QPluginLoader loader(pluginPath);
QObject *pluginInstance = loader.instance();
if (pluginInstance) {
- mActivityPlugin = qobject_cast<HbActivityPluginInterface*>(pluginInstance);
+ mActivityPlugin = qobject_cast<HbActivityPluginInterface *>(pluginInstance);
if (mActivityPlugin) {
q->connect(pluginInstance, SIGNAL(activityRequested(QString)), q, SIGNAL(activityRequested(QString)));
} else {
@@ -217,9 +217,9 @@
/*!
Allows to save activity.
\a activityId. Activity name used as identifier of activities
- \a data. Activity data that should be stored. It will allow application to restore its state later
+ \a data. Activity data that should be stored. It will allow application to restore its state later
\a parameters. Activity properties: screenshot, localized name, hidden flag, etc.
- Returns true if activity was succesfully saved, otherwise returns false.
+ Returns true if activity was successfully saved, otherwise returns false.
*/
bool HbActivityManager::addActivity(const QString &activityId, const QVariant &data, const QVariantHash ¶meters)
{
@@ -230,7 +230,7 @@
/*!
Allows to delete activity.
\a activityId. Activity name used as identifier of activities
- Returns true if activity was succesfully deleted, otherwise returns false.
+ Returns true if activity was successfully deleted, otherwise returns false.
*/
bool HbActivityManager::removeActivity(const QString &activityId)
{
@@ -241,9 +241,9 @@
/*!
Allows to update saved activity.
\a activityId. Activity name used as identifier of activities
- \a data. Activity data that should be stored. It will allow application to restore its state later
+ \a data. Activity data that should be stored. It will allow application to restore its state later
\a parameters. Activity properties: screenshot, localized name, hidden flag, etc.
- Returns true if activity was succesfully updated, otherwise returns false.
+ Returns true if activity was successfully updated, otherwise returns false.
*/
bool HbActivityManager::updateActivity(const QString &activityId, const QVariant &data, const QVariantHash ¶meters)
{
@@ -272,7 +272,7 @@
/*!
Subscribes to activity manager
*/
-bool HbActivityManager::waitActivity()
+bool HbActivityManager::waitActivity()
{
Q_D(HbActivityManager);
return d->waitActivity();
--- a/src/hbcore/activity/hbactivitymanager.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/activity/hbactivitymanager.h Fri Jun 11 13:58:22 2010 +0300
@@ -44,7 +44,7 @@
public:
explicit HbActivityManager(QObject *parent = 0);
virtual ~HbActivityManager();
-
+
bool addActivity(const QString &activityId, const QVariant &data, const QVariantHash ¶meters);
bool removeActivity(const QString &activityId);
bool updateActivity(const QString &activityId, const QVariant &data, const QVariantHash ¶meters);
@@ -54,15 +54,15 @@
void parseCommandLine(const QStringList &commandLineParams, Hb::ActivationReason &reason, QString &id, QVariantHash ¶ms) const;
signals:
- void activityRequested(const QString &activityId);
-
+ void activityRequested(const QString &activityId);
+
protected:
HbActivityManagerPrivate *d_ptr;
-
+
private:
Q_DISABLE_COPY(HbActivityManager)
- Q_DECLARE_PRIVATE_D(d_ptr, HbActivityManager)
-
+ Q_DECLARE_PRIVATE_D(d_ptr, HbActivityManager)
+
};
#endif // HBACTIVITYMANAGER_H
--- a/src/hbcore/activity/hbactivitymanager_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/activity/hbactivitymanager_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -46,7 +46,7 @@
private:
HbActivityPluginInterface *activityPlugin() const;
-
+
private:
HbActivityManager *q;
mutable HbActivityPluginInterface *mActivityPlugin;
--- a/src/hbcore/activity/hbactivityplugininterface_p.h Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBACTIVITYPLUGININTERFACE_P_H
-#define HBACTIVITYPLUGININTERFACE_P_H
-
-#include <QtPlugin>
-#include <QVariant>
-#include <QString>
-#include <QList>
-#include <QVariantHash>
-
-class HbActivityPluginInterface
-{
-public:
- virtual ~HbActivityPluginInterface() {}
-
-public:
- virtual bool addActivity(const QString &activityId, const QVariant &data, const QVariantHash ¶meters) = 0;
- virtual bool removeActivity(const QString &activityId) = 0;
- virtual bool updateActivity(const QString &activityId, const QVariant &data, const QVariantHash ¶meters) = 0;
- virtual QList<QVariantHash> activities() = 0;
- virtual QVariant activityData(const QString &activityId) = 0;
- virtual bool waitActivity() = 0;
- virtual QVariantHash parseCommandLine(const QStringList &commandLineParams) = 0;
-
-signals:
- // signal must be re-declared in the plugin implementation
- void activityRequested(const QString &activityId);
-};
-
-Q_DECLARE_INTERFACE(HbActivityPluginInterface, "HbActivityPluginInterface/1.0")
-
-#endif // HBACTIVITYPLUGININTERFACE_P_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/activity/hbactivityplugininterface_r.h Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** 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 HBACTIVITYPLUGININTERFACE_R_H
+#define HBACTIVITYPLUGININTERFACE_R_H
+
+#include <QtPlugin>
+#include <QVariant>
+#include <QString>
+#include <QList>
+#include <QVariantHash>
+
+class HbActivityPluginInterface
+{
+public:
+ virtual ~HbActivityPluginInterface() {}
+
+public:
+ virtual bool addActivity(const QString &activityId, const QVariant &data, const QVariantHash ¶meters) = 0;
+ virtual bool removeActivity(const QString &activityId) = 0;
+ virtual bool updateActivity(const QString &activityId, const QVariant &data, const QVariantHash ¶meters) = 0;
+ virtual QList<QVariantHash> activities() = 0;
+ virtual QVariant activityData(const QString &activityId) = 0;
+ virtual bool waitActivity() = 0;
+ virtual QVariantHash parseCommandLine(const QStringList &commandLineParams) = 0;
+
+signals:
+ // signal must be re-declared in the plugin implementation
+ void activityRequested(const QString &activityId);
+};
+
+Q_DECLARE_INTERFACE(HbActivityPluginInterface, "HbActivityPluginInterface/1.0")
+
+#endif // HBACTIVITYPLUGININTERFACE_R_H
--- a/src/hbcore/core/core.pri Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/core.pri Fri Jun 11 13:58:22 2010 +0300
@@ -66,6 +66,7 @@
PRIVATE_HEADERS += $$PWD/hblocalechangenotifier_p.h
PRIVATE_HEADERS += $$PWD/hbapplication_p.h
PRIVATE_HEADERS += $$PWD/hbthemesystemeffect_p.h
+PRIVATE_HEADERS += $$PWD/hbthemesystemeffectmap_p.h
PRIVATE_HEADERS += $$PWD/hbpluginloader_p.h
PRIVATE_HEADERS += $$PWD/hbpluginloader_p_p.h
symbian {
@@ -96,6 +97,7 @@
SOURCES += $$PWD/hbsensorlistener.cpp
SOURCES += $$PWD/hblocalechangenotifier_p.cpp
SOURCES += $$PWD/hbthemesystemeffect.cpp
+SOURCES += $$PWD/hbthemesystemeffectmap.cpp
SOURCES += $$PWD/hbpluginloader.cpp
symbian {
SOURCES += $$PWD/hbsensornotifyhandler_p.cpp
--- a/src/hbcore/core/hbaction.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbaction.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -51,9 +51,9 @@
instance support of gestures.
An action may contain a command role.
- These command roles are used when action is added through HbView::addAction.
- The command role specifies the action container (options menu, toolbar)
- to which the action is places and also the position in that container.
+ These command roles are used when action is added through HbView::addAction.
+ The command role specifies the action container (options menu, toolbar)
+ to which the action is places and also the position in that container.
\sa QAction::MenuRole
\sa HbView::addAction
@@ -66,7 +66,7 @@
\internal
*/
HbActionPrivate::HbActionPrivate() : menu(0), extension(0)
-, commandRole(HbAction::NoRole)
+ , commandRole(HbAction::NoRole)
{
}
@@ -107,26 +107,26 @@
/*!
Constructs a new HbAction with the given navigation \a action and \a parent.
*/
-HbAction::HbAction(Hb::NavigationAction action, QObject* parent)
+HbAction::HbAction(Hb::NavigationAction action, QObject *parent)
: QAction(parent), d_ptr(new HbActionPrivate)
{
Q_D(HbAction);
switch (action) {
- case Hb::QuitNaviAction:
- d->icon = HbIcon("qtg_mono_app_exit");
- break;
- case Hb::BackNaviAction:
- d->icon = HbIcon("qtg_mono_back");
- break;
- case Hb::ConfirmNaviAction:
- d->icon = HbIcon("qtg_mono_back");
- break;
- case Hb::DoneNaviAction:
- d->icon = HbIcon("qtg_mono_back");
- break;
- default:
- qWarning("HbAction: unknown action: %i", action);
- break;
+ case Hb::QuitNaviAction:
+ d->icon = HbIcon("qtg_mono_app_exit");
+ break;
+ case Hb::BackNaviAction:
+ d->icon = HbIcon("qtg_mono_back");
+ break;
+ case Hb::ConfirmNaviAction:
+ d->icon = HbIcon("qtg_mono_back");
+ break;
+ case Hb::DoneNaviAction:
+ d->icon = HbIcon("qtg_mono_back");
+ break;
+ default:
+ qWarning("HbAction: unknown action: %i", action);
+ break;
}
}
@@ -140,7 +140,7 @@
/*!
Sets the icon of the action. Note that this icon is different from QIcon
- setIcon() and icon().
+ setIcon() and icon().
\sa icon()
*/
@@ -165,7 +165,7 @@
}
/*!
- Sets the menu of the action.
+ Sets the menu of the action.
\sa menu()
*/
@@ -196,8 +196,9 @@
void HbAction::setToolTip(const QString &tooltip)
{
Q_D(HbAction);
- if (d->tooltip == tooltip)
+ if (d->tooltip == tooltip) {
return;
+ }
d->tooltip = tooltip;
QAction::setToolTip(tooltip);
@@ -215,7 +216,7 @@
}
/*!
- Sets the toolbar extension of the action.
+ Sets the toolbar extension of the action.
\sa menu()
*/
@@ -242,7 +243,7 @@
}
/*!
- Sets the command role identifier of the action.
+ Sets the command role identifier of the action.
\sa commandRole()
*/
--- a/src/hbcore/core/hbaction.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbaction.h Fri Jun 11 13:58:22 2010 +0300
@@ -48,7 +48,7 @@
explicit HbAction(QObject *parent = 0);
explicit HbAction(const QString &text, QObject *parent = 0);
explicit HbAction(const HbIcon &icon, const QString &text, QObject *parent = 0);
- explicit HbAction(Hb::NavigationAction action, QObject* parent = 0);
+ explicit HbAction(Hb::NavigationAction action, QObject *parent = 0);
virtual ~HbAction();
using QAction::setIcon;
@@ -67,13 +67,14 @@
HbToolBarExtension *toolBarExtension() const;
enum CommandRole { NoRole, OptionsRole, OpenRole, NewRole, DeleteRole, ClearRole,
- SettingsRole, SendRole, PrintRole, EditRole, CopyRole, PasteRole,
- HelpRole, QuitRole, ExitRole, OtherRole };
+ SettingsRole, SendRole, PrintRole, EditRole, CopyRole, PasteRole,
+ HelpRole, QuitRole, ExitRole, OtherRole
+ };
void setCommandRole(CommandRole commandRole);
CommandRole commandRole() const;
protected:
- HbActionPrivate * const d_ptr;
+ HbActionPrivate *const d_ptr;
HbAction(HbActionPrivate &dd, QObject *parent);
private:
--- a/src/hbcore/core/hbaction_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbaction_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -35,7 +35,7 @@
HbMenu *menu;
HbToolBarExtension *extension;
HbAction::CommandRole commandRole;
- QString tooltip;
+ QString tooltip;
};
#endif // HBACTION_P_H
--- a/src/hbcore/core/hbapplication.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbapplication.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -40,7 +40,7 @@
#endif
/*!
- @stable
+ @stable
@hbcore
\class HbApplication
\brief The HbApplication class is a place for common functionality.
@@ -70,36 +70,36 @@
Applications that support the 'activities' concept may check the start-up
reason like this:
-
+
\code
HbApplication app(argc, argv);
if(app.activateReason() == HbApplication::activity) {
// start-up case
} else if (app.activateReason() == HbApplication::service) {
- // service lauch
+ // service launch
} else {
// normal launch
}
MyActivitiesEngine logic;
// connect to the application signal
- QObject::connect(&app, SIGNAL(activate()), &logic, SLOT(openActivity()));
+ QObject::connect(&app, SIGNAL(activate()), &logic, SLOT(openActivity()));
\endcode
-
- When new activity needs to be activated signal is emited. Application might
+
+ When new activity needs to be activated signal is emitted. Application might
observe it and start correct handling to return to saved state. Logic should
check what is the activity id and data to return to correct state.
-
+
\sa QApplication
*/
/*!
\fn void HbApplication::activate()
-
+
This signal is emitted when some activity needs to be shown.
*/
-static int& preInitApp(int &argc)
+static int &preInitApp(int &argc)
{
// This function contains code that needs to be executed before
// the QApplication constructor.
@@ -211,6 +211,7 @@
#if defined(Q_WS_S60)
#include <w32std.h>
#include <coecntrl.h>
+#include <coemain.h>
#include <QDesktopWidget>
#include <QStringList>
#include <hbinstance.h>
@@ -225,7 +226,7 @@
static void forceRefresh()
{
- foreach (HbMainWindow *window, hbInstance->allMainWindows()) {
+ foreach(HbMainWindow * window, hbInstance->allMainWindows()) {
QEvent event(QEvent::WindowActivate);
QApplication::sendEvent(window, &event);
}
@@ -246,80 +247,79 @@
const TWsEvent *aEvent = event->windowServerEvent();
switch (aEvent->Type()) {
- // In case of EEventScreenDeviceChanged-event, the current screen
- // ratio is checked and orientation is set accordingly.
- case EEventScreenDeviceChanged:
- {
- QList<HbMainWindow*> windows = hbInstance->allMainWindows();
- RWindow *win = static_cast<RWindow *>(windows.at(0)->effectiveWinId()->DrawableWindow());
-
- TSize rWinSize;
- if (win)
- rWinSize = win->Size();
-
- // fix for emulator / changing modes
- QSize nSize( (int)rWinSize.iWidth, (int)rWinSize.iHeight );
- foreach (HbMainWindow* w, windows) {
+ case EEventScreenDeviceChanged: {
+ // Resize the mainwindows when the screen device changes.
+ // This is needed only to support the old S60 emulator.
+ CWsScreenDevice *screenDevice = CCoeEnv::Static()->ScreenDevice();
+ if (screenDevice) {
+ TPixelsTwipsAndRotation params;
+ int mode = screenDevice->CurrentScreenMode();
+ screenDevice->GetScreenModeSizeAndRotation(mode, params);
+ QSize nSize(params.iPixelSize.iWidth, params.iPixelSize.iHeight);
+ QList<HbMainWindow *> windows = hbInstance->allMainWindows();
+ foreach(HbMainWindow * w, windows) {
w->resize(nSize);
}
}
- return false; //continue handling in QApplication::s60ProcessEvent
- case KChangeDirection:{
- TUint8* dataptr = aEvent->EventData();
- switch(*dataptr){
- case 0:
- HbApplication::setLayoutDirection(Qt::LeftToRight);
- break;
- case 1:
- HbApplication::setLayoutDirection(Qt::RightToLeft);
- break;
- default:
- qWarning("HbApplication::s60EventFilter: Unknown layout direction received");
- break;
- }
- }
- return false;
- case KChangeDeviceProfile:{
- TUint8* dataptr = aEvent->EventData();
- QStringList names = HbDeviceProfile::profileNames();
- if(*dataptr > names.count() - 1){
- qWarning("HbApplication::s60EventFilter: Unknown device profile received");
- }else{
- HbDeviceProfile profile(names.value(*dataptr));
- HbDeviceProfileManager::select(profile);
- QList<HbMainWindow*> windows = hbInstance->allMainWindows();
- HbMainWindow *w = windows.at(0);
- w->setOrientation(profile.orientation());
- }
- }
- return false;
- case KChangeTouchAreaVis:{
- TUint8* dataptr = aEvent->EventData();
- HbTouchAreaPrivate::setOutlineDrawing(*dataptr == 1);
- forceRefresh();
- }
- return false;
- case KChangeTextItemVis:{
- TUint8* dataptr = aEvent->EventData();
- HbTextItemPrivate::outlinesEnabled = *dataptr == 1;
- forceRefresh();
- }
- return false;
- case KChangeIconItemVis:{
- TUint8* dataptr = aEvent->EventData();
- HbIconItemPrivate::outlinesEnabled = *dataptr == 1;
- forceRefresh();
- }
- return false;
- case KChangeFpsCounterVis:{
- TUint8* dataptr = aEvent->EventData();
- HbGraphicsScenePrivate::fpsCounterEnabled = *dataptr == 1;
- forceRefresh();
- }
- return false;
+ }
+ return false; //continue handling in QApplication::s60ProcessEvent
+
+ case KChangeDirection: {
+ TUint8 *dataptr = aEvent->EventData();
+ switch (*dataptr) {
+ case 0:
+ HbApplication::setLayoutDirection(Qt::LeftToRight);
+ break;
+ case 1:
+ HbApplication::setLayoutDirection(Qt::RightToLeft);
+ break;
default:
- return QApplication::symbianEventFilter(event);
+ qWarning("HbApplication::s60EventFilter: Unknown layout direction received");
+ break;
+ }
+ }
+ return false;
+ case KChangeDeviceProfile: {
+ TUint8 *dataptr = aEvent->EventData();
+ QStringList names = HbDeviceProfile::profileNames();
+ if (*dataptr > names.count() - 1) {
+ qWarning("HbApplication::s60EventFilter: Unknown device profile received");
+ } else {
+ HbDeviceProfile profile(names.value(*dataptr));
+ HbDeviceProfileManager::select(profile);
+ QList<HbMainWindow *> windows = hbInstance->allMainWindows();
+ HbMainWindow *w = windows.at(0);
+ w->setOrientation(profile.orientation());
}
+ }
+ return false;
+ case KChangeTouchAreaVis: {
+ TUint8 *dataptr = aEvent->EventData();
+ HbTouchAreaPrivate::setOutlineDrawing(*dataptr == 1);
+ forceRefresh();
+ }
+ return false;
+ case KChangeTextItemVis: {
+ TUint8 *dataptr = aEvent->EventData();
+ HbTextItemPrivate::outlinesEnabled = *dataptr == 1;
+ forceRefresh();
+ }
+ return false;
+ case KChangeIconItemVis: {
+ TUint8 *dataptr = aEvent->EventData();
+ HbIconItemPrivate::outlinesEnabled = *dataptr == 1;
+ forceRefresh();
+ }
+ return false;
+ case KChangeFpsCounterVis: {
+ TUint8 *dataptr = aEvent->EventData();
+ HbGraphicsScenePrivate::fpsCounterEnabled = *dataptr == 1;
+ forceRefresh();
+ }
+ return false;
+ default:
+ return QApplication::symbianEventFilter(event);
+ }
}
#endif // Q_WS_S60
@@ -340,7 +340,7 @@
{
if (!mActivateId.isNull() && !mActivateData.isValid()) {
mActivateData = mActivityManager->activityData(mActivateId);
- }
+ }
return mActivateData;
}
@@ -350,7 +350,7 @@
mActivateId = activityId;
mActivateData = QVariant();
mActivateParams = QVariantHash();
-
+
emit q_ptr->activate();
}
--- a/src/hbcore/core/hbapplication.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbapplication.h Fri Jun 11 13:58:22 2010 +0300
@@ -62,18 +62,18 @@
HbActivityManager *activityManager();
Hb::ActivationReason activateReason() const;
QVariantHash activateParams() const;
- QString activateId() const;
- QVariant activateData();
+ QString activateId() const;
+ QVariant activateData();
void hideSplash();
protected:
HbApplicationPrivate *d_ptr;
-
+
private:
Q_DISABLE_COPY(HbApplication)
- Q_DECLARE_PRIVATE_D(d_ptr, HbApplication)
-
+ Q_DECLARE_PRIVATE_D(d_ptr, HbApplication)
+
};
#endif // HBAPPLICATION_H
--- a/src/hbcore/core/hbapplication_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbapplication_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -40,17 +40,17 @@
HbApplicationPrivate(HbApplication *parent = 0);
~HbApplicationPrivate();
- QVariant activateData();
+ QVariant activateData();
HbApplication *q_ptr;
Hb::ActivationReason mActivateReason;
QVariantHash mActivateParams;
QString mActivateId;
HbActivityManager *mActivityManager;
-
+
private slots:
void prepareActivityData(const QString &name);
-
+
private:
QVariant mActivateData;
};
--- a/src/hbcore/core/hbcommoncrkeys.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbcommoncrkeys.h Fri Jun 11 13:58:22 2010 +0300
@@ -41,7 +41,7 @@
* Define the status of the sensors
* - Off = 0
* - On = 1
- *
+ *
*/
const TUint32 KHbSensorCenrepKey = 0x1;
--- a/src/hbcore/core/hbcorepskeys_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbcorepskeys_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -31,38 +31,58 @@
#include <e32cmn.h>
/**
- * HbCore internal orientation PS category UID.
- * Intended only for orientation setting.
+ * HbCore orientation PS category UID.
*/
-const TUid KHbPsOrientationCategoryUid = {0x20022E82}; // Theme server UID
+const TUid KHbPsHardwareCoarseOrientationCategoryUid = {0x20022E82}; // Theme server UID
/**
* HbCore internal foreground application orientation PS category UID.
*/
-const TUid KHbPsForegroundAppOrientationCategoryUid = {0x20022FC5}; //device dialog UID
+const TUid KHbPsForegroundAppOrientationCategoryUid = {0x20022FC5}; // Device dialog server UID
/**
- * KHbPsOrientationKey
- * Current orientation value recieved from sensor.
- * Qt::Orientation
+ * Contains the current orientation value based on the hw sensors and
+ * other components.
+ *
+ * The value is not necessarily based solely on the accelerometer, it
+ * may be different than that due to the hw keyboard state, lock
+ * switch, etc. In any case this is the suggested orientation for
+ * applications and the framework will use this orientation when the
+ * automatic orientation management is in use by a Hb application
+ * (i.e. by default).
+ *
+ * The sensors are tracked only while the device is not in sleep
+ * mode. This means that the value is not guaranteed to be immediately
+ * up-to-date with the current accelerometer orientation after coming
+ * out of sleep mode.
+ *
+ * The value is a Qt::Orientation.
+ *
+ * Published by theme server. Used by Hb apps themselves (e.g. when
+ * showing splash screens) and possibly by wserv.
*/
-const TUint KHbPsOrientationKey = 'Orie';
+const TUint KHbPsHardwareCoarseOrientationKey = 0x4F726965;
/**
- * KHbPsForegroundAppOrientationKey
- * Current orientation value checked from foreground app.
+ * Current orientation value from the foreground app.
+ * Applies only to Hb applications, non-Hb apps are not taken into account.
+ *
+ * Bits 0-7 contain the Qt::Orientation value.
+ * If bit 8 is set then the orientation is a fixed (forced) one.
+ * If bit 8 is not set then the orientation is managed automatically by the framework.
+ *
+ * Published by device dialog server.
*/
-const TUint KHbPsForegroundAppOrientationKey = 'Fgor';
+const TUint KHbPsForegroundAppOrientationKey = 0x46676F72;
/**
- * KHbFixedOrientationMask
- * Indicates HbMainWindow has fixed orientation enabled
+ * Mask for the bit that indicates HbMainWindow has fixed orientation
+ * enabled.
*/
const TUint KHbFixedOrientationMask = 0x100;
/**
- * KHbOrientationMask
- * Used for masking orientation in PS-key
+ * Used for masking orientation in PS-key.
*/
const TUint KHbOrientationMask = 0xFF;
--- a/src/hbcore/core/hbevent.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbevent.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -42,25 +42,25 @@
This class supports following extra types of events besides those supported by QEvent
- ChildFocusIn - This event is sent from child widget to parent widget to notify that the child
- has got the focus. Normally the parent may show some visualization
+ ChildFocusIn - This event is sent from child widget to parent widget to notify that the child
+ has got the focus. Normally the parent may show some visualization
change when its child gets focus.
- ChildFocusOut - This event is sent from child widget to parent widget to notify that the child
- has lost the focus. Normally the parent may show some visualization
+ ChildFocusOut - This event is sent from child widget to parent widget to notify that the child
+ has lost the focus. Normally the parent may show some visualization
change when its child gets focus.
- ThemeChanged - This event is sent to all QGraphicsWidget. The widget can handle this event by
+ ThemeChanged - This event is sent to all QGraphicsWidget. The widget can handle this event by
implementing changeEvent() virtual function.
- DeviceProfileChanged - This event is sent by the system when device's device profile
- (screen resolution) changes. The event causes automatic polish call and
- the event can be catched in event(QEvent *event) method.
+ DeviceProfileChanged - This event is sent by the system when device's device profile
+ (screen resolution) changes. The event causes automatic polish call and
+ the event can be caught in event(QEvent *event) method.
- SleepModeEnter - This event is sent by the system when the phone enters to the sleep mode.
+ SleepModeEnter - This event is sent by the system when the phone enters to the sleep mode.
If your application/component needs to take some action when entering the
sleep mode then you can do it in event(QEvent *event) method.
-
+
SleepModeExit - This event is sent by the system when the phone exist from the sleep mode.
If your application/component needs to take some action when exiting the
sleep mode then you can do it in event(QEvent *event) method.
@@ -71,7 +71,7 @@
Example of how to send HbEvent
\snippet{gui/hbwidget.cpp,1}
-
+
Example of how to receive HbEvent
\snippet{gui/hbwidget.cpp,2}
*/
@@ -81,7 +81,7 @@
\a eventType - type of event
*/
HbEvent::HbEvent(int eventType)
-: QEvent((QEvent::Type)eventType)
+ : QEvent((QEvent::Type)eventType)
{
}
--- a/src/hbcore/core/hbevent.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbevent.h Fri Jun 11 13:58:22 2010 +0300
@@ -56,8 +56,12 @@
HbDeviceProfileChangedEvent(const HbDeviceProfile &profile, const HbDeviceProfile &oldProfile);
~HbDeviceProfileChangedEvent();
- inline const HbDeviceProfile &profile() const { return mProfile; }
- inline const HbDeviceProfile &oldProfile()const { return mOldProfile;}
+ inline const HbDeviceProfile &profile() const {
+ return mProfile;
+ }
+ inline const HbDeviceProfile &oldProfile()const {
+ return mOldProfile;
+ }
protected:
HbDeviceProfile mProfile, mOldProfile;
};
--- a/src/hbcore/core/hbglobal.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbglobal.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -52,11 +52,11 @@
and as Q_DECL_IMPORT when using HbWidgets.
*/
- /*!
- \macro HB_AUTOTEST_EXPORT
- \relates <HbGlobal>
+/*!
+ \macro HB_AUTOTEST_EXPORT
+ \relates <HbGlobal>
- Used for internal exports for testing.
+ Used for internal exports for testing.
*/
/*!
@@ -67,7 +67,7 @@
{
QString loc = qtTrId(id, n);
#ifdef HB_TEXT_MEASUREMENT_UTILITY
- if ( HbFeatureManager::instance()->featureStatus( HbFeatureManager::TextMeasurement ) ) {
+ if (HbFeatureManager::instance()->featureStatus(HbFeatureManager::TextMeasurement)) {
loc.append(QChar(LOC_TEST_START));
loc.append(id);
loc.append(QChar(LOC_TEST_END));
--- a/src/hbcore/core/hbglobal.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbglobal.h Fri Jun 11 13:58:22 2010 +0300
@@ -31,8 +31,8 @@
//#pragma hb_header(HbGlobal)
#define HB_EXPORT \
-HB_EXPORT_macro_is_obsolete_Please_use_HB_YOURMODULE_EXPORT_instead \
-{ &HB_EXPORT_macro_is_obsolete_Please_use_HB_YOURMODULE_EXPORT_instead; }; class
+ HB_EXPORT_macro_is_obsolete_Please_use_HB_YOURMODULE_EXPORT_instead \
+ { &HB_EXPORT_macro_is_obsolete_Please_use_HB_YOURMODULE_EXPORT_instead; }; class
#define HB_DECL_DEPRECATED Q_DECL_DEPRECATED
#define HB_DECL_VARIABLE_DEPRECATED Q_DECL_VARIABLE_DEPRECATED
@@ -42,38 +42,52 @@
# ifdef BUILD_HB_CORE
# define HB_CORE_EXPORT Q_DECL_EXPORT
+# define HB_CORE_RESTRICTED_EXPORT Q_DECL_EXPORT
# define HB_CORE_PRIVATE_EXPORT Q_DECL_EXPORT
# else
# define HB_CORE_EXPORT Q_DECL_IMPORT
+# define HB_CORE_RESTRICTED_EXPORT Q_DECL_IMPORT
# define HB_CORE_PRIVATE_EXPORT Q_DECL_IMPORT
# endif // BUILD_HB_CORE
# ifdef BUILD_HB_WIDGETS
# define HB_WIDGETS_EXPORT Q_DECL_EXPORT
+# define HB_WIDGETS_RESTRICTED_EXPORT Q_DECL_EXPORT
# define HB_WIDGETS_PRIVATE_EXPORT Q_DECL_EXPORT
# else
# define HB_WIDGETS_EXPORT Q_DECL_IMPORT
+# define HB_WIDGETS_RESTRICTED_EXPORT Q_DECL_IMPORT
# define HB_WIDGETS_PRIVATE_EXPORT Q_DECL_IMPORT
# endif // BUILD_HB_WIDGETS
-# ifdef BUILD_HB_TOOLS
-# define HB_TOOLS_EXPORT Q_DECL_EXPORT
+# ifdef BUILD_HB_UTILS
+# define HB_UTILS_EXPORT Q_DECL_EXPORT
+# define HB_UTILS_RESTRICTED_EXPORT Q_DECL_EXPORT
+# define HB_UTILS_PRIVATE_EXPORT Q_DECL_EXPORT
# else
-# define HB_TOOLS_EXPORT Q_DECL_IMPORT
-# endif // BUILD_HB_TOOLS
+# define HB_UTILS_EXPORT Q_DECL_IMPORT
+# define HB_UTILS_RESTRICTED_EXPORT Q_DECL_IMPORT
+# define HB_UTILS_PRIVATE_EXPORT Q_DECL_IMPORT
+# endif // BUILD_HB_UTILS
# ifdef BUILD_HB_INPUT
# define HB_INPUT_EXPORT Q_DECL_EXPORT
+# define HB_INPUT_RESTRICTED_EXPORT Q_DECL_EXPORT
# define HB_INPUT_PRIVATE_EXPORT Q_DECL_EXPORT
# else
# define HB_INPUT_EXPORT Q_DECL_IMPORT
+# define HB_INPUT_RESTRICTED_EXPORT Q_DECL_IMPORT
# define HB_INPUT_PRIVATE_EXPORT Q_DECL_IMPORT
# endif // BUILD_HB_INPUT
# ifdef BUILD_HB_FEEDBACK
# define HB_FEEDBACK_EXPORT Q_DECL_EXPORT
+# define HB_FEEDBACK_RESTRICTED_EXPORT Q_DECL_EXPORT
+# define HB_FEEDBACK_PRIVATE_EXPORT Q_DECL_EXPORT
# else
# define HB_FEEDBACK_EXPORT Q_DECL_IMPORT
+# define HB_FEEDBACK_RESTRICTED_EXPORT Q_DECL_IMPORT
+# define HB_FEEDBACK_PRIVATE_EXPORT Q_DECL_IMPORT
# endif // BUILD_HB_FEEDBACK
# if defined(HB_DEVELOPER) || defined (Q_OS_SYMBIAN)
@@ -89,13 +103,20 @@
#else
# define HB_CORE_EXPORT
+# define HB_CORE_RESTRICTED_EXPORT
# define HB_CORE_PRIVATE_EXPORT
# define HB_WIDGETS_EXPORT
+# define HB_WIDGETS_RESTRICTED_EXPORT
# define HB_WIDGETS_PRIVATE_EXPORT
-# define HB_TOOLS_EXPORT
+# define HB_UTILS_EXPORT
+# define HB_UTILS_RESTRICTED_EXPORT
+# define HB_UTILS_PRIVATE_EXPORT
# define HB_INPUT_EXPORT
+# define HB_INPUT_RESTRICTED_EXPORT
# define HB_INPUT_PRIVATE_EXPORT
# define HB_FEEDBACK_EXPORT
+# define HB_FEEDBACK_RESTRICTED_EXPORT
+# define HB_FEEDBACK_PRIVATE_EXPORT
# define HB_AUTOTEST_EXPORT
#endif // HB_BOOTSTRAPPED
--- a/src/hbcore/core/hbglobal_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbglobal_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -26,6 +26,8 @@
#ifndef HBGLOBAL_P_H
#define HBGLOBAL_P_H
+#include <hbglobal.h>
+
#ifdef Q_OS_SYMBIAN
#define __HB_UHEAP_MARK __UHEAP_MARK
#else
@@ -40,10 +42,11 @@
// Macros for aiding deprecation
-struct HbRecallFlag
-{
- HbRecallFlag():oldValue(flag){}
- ~HbRecallFlag(){flag = oldValue;}
+struct HbRecallFlag {
+ HbRecallFlag(): oldValue(flag) {}
+ ~HbRecallFlag() {
+ flag = oldValue;
+ }
bool oldValue;
HB_CORE_EXPORT static bool flag;
};
@@ -52,15 +55,15 @@
// This macro ensures that if a deprecated method calls another deprecated
// method only one warning msg is shown.
#define HB_DEPRECATED(msg)\
-HbRecallFlag recallFlag;\
-if (HbRecallFlag::flag){\
- HbRecallFlag::flag = false;\
- static bool localFlag = true;\
- if(localFlag) {\
- qWarning(msg);\
- localFlag = false;\
- }\
-}
+ HbRecallFlag recallFlag;\
+ if (HbRecallFlag::flag){\
+ HbRecallFlag::flag = false;\
+ static bool localFlag = true;\
+ if(localFlag) {\
+ qWarning(msg);\
+ localFlag = false;\
+ }\
+ }
// Turns off the deprecation msg
#define HB_DEPRECATED_MSG_OFF HbRecallFlag recallFlag; HbRecallFlag::flag = false;
--- a/src/hbcore/core/hbgraphicsscene.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbgraphicsscene.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -45,7 +45,7 @@
bool HbGraphicsScenePrivate::fpsCounterEnabled = false; // Fps counter off by default.
-/*!
+/*!
Define HB_RND_DRAW_ITEM_BORDERS to draw the graphics items' borders
CAUTION: clipping and transformations may fail
*/
@@ -93,11 +93,11 @@
*/
void HbGraphicsScenePrivate::clearInputFocus()
{
- QInputContext* inputContext = qApp->inputContext();
- if (inputContext) {
- inputContext->setFocusWidget(0);
- }
- mInputFocusSet = false;
+ QInputContext *inputContext = qApp->inputContext();
+ if (inputContext) {
+ inputContext->setFocusWidget(0);
+ }
+ mInputFocusSet = false;
}
//# Focus delegation between focus groups and widgets. Moves focus to next or
@@ -120,20 +120,20 @@
while (cont) {
result = cont = false;
while (widget && !focusGroup) {
- focusGroup = widget->d_func()->focusGroup;
+ focusGroup = widget->d_func()->focusGroup;
if (!focusGroup) {
item = widget->parentItem();
widget = item ? qobject_cast<HbWidget *>(item->toGraphicsObject()) : 0;
}
- }
+ }
if (!focusGroup || !focusGroup->focusParameters().testFlag(HbFocusGroup::AlwaysOn)) {
break;
}
- bool focusNextKey = focusGroup->isFocusNextPrevKey(*event,true);
- if (focusNextKey || focusGroup->isFocusNextPrevKey(*event,false)) {
+ bool focusNextKey = focusGroup->isFocusNextPrevKey(*event, true);
+ if (focusNextKey || focusGroup->isFocusNextPrevKey(*event, false)) {
result = focusGroup->focusNextPrevItem(widget->lastFocusedChild(), focusNextKey);
if (result) {
@@ -166,11 +166,11 @@
popupManager()->hidePopup(popup);
}
-HbPopupManager* HbGraphicsScenePrivate::popupManager()
+HbPopupManager *HbGraphicsScenePrivate::popupManager()
{
Q_Q(HbGraphicsScene);
if (!mPopupManager) {
- mPopupManager = new HbPopupManager(q,q);
+ mPopupManager = new HbPopupManager(q, q);
}
return mPopupManager;
}
@@ -178,17 +178,17 @@
/*!
Constructor
*/
-HbGraphicsScene::HbGraphicsScene(QObject* parent) : QGraphicsScene(parent),
-d_ptr(new HbGraphicsScenePrivate)
+HbGraphicsScene::HbGraphicsScene(QObject *parent) : QGraphicsScene(parent),
+ d_ptr(new HbGraphicsScenePrivate)
{
Q_D(HbGraphicsScene);
d->q_ptr = this;
#ifdef HB_RND_DRAW_ITEM_BORDERS // see the top of the file
- if ( QGraphicsView *view = qobject_cast<QGraphicsView*>( parent ) ) {
+ if (QGraphicsView *view = qobject_cast<QGraphicsView *>(parent)) {
// set the IndirectPainting flag -> drawItems() is called on paint.
- view->setOptimizationFlag( QGraphicsView::IndirectPainting, true );
- }
+ view->setOptimizationFlag(QGraphicsView::IndirectPainting, true);
+ }
#endif
setStickyFocus(true);
}
@@ -206,7 +206,7 @@
\reimp
\sa QGraphicsScene
*/
-void HbGraphicsScene::focusInEvent(QFocusEvent* focusEvent)
+void HbGraphicsScene::focusInEvent(QFocusEvent *focusEvent)
{
QGraphicsScene::focusInEvent(focusEvent);
}
@@ -215,7 +215,7 @@
\reimp
\sa QGraphicsScene
*/
-void HbGraphicsScene::focusOutEvent(QFocusEvent* focusEvent)
+void HbGraphicsScene::focusOutEvent(QFocusEvent *focusEvent)
{
QGraphicsScene::focusOutEvent(focusEvent);
}
@@ -224,19 +224,19 @@
\reimp
\sa QGraphicsScene
*/
-void HbGraphicsScene::mousePressEvent(QGraphicsSceneMouseEvent* mouseEvent)
+void HbGraphicsScene::mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent)
{
QGraphicsScene::mousePressEvent(mouseEvent);
// If the focused item is not HbWidget (and not an editor) then we send an event to close the input panel
- QGraphicsItem* focusedItem = focusItem();
- if(focusedItem) {
- QGraphicsObject* focusedObject = focusedItem->toGraphicsObject();
- if(focusedObject && !focusedObject->inherits("HbWidget") &&
- ((focusedObject->flags() & QGraphicsItem::ItemAcceptsInputMethod) == 0)) {
+ QGraphicsItem *focusedItem = focusItem();
+ if (focusedItem) {
+ QGraphicsObject *focusedObject = focusedItem->toGraphicsObject();
+ if (focusedObject && !focusedObject->inherits("HbWidget") &&
+ ((focusedObject->flags() & QGraphicsItem::ItemAcceptsInputMethod) == 0)) {
QInputContext *ic = qApp->inputContext();
if (ic) {
- QEvent *closeEvent = new QEvent(QEvent::CloseSoftwareInputPanel);
+ QEvent *closeEvent = new QEvent(QEvent::CloseSoftwareInputPanel);
ic->filterEvent(closeEvent);
delete closeEvent;
}
@@ -260,23 +260,23 @@
painter->setMatrix(items[i]->sceneMatrix(), true);
items[i]->paint(painter, &options[i], widget);
- const QColor randColor( qrand()%255, qrand()%255, qrand()%255 );
- painter->setPen( randColor );
+ const QColor randColor(qrand() % 255, qrand() % 255, qrand() % 255);
+ painter->setPen(randColor);
- painter->drawRect( items[i]->boundingRect() );
+ painter->drawRect(items[i]->boundingRect());
painter->restore();
}
#else
- QGraphicsScene::drawItems( painter, numItems, items, options, widget );
+ QGraphicsScene::drawItems(painter, numItems, items, options, widget);
#endif
// Switch to (1) to draw the borders of the scene
#if(0)
// Draw the scene rect
painter->save();
- const QColor randColor( qrand()%255, qrand()%255, qrand()%255 );
- painter->setPen( randColor );
- painter->drawRect( sceneRect() );
+ const QColor randColor(qrand() % 255, qrand() % 255, qrand() % 255);
+ painter->setPen(randColor);
+ painter->drawRect(sceneRect());
painter->restore();
#endif
}
@@ -297,37 +297,38 @@
}
d->mPolishWidgets = false;
}
- QGraphicsScene::drawBackground(painter,rect);
+ QGraphicsScene::drawBackground(painter, rect);
}
-void HbGraphicsScene::drawForeground ( QPainter * painter, const QRectF & /*rect*/ )
+void HbGraphicsScene::drawForeground(QPainter *painter, const QRectF & /*rect*/)
{
- Q_D(HbGraphicsScene);
+ Q_D(HbGraphicsScene);
if (!d->mToolTip) {
d->mToolTip = new HbToolTipLabel();
addItem(d->mToolTip);
}
- if(d->fpsCounterEnabled) {
- if(!d->mFPSTime) {
+ if (d->fpsCounterEnabled) {
+ if (!d->mFPSTime) {
d->mFPSTime = new QTime();
d->mFPSTime->start();
}
d->mDrawCount++;
- if(d->mFPSTime->elapsed() > 500) {
+ if (d->mFPSTime->elapsed() > 500) {
int elapsed = d->mFPSTime->restart();
qreal e = elapsed;
- if(d->mDrawCount > 2) { // just to minize problems with idle time
- d->mFPS = d->mFPS * 0.5 + 0.5 * (qreal(d->mDrawCount * 1000) / e);
+ if (d->mDrawCount > 2) { // just to minize problems with idle time
+ d->mFPS = d->mFPS * 0.5 + 0.5 * (qreal(d->mDrawCount * 1000) / e);
}
d->mDrawCount = 0;
QTimer::singleShot(10, this, SLOT(update()));
}
- if (d->mFPS > d->mMaxFPS)
- d->mMaxFPS = d->mFPS;
+ if (d->mFPS > d->mMaxFPS) {
+ d->mMaxFPS = d->mFPS;
+ }
painter->save();
- painter->setFont(QFont("Arial", 12, QFont::Bold ));
- painter->setPen(QColor(255,0,0));
- painter->drawText(0,32,QString("FPS: %0 (%1)").arg(int(d->mFPS)).arg(int(d->mMaxFPS)));
+ painter->setFont(QFont("Arial", 12, QFont::Bold));
+ painter->setPen(QColor(255, 0, 0));
+ painter->drawText(0, 32, QString("FPS: %0 (%1)").arg(int(d->mFPS)).arg(int(d->mMaxFPS)));
painter->restore();
}
}
@@ -335,7 +336,7 @@
/*!
\reimp
*/
-void HbGraphicsScene::helpEvent ( QGraphicsSceneHelpEvent * helpEvent )
+void HbGraphicsScene::helpEvent(QGraphicsSceneHelpEvent *helpEvent)
{
Q_UNUSED(helpEvent);
// Reimplemented to prevent desktop tool tips to be shown.
@@ -344,7 +345,7 @@
/*!
\reimp
*/
-bool HbGraphicsScene::event ( QEvent * event )
+bool HbGraphicsScene::event(QEvent *event)
{
Q_D(HbGraphicsScene);
@@ -360,7 +361,7 @@
QKeyEvent *e = static_cast<QKeyEvent *>(event);
result = d->focusChangeEvent(e);
event->accept();
- }
+ }
return result;
}
--- a/src/hbcore/core/hbgraphicsscene.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbgraphicsscene.h Fri Jun 11 13:58:22 2010 +0300
@@ -34,7 +34,7 @@
class HbGraphicsScenePrivate;
class HbPopup;
-class HB_CORE_EXPORT HbGraphicsScene : public QGraphicsScene
+class HB_CORE_EXPORT HbGraphicsScene : public QGraphicsScene //krazy:exclude=qclasses
{
Q_OBJECT
@@ -43,18 +43,18 @@
~HbGraphicsScene();
protected:
- void focusInEvent(QFocusEvent *focusEvent);
+ void focusInEvent(QFocusEvent *focusEvent);
void focusOutEvent(QFocusEvent *focusEvent);
- void mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent);
+ void mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent);
void drawItems(QPainter *painter, int numItems,
- QGraphicsItem *items[],
- const QStyleOptionGraphicsItem options[],
- QWidget *widget = 0);
+ QGraphicsItem *items[],
+ const QStyleOptionGraphicsItem options[],
+ QWidget *widget = 0);
void drawBackground(QPainter *painter, const QRectF &rect);
void drawForeground(QPainter *painter, const QRectF &rect);
- void helpEvent ( QGraphicsSceneHelpEvent * helpEvent );
- bool event ( QEvent * event );
+ void helpEvent(QGraphicsSceneHelpEvent *helpEvent);
+ bool event(QEvent *event);
private:
HbGraphicsScenePrivate *const d_ptr;
--- a/src/hbcore/core/hbgraphicsscene_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbgraphicsscene_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -44,7 +44,7 @@
HbGraphicsScenePrivate();
virtual ~HbGraphicsScenePrivate();
- void setInputFocus(QGraphicsItem* focusingWidget);
+ void setInputFocus(QGraphicsItem *focusingWidget);
void clearInputFocus();
bool focusChangeEvent(const QKeyEvent *event);
@@ -52,7 +52,7 @@
void showPopup(HbPopup *popup);
void hidePopup(HbPopup *popup);
- HbPopupManager* popupManager();
+ HbPopupManager *popupManager();
public:
HbGraphicsScene *q_ptr;
@@ -64,7 +64,7 @@
static bool fpsCounterEnabled;
int mDrawCount;
qreal mFPS;
- QTime *mFPSTime;
+ QTime *mFPSTime;
qreal mMaxFPS;
private:
--- a/src/hbcore/core/hbinstance.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbinstance.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -40,7 +40,7 @@
// for testability plugin
#ifdef HB_TESTABILITY
-#include <QtPlugin>
+#include <QtPlugin>
#include <QPluginLoader>
#include <QLibraryInfo>
#include "hbtestabilityinterface_p.h"
@@ -76,7 +76,7 @@
hbInstance).
The example below shows how hbInstance global pointer can be used to access theme name:
-
+
\dontinclude ultimatecodesnippet/main.cpp
\skip int main(
\until setApplicationName
@@ -85,7 +85,7 @@
\sa QApplication
\sa HbApplication
-
+
*/
/*!
@@ -106,11 +106,11 @@
mStyle(0),
mTheme(HbTheme::instance()),
mOrientation(Qt::Vertical),
- mLibraryPaths( 0 )
-#ifdef Q_OS_SYMBIAN
- ,testabilityEnabled(false)
+ mLibraryPaths(0)
+#ifdef Q_OS_SYMBIAN
+ , testabilityEnabled(false)
#endif //Q_OS_SYMBIAN
- ,mLocaleChangeNotifier(0)
+ , mLocaleChangeNotifier(0)
{
// initialization of dynamics parts of feedback manager
HbFeedbackManager::instance();
@@ -118,22 +118,22 @@
#ifdef HB_TESTABILITY
testabilityInterface = 0;
-#ifdef Q_OS_SYMBIAN
- TRAPD( err, mRepo = CRepository::NewL( HBTESTABILITY_CREPO_ID ) );
- if( err == KErrNone ) {
- TInt value = 0;
- err = mRepo->Get( HbTestabilityKey, value );
- if(err == KErrNone && value == 1 ){
- testabilityEnabled = ETrue;
- }
- }
+#ifdef Q_OS_SYMBIAN
+ TRAPD(err, mRepo = CRepository::NewL(HBTESTABILITY_CREPO_ID));
+ if (err == KErrNone) {
+ TInt value = 0;
+ err = mRepo->Get(HbTestabilityKey, value);
+ if (err == KErrNone && value == 1) {
+ testabilityEnabled = ETrue;
+ }
+ }
#endif //Q_OS_SYMBIAN
#endif //HB_TESTABILITY
connect(mTheme, SIGNAL(changeFinished()), this, SLOT(updateScenes()));
#ifdef HB_TESTABILITY
- // Activate testability plugin if exists
+ // Activate testability plugin if exists
QObject *plugin = 0;
#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
@@ -152,45 +152,44 @@
#ifdef Q_OS_SYMBIAN
//TEMPORARY workaround:
- //there is a defect in s60 qt port so that it does not search for plugins
+ //there is a defect in s60 qt port so that it does not search for plugins
//from all possible drives, so check for existence before loading the plugin
//issue has been reported to port team and they will fix it at some point
- if(testabilityEnabled){
- QString flashDrive = "C:";
- QString romDrive = "Z:";
-
- //add drive letter to plugin path and then check c and z for the plugin
- if(!testabilityPlugin.startsWith(flashDrive,Qt::CaseInsensitive) && !testabilityPlugin.startsWith(romDrive,Qt::CaseInsensitive)){
- testabilityPlugin = flashDrive + testabilityPlugin;
+ if (testabilityEnabled) {
+ QString flashDrive = "C:";
+ QString romDrive = "Z:";
+
+ //add drive letter to plugin path and then check c and z for the plugin
+ if (!testabilityPlugin.startsWith(flashDrive, Qt::CaseInsensitive) && !testabilityPlugin.startsWith(romDrive, Qt::CaseInsensitive)) {
+ testabilityPlugin = flashDrive + testabilityPlugin;
+ }
+
+ QPluginLoader loader(testabilityPlugin.toLatin1().data());
+
+ plugin = loader.instance();
+
+ if (!plugin) {
+ if (testabilityPlugin.startsWith(flashDrive, Qt::CaseInsensitive)) {
+ testabilityPlugin.replace(flashDrive, romDrive, Qt::CaseInsensitive);
+ } else {
+ testabilityPlugin.replace(romDrive, flashDrive, Qt::CaseInsensitive);
+
}
-
- QPluginLoader loader(testabilityPlugin.toLatin1().data());
-
- plugin = loader.instance();
-
- if(!plugin){
- if(testabilityPlugin.startsWith(flashDrive,Qt::CaseInsensitive)){
- testabilityPlugin.replace(flashDrive, romDrive, Qt::CaseInsensitive);
- }
- else{
- testabilityPlugin.replace(romDrive, flashDrive, Qt::CaseInsensitive);
-
- }
- loader.setFileName(testabilityPlugin.toLatin1().data());
- plugin = loader.instance();
- }
+ loader.setFileName(testabilityPlugin.toLatin1().data());
+ plugin = loader.instance();
}
- //if the file is in neither then let failure occur similarly as with other platforms
-#else
+ }
+ //if the file is in neither then let failure occur similarly as with other platforms
+#else
QPluginLoader loader(testabilityPlugin.toLatin1().data());
plugin = loader.instance();
#endif //Q_OS_SYMBIAN
if (plugin) {
- testabilityInterface = qobject_cast<TestabilityInterface *>(plugin);
- if (testabilityInterface) {
- testabilityInterface->Initialize();
- }
+ testabilityInterface = qobject_cast<TestabilityInterface *>(plugin);
+ if (testabilityInterface) {
+ testabilityInterface->Initialize();
+ }
}
#endif //end testability
mLocaleChangeNotifier = q_check_ptr(new HbLocaleChangeNotifier());
@@ -215,25 +214,25 @@
*/
HbInstancePrivate::~HbInstancePrivate()
{
- delete mTypefaceInfo;
- delete mStyle;
+ delete mTypefaceInfo;
+ delete mStyle;
delete mLibraryPaths;
-
+
delete mLocaleChangeNotifier;
mLocaleChangeNotifier = 0;
-
+
#ifdef HB_TESTABILITY
//remove the testability plugin if it exists
//makes sure that all resources used by the plugin
//are free when the application exists
- if (testabilityInterface){
+ if (testabilityInterface) {
delete testabilityInterface;
testabilityInterface = 0;
}
#endif //HB_TESTABILITY
#ifdef Q_OS_SYMBIAN
- if(mRepo){
+ if (mRepo) {
delete mRepo;
mRepo = 0;
}
@@ -289,8 +288,8 @@
{
HbDeviceProfile oldProfile = mCurrentProfile;
mCurrentProfile = profile;
-
- QListIterator<HbMainWindow*> iterator(mWindows);
+
+ QListIterator<HbMainWindow *> iterator(mWindows);
while (iterator.hasNext()) {
HbMainWindow *window = iterator.next();
@@ -312,7 +311,7 @@
QGraphicsScene *updatedScene = 0; //krazy:exclude=qclasses
// Update graphics scenes
- Q_FOREACH(HbMainWindow *window, mWindows) {
+ Q_FOREACH(HbMainWindow * window, mWindows) {
QGraphicsScene *scene = window->scene(); //krazy:exclude=qclasses
if (scene && scene != updatedScene) {
scene->update();
@@ -360,7 +359,7 @@
*/
void HbInstancePrivate::initLibraryPaths()
{
- if ( !mLibraryPaths ) {
+ if (!mLibraryPaths) {
mLibraryPaths = new QStringList;
#if defined(Q_OS_SYMBIAN)
@@ -368,7 +367,7 @@
QFileInfoList driveInfoList = QDir::drives();
- foreach (const QFileInfo &driveInfo, driveInfoList) {
+ foreach(const QFileInfo & driveInfo, driveInfoList) {
QFileInfo pathInfo(driveInfo.absolutePath() + pluginRelativePath);
if (pathInfo.exists()) {
*mLibraryPaths << pathInfo.absolutePath();
@@ -405,7 +404,7 @@
/*!
Returns static instance
*/
-HbInstance* HbInstance::instance()
+HbInstance *HbInstance::instance()
{
if (!QCoreApplication::instance()) {
qWarning("HbInstance: No application instance present.");
@@ -423,26 +422,26 @@
\sa HbWidget::mainWindow()
*/
-QList<HbMainWindow*> HbInstance::allMainWindows() const
+QList<HbMainWindow *> HbInstance::allMainWindows() const
{
return d->mWindows;
}
/*!
- Returns the platform style object. Note that widgets can use HbWidget's style()-method to get the
- style without using HbInstance.
+ Returns the platform style object. Note that widgets can use HbWidget's style()-method to get the
+ style without using HbInstance.
*/
HbStyle *HbInstance::style() const
{
- if( !d->mStyle ){
- d->mStyle = new HbStyle();
+ if (!d->mStyle) {
+ d->mStyle = new HbStyle();
}
return d->mStyle;
}
/*!
- Returns the platform theme object.
+ Returns the platform theme object.
*/
HbTheme *HbInstance::theme() const
{
@@ -460,7 +459,7 @@
*/
void HbInstance::setLibraryPaths(const QStringList &paths)
{
- if ( !d->mLibraryPaths ) {
+ if (!d->mLibraryPaths) {
d->mLibraryPaths = new QStringList;
}
*d->mLibraryPaths = paths;
@@ -468,15 +467,15 @@
/*!
Prepends \a path to the beginning of the library path list. The paths
- will be search in order, so the \a path is the first.
+ will be search in order, so the \a path is the first.
The default path list consists of
- \li desktop environments: the installation directory for plugins
- and application execution directory. The default installation
- directory for plugins is INSTALL/plugins, where INSTALL is the
+ \li desktop environments: the installation directory for plugins
+ and application execution directory. The default installation
+ directory for plugins is INSTALL/plugins, where INSTALL is the
directory where Hb was installed.
- \li Symbian: \c resource/plugins/ directory on each drive found
+ \li Symbian: \c resource/plugins/ directory on each drive found
from the device
\sa HbInstance::removeLibraryPath()
@@ -485,8 +484,9 @@
*/
void HbInstance::addLibraryPath(const QString &path)
{
- if (path.isEmpty())
+ if (path.isEmpty()) {
return;
+ }
d->initLibraryPaths();
@@ -497,7 +497,7 @@
}
/*!
- Removes path from the library path list. If path is empty or not in the path list,
+ Removes path from the library path list. If path is empty or not in the path list,
the list is not changed.
See also addLibraryPath(), libraryPaths(), and setLibraryPaths().
@@ -516,7 +516,7 @@
/*!
- Returns a list of paths that the application will search when dynamically
+ Returns a list of paths that the application will search when dynamically
loading libraries.
\sa HbInstance::removeLibraryPath()
--- a/src/hbcore/core/hbinstance.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbinstance.h Fri Jun 11 13:58:22 2010 +0300
@@ -45,7 +45,7 @@
{
public:
static HbInstance *instance();
-
+
QList<HbMainWindow *> allMainWindows() const;
HbStyle *style() const;
@@ -62,7 +62,7 @@
~HbInstance();
friend class HbInstancePrivate;
- HbInstancePrivate * const d;
+ HbInstancePrivate *const d;
};
#endif // HBINSTANCE_H
--- a/src/hbcore/core/hbinstance_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbinstance_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -38,7 +38,7 @@
#ifdef Q_OS_SYMBIAN
#include <centralrepository.h>
const TUid HBTESTABILITY_CREPO_ID = {0x2002C3AE};
-const TUint32 HbTestabilityKey = 0x1;
+const TUint32 HbTestabilityKey = 0x1;
#endif
class HbLocaleChangeNotifier;
@@ -85,14 +85,14 @@
private:
#ifdef HB_TESTABILITY
TestabilityInterface *testabilityInterface;
-#ifdef Q_OS_SYMBIAN
- CRepository *mRepo;
- bool testabilityEnabled;
+#ifdef Q_OS_SYMBIAN
+ CRepository *mRepo;
+ bool testabilityEnabled;
#endif //Q_OS_SYMBIAN
#endif //HB_TESTABILITY
- HbLocaleChangeNotifier* mLocaleChangeNotifier;
-
+ HbLocaleChangeNotifier *mLocaleChangeNotifier;
+
// Provided for HbMainWindow & friends who have to access
// HbInstancePrivate in order to add/remove windows.
// NOTE: Still kept as private to track dependencies...
--- a/src/hbcore/core/hbmainwindoworientation.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbmainwindoworientation.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -23,10 +23,10 @@
**
****************************************************************************/
+#include "hbmainwindoworientation_p.h"
#include "hbmainwindow_p.h"
#include "hbinstance_p.h"
#include "hbforegroundwatcher_p.h"
-#include "hbmainwindoworientation_p.h"
#include <QSettings>
HbMainWindowOrientation *HbMainWindowOrientation::instance()
@@ -65,21 +65,21 @@
#ifndef Q_OS_SYMBIAN
void HbMainWindowOrientation::forceSensorOrientationValue(Qt::Orientation orientation)
{
- QSettings mSettings("Nokia", "HbStartUpDeskTopSensors");
+ QSettings mSettings("Nokia", "HbStartUpDeskTopSensors");
mSensorListener->setSensorOrientation(orientation);
- switch(orientation) {
- case Qt::Vertical:
- mSettings.setValue("Orientation", 2);
- break;
- case Qt::Horizontal:
- mSettings.setValue("Orientation", 1);
- break;
- default:
- break;
+ switch (orientation) {
+ case Qt::Vertical:
+ mSettings.setValue("Orientation", 2);
+ break;
+ case Qt::Horizontal:
+ mSettings.setValue("Orientation", 1);
+ break;
+ default:
+ break;
}
}
-#endif
+#endif
void HbMainWindowOrientation::handleForegroundGained()
{
@@ -92,27 +92,28 @@
mForeground = false;
}
-void HbMainWindowOrientation::handleWindowAdded(HbMainWindow *window)
+void HbMainWindowOrientation::handleWindowAdded(HbMainWindow *window)
{
mWindowList.append(window);
- if (isEnabled())
+ if (isEnabled()) {
mDefaultOrientation = HbMainWindowPrivate::d_ptr(window)->mDefaultOrientation;
+ }
}
-void HbMainWindowOrientation::handleWindowRemoved(HbMainWindow *window)
+void HbMainWindowOrientation::handleWindowRemoved(HbMainWindow *window)
{
- mWindowList.removeOne(window);
+ mWindowList.removeOne(window);
}
HbMainWindowOrientation::HbMainWindowOrientation(QObject *parent)
: QObject(parent),
- mSensorListener(0),
- mFixedOrientation(false)
+ mSensorListener(0),
+ mFixedOrientation(false)
{
//Get mainwindows from instance. Can't use mainWindow() method from HbWidget,
//because this class is not inherited from it
mWindowList = hbInstance->allMainWindows();
-
+
mForeground = true;
//Get a current device profile
@@ -121,10 +122,11 @@
QSize pSize(profile.logicalSize());
//Determine the default orientation width < height -> portrait
- if (pSize.width() < pSize.height())
+ if (pSize.width() < pSize.height()) {
mDefaultOrientation = Qt::Vertical;
- else
+ } else {
mDefaultOrientation = Qt::Horizontal;
+ }
mOrientation = mDefaultOrientation;
mSensorListener = new HbSensorListener(*this, mDefaultOrientation);
@@ -136,8 +138,8 @@
connect(mForegroundWatcher, SIGNAL(foregroundLost()), SLOT(handleForegroundLost()));
// Need a notification when a mainwindow is added or removed in the future.
- connect(HbInstancePrivate::d_ptr(), SIGNAL(windowAdded(HbMainWindow*)), SLOT(handleWindowAdded(HbMainWindow*)));
- connect(HbInstancePrivate::d_ptr(), SIGNAL(windowRemoved(HbMainWindow*)), SLOT(handleWindowRemoved(HbMainWindow*)));
+ connect(HbInstancePrivate::d_ptr(), SIGNAL(windowAdded(HbMainWindow *)), SLOT(handleWindowAdded(HbMainWindow *)));
+ connect(HbInstancePrivate::d_ptr(), SIGNAL(windowRemoved(HbMainWindow *)), SLOT(handleWindowRemoved(HbMainWindow *)));
// Update current orientation if sensors are enabled
if (isEnabled()) {
@@ -154,7 +156,7 @@
void HbMainWindowOrientation::sensorStatusChanged(bool status, bool notify)
{
if (status) {
- foreach(HbMainWindow *window, mWindowList) {
+ foreach(HbMainWindow * window, mWindowList) {
if (!mFixedOrientation && !HbMainWindowPrivate::d_ptr(window)->mUserOrientationSwitch) {
HbMainWindowPrivate::d_ptr(window)->mAutomaticOrientationSwitch = true;
}
@@ -175,16 +177,18 @@
if (!isEnabled() && notifyWhenDisabled) {
newOrientation = mDefaultOrientation;
}
- foreach(HbMainWindow *window, mWindowList) {
+ foreach(HbMainWindow * window, mWindowList) {
void *surface(0);
- if (window)
- surface = (void*)window->windowSurface();
- if (!HbMainWindowPrivate::d_ptr(window)->mAutomaticOrientationChangeAnimation)
+ if (window) {
+ surface = (void *)window->windowSurface();
+ }
+ if (!HbMainWindowPrivate::d_ptr(window)->mAutomaticOrientationChangeAnimation) {
animate = false;
-
+ }
+
if ((isEnabled() || notifyWhenDisabled) && (mForeground || surface)
- && HbMainWindowPrivate::d_ptr(window)->mAutomaticOrientationSwitch) {
- HbMainWindowPrivate::d_ptr(window)->setTransformedOrientation(newOrientation, animate);
+ && HbMainWindowPrivate::d_ptr(window)->mAutomaticOrientationSwitch) {
+ HbMainWindowPrivate::d_ptr(window)->setTransformedOrientation(newOrientation, animate);
}
}
}
--- a/src/hbcore/core/hbmainwindoworientation_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbmainwindoworientation_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -34,7 +34,7 @@
class HbForegroundWatcher;
class HbSleepModeListener;
-class HB_AUTOTEST_EXPORT HbMainWindowOrientation : public QObject,
+class HB_AUTOTEST_EXPORT HbMainWindowOrientation : public QObject,
public HbSensorListenerObserver
{
Q_OBJECT
@@ -54,12 +54,12 @@
void handleForegroundGained();
void handleForegroundLost();
void handleWindowAdded(HbMainWindow *window);
- void handleWindowRemoved(HbMainWindow *window);
+ void handleWindowRemoved(HbMainWindow *window);
-private:
+private:
HbMainWindowOrientation(QObject *parent = 0);
void sensorOrientationChanged(Qt::Orientation newOrientation);
- void sensorStatusChanged(bool status, bool notify);
+ void sensorStatusChanged(bool status, bool notify);
void notifyOrientationChange(bool animate, bool notifyWhenDisabled = false);
private:
--- a/src/hbcore/core/hbmemoryutils_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbmemoryutils_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -126,7 +126,8 @@
template <typename T>
static T * getAddress(HbMemoryManager::MemoryType type, int offset)
{
- if (offset < 0 ) {
+ // Do not change the condition to (<0), valid address can be negative.
+ if (offset == -1 || offset == -2) {
return 0;
}
GET_MEMORY_MANAGER(type)
--- a/src/hbcore/core/hbnamespace.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbnamespace.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -42,7 +42,7 @@
Navigation action for quitting the application.
*/
-/*! \var Hb::NavigationAction Hb::BackNaviAction
+/*! \var Hb::NavigationAction Hb::BackNaviAction
Navigation action for back.
*/
@@ -80,7 +80,7 @@
*/
/*! \var Hb::UiAttribute Hb::Ui_NoAttributes
- No UI attributes.
+ No UI attributes.
*/
/*! \var Hb::UiAttribute Hb::Ui_VisibleInTouch
@@ -90,10 +90,10 @@
/*! \var Hb::UiAttribute Hb::Ui_VisibleInNonTouch
The visibility of an UI component in non-touch device.
*/
-
- /*!
- \enum TouchGesture
- Enum that for different touch gestures.
+
+/*!
+ \enum TouchGesture
+ Enum that for different touch gestures.
*/
/*! \var Hb::TouchGesture Hb::Tap
@@ -103,10 +103,10 @@
Long press.
*/
/*! \var Hb::TouchGesture Hb::Pan
- Panning gesture.
+ Panning gesture.
*/
/*! \var Hb::TouchGesture Hb::Flick
- Flicking gesture.
+ Flicking gesture.
*/
/*!
@@ -115,11 +115,11 @@
This enum describes the item data roles in LibHb.
*/
/*! \var Hb::ItemDataRole Hb::ItemTypeRole
- This role specifies the type of the model item. If no type is specified StandardItem type is
+ This role specifies the type of the model item. If no type is specified StandardItem type is
used.
*/
/*! \var Hb::ItemDataRole Hb::UserRole
- The first role that can be used for application-specific purposes.
+ The first role that can be used for application-specific purposes.
*/
/*!
@@ -135,7 +135,7 @@
This is the parent item type. Parent item is an item that has or can have child items.
*/
/*! \var Hb::ModelItemType Hb::UserItem
- The first item type that can be used for application-specific purposes.
+ The first item type that can be used for application-specific purposes.
*/
/*!
@@ -166,12 +166,12 @@
In practice this means that virtual keyboard is not closed if focus is changed from editor to this widget.
*/
- /*!
- \enum ListContentType
- LibHb's predefined (list) item content types.
+/*!
+ \enum ListContentType
+ LibHb's predefined (list) item content types.
- This enum describes the (list) item content types available in LibHb.
- */
+ This enum describes the (list) item content types available in LibHb.
+ */
/*!
\enum ListItemColumn
@@ -187,24 +187,24 @@
This enum describes the (list) item content visibility values available in LibHb.
*/
- /*!
- \enum SceneItem
- LibHb's built-in scene items.
+/*!
+ \enum SceneItem
+ LibHb's built-in scene items.
- This enum describes the scene items available in LibHb.
- */
+ This enum describes the scene items available in LibHb.
+ */
- /*!
- \enum ResourceType
- Resource types.
+/*!
+ \enum ResourceType
+ Resource types.
- This enum describes the available types of resources in LibHb.
- */
+ This enum describes the available types of resources in LibHb.
+ */
/*!
\enum WindowFlag
HbMainWindow's window flags.
-
+
This enum describes the window flags which could be set to HbMainWindow.
*/
@@ -213,10 +213,10 @@
*/
/*! \var Hb::WindowFlag Hb::WindowFlagTransparent
- Indicates that HbMainWindow should use alpha blending for composition.
+ Indicates that HbMainWindow should use alpha blending for composition.
With this flag you can have transparent areas in UI. Setting this flag will
cause HbMainWindow to set Qt::FramelessWindowHint to it's flags and
- Qt::WA_TranslucentBackground to it's attributes.
+ Qt::WA_TranslucentBackground to it's attributes.
*/
/*! \var Hb::WindowFlag Hb::WindowFlagNoBackground
@@ -225,13 +225,13 @@
*/
/*! \var Hb::WindowFlag Hb::WindowFlagFixedVertical
- Indicates that the application uses vertical orientation at startup. If flag is not
+ Indicates that the application uses vertical orientation at startup. If flag is not
used or both WindowFlagFixedVertical and WindowFlagFixedHorizontal are used at the same time,
both flags are ignored and the orientation is managed automatically based on hw sensors.
*/
/*! \var Hb::WindowFlag Hb::WindowFlagFixedHorizontal
- Indicates that the application uses horizontal orientation at startup. If flag is not
+ Indicates that the application uses horizontal orientation at startup. If flag is not
used or both WindowFlagFixedVertical and WindowFlagFixedHorizontal are used at the same time,
both flags are ignored and the orientation is managed automatically based on hw sensors.
*/
@@ -300,7 +300,7 @@
The view switch effect is applied not just to the view's content but also other
decorators, e.g. the titlebar, the toolbar, etc. The background is not included.
-
+
This flag automatically implies ViewSwitchSequential.
*/
@@ -324,11 +324,11 @@
Forces the usage of the "show_alt" and "hide_alt" (also "show_alt_back" and "hide_alt_back")
events instead of "show" and "hide" (even when combined with other flags).
-
+
This flag is typically used when the alternative default effect is wanted, which is typically
a flip effect (although it is not guaranteed to be that for every theme).
- The alternative effects can be overriden using HbEffect::add() just like the normal ones.
+ The alternative effects can be overridden using HbEffect::add() just like the normal ones.
This flag automatically implies ViewSwitchSequential. (the default effect is parallel, the alternative is sequential)
*/
@@ -568,11 +568,11 @@
\var Hb::ActivationReason Hb::ActivationReasonService
Application was started as QtHighway service.
*/
-
+
/*!
\var Hb::ActivationReason Hb::ActivationReasonNormal
Application was started by other means.
- */
+ */
/*!
\enum Hb::BackgroundImageMode
@@ -582,7 +582,7 @@
/*!
\var Hb::BackgroundImageMode Hb::ScaleBackgroundToFit
-
+
The background image is scaled to cover the entire available area. The
aspect ratio is kept (by expanding the size if needed). The image is
centered in the available area.
@@ -590,7 +590,7 @@
/*!
\var Hb::BackgroundImageMode Hb::ScaleBackgroundToFitWithoutExpanding
-
+
The background image is scaled to cover most of the available area. The
aspect ratio is kept (without expanding) so the image may not occupy the
entire available area. The image is centered in the available area.
@@ -598,7 +598,7 @@
/*!
\var Hb::BackgroundImageMode Hb::StretchBackgroundToFit
-
+
The background image is stretched to cover the entire available area.
*/
--- a/src/hbcore/core/hbnamespace.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbnamespace.h Fri Jun 11 13:58:22 2010 +0300
@@ -35,13 +35,13 @@
class HB_CORE_EXPORT Hb
{
Q_GADGET
- Q_ENUMS( NavigationAction UiAttribute TouchGesture
- ItemDataRole GraphicsItemType SceneItem
- InstantInteraction ContinuousInteraction InteractionModifier
- TextCursorVisibility SliderTickPosition ModelItemType TextWrapping
- ActivationReason )
- Q_FLAGS( UiAttributes TouchGestures SceneItems SliderTickPositions
- TextContextMenuFlags )
+ Q_ENUMS(NavigationAction UiAttribute TouchGesture
+ ItemDataRole GraphicsItemType SceneItem
+ InstantInteraction ContinuousInteraction InteractionModifier
+ TextCursorVisibility SliderTickPosition ModelItemType TextWrapping
+ ActivationReason)
+ Q_FLAGS(UiAttributes TouchGestures SceneItems SliderTickPositions
+ TextContextMenuFlags)
public:
#else
@@ -54,24 +54,21 @@
static const int Key_SoftKeySecondary = Qt::Key_Launch1;
static const int Key_SoftKeyMiddle = Qt::Key_Launch2;
- enum NavigationAction
- {
+ enum NavigationAction {
QuitNaviAction,
BackNaviAction,
ConfirmNaviAction,
DoneNaviAction
};
-
- enum EffectEvent
- {
+
+ enum EffectEvent {
EffectFinished = 1,
EffectCancelled = 2,
EffectNotStarted = 3
};
-
- enum UiAttribute
- {
+
+ enum UiAttribute {
Ui_NoAttributes = 0x0000,
Ui_VisibleInTouch = 0x0001,
Ui_VisibleInNonTouch = 0x0002
@@ -82,8 +79,7 @@
/*!
Gesture types.
*/
- enum TouchGesture
- {
+ enum TouchGesture {
TapGesture = 0x0000001,
LongPressGesture = 0x0000002,
PanGesture = 0x0000004,
@@ -92,25 +88,22 @@
Q_DECLARE_FLAGS(TouchGestures, TouchGesture)
-
- enum ItemDataRole
- {
+
+ enum ItemDataRole {
ItemTypeRole = 1001,
- IndexFeedbackRole,
+ IndexFeedbackRole,
UserRole = 1500
};
- enum ModelItemType
- {
+ enum ModelItemType {
StandardItem,
ParentItem,
SeparatorItem,
UserItem = 1000
};
-
- enum GraphicsItemType
- {
- ItemType_NotificationDialog = QGraphicsItem::UserType+10000,
+
+ enum GraphicsItemType {
+ ItemType_NotificationDialog = QGraphicsItem::UserType + 10000,
ItemType_FrameItem,
ItemType_GraphicsPixmapItem,
ItemType_AbstractItemView,
@@ -147,7 +140,7 @@
ItemType_ToolBarExtension,
ItemType_ToolButton,
ItemType_Widget,
- ItemType_View,
+ ItemType_View,
ItemType_ConfirmationQuery,
ItemType_CheckBox,
ItemType_MessageQuery,
@@ -191,8 +184,7 @@
ItemType_Last = QGraphicsItem::UserType + 20000
};
- enum WidgetAttribute
- {
+ enum WidgetAttribute {
InteractionDisabled = 0x00000001,
InsidePopup = 0x00000002,
InputMethodNeutral = 0x00000004
@@ -208,7 +200,7 @@
StatusBarItem = 0x00000040,
AllItems = 0xFFFFFFFF
};
-
+
/*!
Anchor edges.
*/
@@ -230,7 +222,7 @@
};
Q_DECLARE_FLAGS(SceneItems, SceneItem)
-
+
enum WindowFlag {
WindowFlagNone = 0x00000000,
WindowFlagTransparent = 0x00000001,
@@ -261,14 +253,12 @@
Q_DECLARE_FLAGS(ViewSwitchFlags, ViewSwitchFlag)
- enum TextCursorVisibility
- {
+ enum TextCursorVisibility {
TextCursorHidden = 0,
TextCursorVisible
};
- enum SliderTickPosition
- {
+ enum SliderTickPosition {
NoSliderTicks = 0,
SliderTicksAbove = 1,
SliderTicksLeft = SliderTicksAbove,
@@ -285,17 +275,16 @@
ShowTextContextMenuOnLongPress = 4
};
Q_DECLARE_FLAGS(TextContextMenuFlags , TextContextMenuFlag)
-
+
/*!
A type definition for text wrapping
*/
- enum TextWrapping
- {
+ enum TextWrapping {
TextNoWrap = 0,
TextWordWrap = 1,
TextWrapAnywhere = 3
};
-
+
enum InstantInteraction {
InstantPressed = 0,
InstantReleased,
@@ -336,9 +325,9 @@
ModifierCollapsedItem = 0x8,
ModifierScrolling = 0x10
};
-
+
Q_DECLARE_FLAGS(InteractionModifiers, InteractionModifier)
-
+
enum ActivationReason {
ActivationReasonActivity = 0,
--- a/src/hbcore/core/hbnamespace_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbnamespace_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -33,124 +33,121 @@
*/
namespace HbPrivate
{
- // The following values are defined in units and used by HbTextItem
- // and HbMarqueeItem
- static const qreal TextTruncationFadeWidth = 6.0; //un
- static const qreal TextTruncationFadeHeight = 5.0; //un
+// The following values are defined in units and used by HbTextItem
+// and HbMarqueeItem
+static const qreal TextTruncationFadeWidth = 6.0; //un
+static const qreal TextTruncationFadeHeight = 5.0; //un
- enum GraphicsItemType
- {
- ItemType_PopupBackGround = QGraphicsItem::UserType+1,
- ItemType_FadeItem,
- ItemType_LongPressVisualizer,
- ItemType_BatteryIndicator,
- ItemType_IndicatorGroup,
- ItemType_IndicatorMenu,
- ItemType_SignalIndicator,
- ItemType_NavigationButton,
- ItemType_IndicatorButton,
- ItemType_TitlePane,
- ItemType_MessageBoxContentWidget,
- ItemType_MessageNoteContentWidget,
- ItemType_ProgressDialogContentWidget,
- ItemType_GraphicsItemGroup,
- ItemType_BackgroundItem,
- ItemType_MenuWidget,
- ItemType_MenuItem,
- ItemType_MenuListView,
- ItemType_ProgressSliderHandle,
- ItemType_SliderPopupContentWidget,
- ItemType_SliderControl,
- ItemType_ProgressSliderControl,
- ItemType_SliderElement,
- ItemType_SliderHandle,
- ItemType_SliderTickmarks,
- ItemType_SliderTickmarksLabel,
- ItemType_ToolTipLabel,
- ItemType_ColorDialogContentWidget,
- ItemType_CQContentWidget,
- ItemType_HbInputDialogContentWidget,
- ItemType_ConfirmationQueryContentWidget,
- ItemType_ListQueryContentWidget,
- ItemType_ListDialogContentWidget,
- ItemType_ColorGridViewItem,
- ItemType_MessageQueryContentWidget,
- ItemType_SettingFormHeadingWidget,
- ItemType_SettingItem,
- ItemType_SettingGroupHeadingWidget,
- ItemType_SettingGroup,
- ItemType_DataFormHeadingWidget,
- ItemType_DataItem,
- ItemType_DataGroupHeadingWidget,
- ItemType_DataGroup,
- ItemType_GroupBoxHeadingWidget,
- ItemType_GroupBoxContentWidget,
- ItemType_TitleBar,
- ItemType_TitleBarHandle,
- ItemType_StatusBar,
- ItemType_VolumeSlider,
- ItemType_ZoomSlider,
- ItemType_EndPrivate
+enum GraphicsItemType {
+ ItemType_PopupBackGround = QGraphicsItem::UserType + 1,
+ ItemType_FadeItem,
+ ItemType_LongPressVisualizer,
+ ItemType_BatteryIndicator,
+ ItemType_IndicatorGroup,
+ ItemType_IndicatorMenu,
+ ItemType_SignalIndicator,
+ ItemType_NavigationButton,
+ ItemType_IndicatorButton,
+ ItemType_TitlePane,
+ ItemType_MessageBoxContentWidget,
+ ItemType_MessageNoteContentWidget,
+ ItemType_ProgressDialogContentWidget,
+ ItemType_GraphicsItemGroup,
+ ItemType_BackgroundItem,
+ ItemType_MenuWidget,
+ ItemType_MenuItem,
+ ItemType_MenuListView,
+ ItemType_ProgressSliderHandle,
+ ItemType_SliderPopupContentWidget,
+ ItemType_SliderControl,
+ ItemType_ProgressSliderControl,
+ ItemType_SliderElement,
+ ItemType_SliderHandle,
+ ItemType_SliderTickmarks,
+ ItemType_SliderTickmarksLabel,
+ ItemType_ToolTipLabel,
+ ItemType_ColorDialogContentWidget,
+ ItemType_CQContentWidget,
+ ItemType_HbInputDialogContentWidget,
+ ItemType_ConfirmationQueryContentWidget,
+ ItemType_ListQueryContentWidget,
+ ItemType_ListDialogContentWidget,
+ ItemType_ColorGridViewItem,
+ ItemType_MessageQueryContentWidget,
+ ItemType_SettingFormHeadingWidget,
+ ItemType_SettingItem,
+ ItemType_SettingGroupHeadingWidget,
+ ItemType_SettingGroup,
+ ItemType_DataFormHeadingWidget,
+ ItemType_DataItem,
+ ItemType_DataGroupHeadingWidget,
+ ItemType_DataGroup,
+ ItemType_GroupBoxHeadingWidget,
+ ItemType_GroupBoxContentWidget,
+ ItemType_TitleBar,
+ ItemType_TitleBarHandle,
+ ItemType_StatusBar,
+ ItemType_VolumeSlider,
+ ItemType_ZoomSlider,
+ ItemType_EndPrivate
- };
+};
- /*
- LibHb's predefined Z values.
+/*
+ LibHb's predefined Z values.
- This enum describes the Z values available in LibHb.
- */
- enum HbZValues
- {
- RootItemZValue, /* Z value of the root parent item */
- BackgroundZValue, /* Z value of the background layer. */
- ContentZValue, /* Z value of the content layer. */
- TitleBarZValue, /* Z value of the titlebar. */
- StatusBarZValue, /* Z value of the statusbar. */
- ToolBarZValue, /* Z value of the toolbar. */
- DockWidgetZValue, /* Z value of the dockwidget item. */
- TitlePaneZValue, /* Z value of the title pane. */
- NaviPaneZValue, /* Z value of the navi pane. */
- SoftKeyZValue, /* Z value of the soft keys. */
- IndicatorGroupZValue, /* Z value of the indicator group. */
- FadingItemZValue, /* Z value of the fading item. */
+ This enum describes the Z values available in LibHb.
+ */
+enum HbZValues {
+ RootItemZValue, /* Z value of the root parent item */
+ BackgroundZValue, /* Z value of the background layer. */
+ ContentZValue, /* Z value of the content layer. */
+ TitleBarZValue, /* Z value of the titlebar. */
+ StatusBarZValue, /* Z value of the statusbar. */
+ ToolBarZValue, /* Z value of the toolbar. */
+ DockWidgetZValue, /* Z value of the dockwidget item. */
+ TitlePaneZValue, /* Z value of the title pane. */
+ NaviPaneZValue, /* Z value of the navi pane. */
+ SoftKeyZValue, /* Z value of the soft keys. */
+ IndicatorGroupZValue, /* Z value of the indicator group. */
+ FadingItemZValue, /* Z value of the fading item. */
- PopupZValueRangeStart = 0x00004000, /* Z value range start of the popup layer */
- PopupZValueDefaultOffset = 0x00044000, /* Default Z value offset for popup layer */
- PopupZValueRangeEnd = 0x00084000 /* Z value range end of the popup layer */
- };
+ PopupZValueRangeStart = 0x00004000, /* Z value range start of the popup layer */
+ PopupZValueDefaultOffset = 0x00044000, /* Default Z value offset for popup layer */
+ PopupZValueRangeEnd = 0x00084000 /* Z value range end of the popup layer */
+};
- /*
- LibHb's predefined item change values.
+/*
+ LibHb's predefined item change values.
- This enum describes the item change values available in LibHb.
- */
- enum HbItemChangeValues
- {
- ItemOrientationChange = 10000
- };
+ This enum describes the item change values available in LibHb.
+ */
+enum HbItemChangeValues {
+ ItemOrientationChange = 10000
+};
- //
- // Note: qreal type is used as zValue of graphics items including HbDialog objects. In some certain platforms (like in ARM)
- // qreal is defined as float. For a 32 bits float the number of significant digits is about 7.
- // It means that the Hb can have
- // at most 7 digits precision using qreal. So, the constants below has to be chosen so that the precision of Z values
- // used in popup is within the 7 digits range.
- //
+//
+// Note: qreal type is used as zValue of graphics items including HbDialog objects. In some certain platforms (like in ARM)
+// qreal is defined as float. For a 32 bits float the number of significant digits is about 7.
+// It means that the Hb can have
+// at most 7 digits precision using qreal. So, the constants below has to be chosen so that the precision of Z values
+// used in popup is within the 7 digits range.
+//
- // The number of different priorities currently equals the max number can be represented on quint8 + 1
- static const int PopupPriorityCount = 256;
+// The number of different priorities currently equals the max number can be represented on quint8 + 1
+static const int PopupPriorityCount = 256;
- // The number of popups that can have the same priority
- static const int PopupCountWithSamePriority = 64;
+// The number of popups that can have the same priority
+static const int PopupCountWithSamePriority = 64;
- static const qreal PopupWithDifferentPriorityZValueUnit = (PopupZValueRangeEnd-PopupZValueDefaultOffset)/PopupPriorityCount;
- static const qreal PopupWithSamePriorityZValueUnit = PopupWithDifferentPriorityZValueUnit / PopupCountWithSamePriority;
- static const qreal PopupBackgroundItemZValueUnit = PopupWithSamePriorityZValueUnit / 2;
- static const qreal FadingItemZValueUnit = PopupBackgroundItemZValueUnit / 2;
- static const qreal VKBValueUnit = FadingItemZValueUnit / 2;
- static const qreal SelectionControlHandlesValueUnit = VKBValueUnit / 2;
+static const qreal PopupWithDifferentPriorityZValueUnit = (PopupZValueRangeEnd - PopupZValueDefaultOffset) / PopupPriorityCount;
+static const qreal PopupWithSamePriorityZValueUnit = PopupWithDifferentPriorityZValueUnit / PopupCountWithSamePriority;
+static const qreal PopupBackgroundItemZValueUnit = PopupWithSamePriorityZValueUnit / 2;
+static const qreal FadingItemZValueUnit = PopupBackgroundItemZValueUnit / 2;
+static const qreal VKBValueUnit = FadingItemZValueUnit / 2;
+static const qreal SelectionControlHandlesValueUnit = VKBValueUnit / 2;
}
--- a/src/hbcore/core/hborientationstatus.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hborientationstatus.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -29,7 +29,7 @@
#include "hbforegroundwatcher_p.h"
// UID for process checking (write orientation value only when in theme server)
-const TUid KWriterServerUid = KHbPsOrientationCategoryUid;
+const TUid KWriterServerUid = KHbPsHardwareCoarseOrientationCategoryUid;
// PS related constants
_LIT_SECURITY_POLICY_PASS(KRdPolicy); // all pass
@@ -49,8 +49,9 @@
if (process.SecureId().iId == KWriterServerUid.iUid) {
orientationStatus = new HbOrientationStatus(parent, defaultOrientation);
}
+ process.Close();
}
-#else
+#else
Q_UNUSED(parent);
Q_UNUSED(defaultOrientation);
orientationStatus = 0;
@@ -71,7 +72,8 @@
#ifdef Q_OS_SYMBIAN
if (!orientationStatus) {
int currentOrientation = Qt::Vertical;
- if (RProperty::Get(KHbPsOrientationCategoryUid, KHbPsOrientationKey, currentOrientation) == KErrNone) {
+ if (RProperty::Get(KHbPsHardwareCoarseOrientationCategoryUid,
+ KHbPsHardwareCoarseOrientationKey, currentOrientation) == KErrNone) {
orientation = (Qt::Orientation)currentOrientation;
success = true;
}
@@ -82,8 +84,7 @@
if (settings.value("Orientation").toInt() == 1) {
orientation = Qt::Horizontal;
success = true;
- }
- else if (settings.value("Orientation").toInt() == 2) {
+ } else if (settings.value("Orientation").toInt() == 2) {
orientation = Qt::Vertical;
success = true;
}
@@ -92,22 +93,22 @@
}
HbOrientationStatus::HbOrientationStatus(QObject *parent, Qt::Orientation defaultOrientation)
-: QObject(parent)
-#ifdef Q_OS_SYMBIAN
-,mSensorListener(new HbSensorListener(*this, defaultOrientation, false))
-,mDefaultOrientation(defaultOrientation)
+ : QObject(parent)
+#ifdef Q_OS_SYMBIAN
+ , mSensorListener(new HbSensorListener(*this, defaultOrientation, false))
+ , mDefaultOrientation(defaultOrientation)
#endif
{
#ifdef Q_OS_SYMBIAN
HbForegroundWatcher::instance()->setSensorListener(mSensorListener);
// Create orientation property
- RProperty::Define(
- KHbPsOrientationCategoryUid, KHbPsOrientationKey, RProperty::EInt, KRdPolicy, KWrPolicy);
- mProperty.Attach(KHbPsOrientationCategoryUid, KHbPsOrientationKey);
+ RProperty::Define(KHbPsHardwareCoarseOrientationCategoryUid, KHbPsHardwareCoarseOrientationKey,
+ RProperty::EInt, KRdPolicy, KWrPolicy);
+ mProperty.Attach(KHbPsHardwareCoarseOrientationCategoryUid, KHbPsHardwareCoarseOrientationKey);
storeOrientation(defaultOrientation);
#else
- Q_UNUSED(parent);
- Q_UNUSED(defaultOrientation);
+ Q_UNUSED(parent);
+ Q_UNUSED(defaultOrientation);
#endif
}
@@ -120,9 +121,10 @@
{
Q_UNUSED(notify)
#ifdef Q_OS_SYMBIAN
- if (status == false)
+ if (status == false) {
storeOrientation(mDefaultOrientation);
-#else
+ }
+#else
Q_UNUSED(status)
#endif
}
@@ -131,7 +133,7 @@
{
#ifdef Q_OS_SYMBIAN
mProperty.Set(orientation);
-#else
+#else
Q_UNUSED(orientation);
#endif
}
--- a/src/hbcore/core/hborientationstatus_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hborientationstatus_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -23,8 +23,8 @@
**
****************************************************************************/
-#ifndef HBORIENTATIONSSTATUS_P_H
-#define HBORIENTATIONSSTATUS_P_H
+#ifndef HBORIENTATIONSTATUS_P_H
+#define HBORIENTATIONSTATUS_P_H
#include <QObject>
#include "hbsensorlistener_p.h"
@@ -56,4 +56,4 @@
#endif
};
-#endif // HBORIENTATIONSSTATUS_P_H
+#endif // HBORIENTATIONSTATUS_P_H
--- a/src/hbcore/core/hbsensorlistener.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbsensorlistener.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -23,15 +23,15 @@
**
****************************************************************************/
+#include "hbsensorlistener_p.h"
#include "hborientationstatus_p.h"
-#include "hbsensorlistener_p.h"
#ifdef Q_OS_SYMBIAN
-#include <sensrvchannelfinder.h>
-#include <sensrvchannel.h>
+#include <sensrvchannelfinder.h>
+#include <sensrvchannel.h>
#include <sensrvdatalistener.h>
#include <centralrepository.h>
-#include <e32property.h>
+#include <e32property.h>
#include "hbcommoncrkeys.h"
#include "hbsensornotifyhandler_p.h"
#else
@@ -43,16 +43,16 @@
HbSensorListener::HbSensorListener(HbSensorListenerObserver &observer,
Qt::Orientation defaultOrientation,
bool updateOrientation)
-:
-mObserver(observer),
-mDefaultOrientation(defaultOrientation),
-mOrientation(mDefaultOrientation),
-mEnabled(false),
-mSettingsEnabled(false)
+ :
+ mObserver(observer),
+ mDefaultOrientation(defaultOrientation),
+ mOrientation(mDefaultOrientation),
+ mEnabled(false),
+ mSettingsEnabled(false)
#ifdef Q_OS_SYMBIAN
-,
-mNotifyHandler(0),
-mSensrvChannel(0)
+ ,
+ mNotifyHandler(0),
+ mSensrvChannel(0)
#endif
{
checkCenrepValue();
@@ -89,26 +89,27 @@
void HbSensorListener::checkCenrepValue()
{
#ifdef Q_OS_SYMBIAN
- CRepository* repository = 0;
- TRAPD( err, repository = CRepository::NewL(KHbSensorCenrepUid));
- if ( err ) {
- qWarning( "HbSensorListener::checkCenrepValue; repository->NewL fails, error code = %d", err );
+ CRepository *repository = 0;
+ TRAPD(err, repository = CRepository::NewL(KHbSensorCenrepUid));
+ if (err) {
+ qWarning("HbSensorListener::checkCenrepValue; repository->NewL fails, error code = %d", err);
} else {
TInt value = 0;
TInt err = repository->Get(KHbSensorCenrepKey, value);
- if (err == KErrNone)
+ if (err == KErrNone) {
cenrepValueChanged(value, false);
- else
- qWarning( "HbSensorListener::checkCenrepValue: repository->Get fails, error code = %d", err );
+ } else {
+ qWarning("HbSensorListener::checkCenrepValue: repository->Get fails, error code = %d", err);
+ }
}
if (!mNotifyHandler) {
TRAPD(err, mNotifyHandler = HbSensorNotifyHandler::NewL(*this));
if (err) {
- qWarning( "HbSensorListener::HbSensorListener: HbSensorNotifyHandler::NewL failed = %d", err );
+ qWarning("HbSensorListener::HbSensorListener: HbSensorNotifyHandler::NewL failed = %d", err);
} else {
- TRAPD( err, mNotifyHandler->startObservingL());
+ TRAPD(err, mNotifyHandler->startObservingL());
if (err) {
- qWarning( "HbSensorListener::HbSensorListener: mNotifyHandler->startObservingL failed = %d", err );
+ qWarning("HbSensorListener::HbSensorListener: mNotifyHandler->startObservingL failed = %d", err);
}
}
}
@@ -123,11 +124,11 @@
void HbSensorListener::enableSensors(bool enable, bool notify)
{
mEnabled = enable;
-#ifdef Q_OS_SYMBIAN
+#ifdef Q_OS_SYMBIAN
enableSensorListening(enable);
#else
mSettingsEnabled = enable;
-#endif
+#endif
if (notify) {
mObserver.sensorStatusChanged(enable, true);
}
@@ -156,7 +157,7 @@
void HbSensorListener::cenrepValueChanged(TInt aValue, bool notify)
{
- bool enable = (aValue == 0)? false : true;
+ bool enable = (aValue == 0) ? false : true;
mSettingsEnabled = enable;
enableSensors(enable, notify);
}
@@ -165,33 +166,33 @@
void HbSensorListener::startSensorChannel()
{
#ifdef Q_OS_SYMBIAN
- CSensrvChannelFinder* sensrvChannelFinder = CSensrvChannelFinder::NewLC();
+ CSensrvChannelFinder *sensrvChannelFinder = CSensrvChannelFinder::NewLC();
RSensrvChannelInfoList channelInfoList;
CleanupClosePushL(channelInfoList);
TSensrvChannelInfo mySearchConditions;
-
+
//Search only Orientation events.
- mySearchConditions.iChannelType = KSensrvChannelTypeIdOrientationData;
-
- TRAPD( err, sensrvChannelFinder->FindChannelsL(channelInfoList,mySearchConditions));
+ mySearchConditions.iChannelType = KSensrvChannelTypeIdOrientationData;
+
+ TRAPD(err, sensrvChannelFinder->FindChannelsL(channelInfoList, mySearchConditions));
if (!err) {
if (channelInfoList.Count()) {
- TRAP( err, mSensrvChannel = CSensrvChannel::NewL(channelInfoList[0]));
+ TRAP(err, mSensrvChannel = CSensrvChannel::NewL(channelInfoList[0]));
+ if (!err) {
+ TRAP(err, mSensrvChannel->OpenChannelL());
if (!err) {
- TRAP( err, mSensrvChannel->OpenChannelL());
- if (!err) {
- TRAP_IGNORE(mSensrvChannel->StartDataListeningL(this, 1,1,0));
- } else {
- qWarning("HbSensorListener::startSensorChannel fails, error code = %d", err);
- }
+ TRAP_IGNORE(mSensrvChannel->StartDataListeningL(this, 1, 1, 0));
+ } else {
+ qWarning("HbSensorListener::startSensorChannel fails, error code = %d", err);
}
}
-
+ }
+
channelInfoList.Close();
- CleanupStack::Pop( &channelInfoList );
- CleanupStack::PopAndDestroy( sensrvChannelFinder );
+ CleanupStack::Pop(&channelInfoList);
+ CleanupStack::PopAndDestroy(sensrvChannelFinder);
} else {
qWarning("HbSensorListener::startSensorChannel fails, error code = %d", err);
}
@@ -199,14 +200,14 @@
}
#ifdef Q_OS_SYMBIAN
-Qt::Orientation HbSensorListener::orientationFromData(CSensrvChannel& aChannel, TInt aCount)
+Qt::Orientation HbSensorListener::orientationFromData(CSensrvChannel &aChannel, TInt aCount)
{
Qt::Orientation orientation = mOrientation;
- if (aChannel.GetChannelInfo().iChannelType == KSensrvChannelTypeIdOrientationData ) {
+ if (aChannel.GetChannelInfo().iChannelType == KSensrvChannelTypeIdOrientationData) {
TSensrvOrientationData data;
- for ( TInt i = 0; i < aCount; i++ ) {
+ for (TInt i = 0; i < aCount; ++i) {
TPckgBuf<TSensrvOrientationData> dataBuf;
- aChannel.GetData( dataBuf );
+ aChannel.GetData(dataBuf);
data = dataBuf();
orientation = sensorOrientationToQtOrientation(data.iDeviceOrientation);
}
@@ -218,9 +219,9 @@
//Supported orientations form sensors are EOrientationDisplayRightUp and EOrientationDisplayUp.
Qt::Orientation HbSensorListener::sensorOrientationToQtOrientation(TSensrvOrientationData::TSensrvDeviceOrientation sensorOrientation) const
{
- if (mDefaultOrientation == Qt::Vertical || mDefaultOrientation == Qt::Horizontal ) {
+ if (mDefaultOrientation == Qt::Vertical || mDefaultOrientation == Qt::Horizontal) {
if (sensorOrientation == TSensrvOrientationData::EOrientationDisplayRightUp) {
- return Qt::Horizontal;
+ return Qt::Horizontal;
} else if (sensorOrientation == TSensrvOrientationData::EOrientationDisplayUp) {
return Qt::Vertical;
} else {
@@ -234,7 +235,7 @@
}
// From MSensrvDataListener
-void HbSensorListener::DataReceived(CSensrvChannel& aChannel, TInt aCount, TInt aDataLost)
+void HbSensorListener::DataReceived(CSensrvChannel &aChannel, TInt aCount, TInt aDataLost)
{
Q_UNUSED(aDataLost);
Qt::Orientation dataOrientation = orientationFromData(aChannel, aCount);
@@ -242,23 +243,16 @@
}
// From MSensrvDataListener
- void HbSensorListener::DataError( CSensrvChannel& aChannel, TSensrvErrorSeverity aError )
+void HbSensorListener::DataError(CSensrvChannel &aChannel, TSensrvErrorSeverity aError)
{
Q_UNUSED(aChannel);
Q_UNUSED(aError);
}
-// From MSensrvDataListener
- void HbSensorListener::GetDataListenerInterfaceL( TUid aInterfaceUid, TAny*& aInterface)
+// From MSensrvDataListener
+void HbSensorListener::GetDataListenerInterfaceL(TUid aInterfaceUid, TAny*& aInterface)
{
Q_UNUSED(aInterfaceUid);
Q_UNUSED(aInterface);
}
#endif
-
-
-
-
-
-
-
--- a/src/hbcore/core/hbsensorlistener_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbsensorlistener_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -40,14 +40,15 @@
#endif
class HbSensorNotifyHandler;
-class HbSensorListenerObserver {
+class HbSensorListenerObserver
+{
public:
virtual void sensorOrientationChanged(Qt::Orientation newOrientation) = 0;
virtual void sensorStatusChanged(bool status, bool notify) = 0;
virtual ~HbSensorListenerObserver() {}
};
-class HB_AUTOTEST_EXPORT HbSensorListener
+class HB_AUTOTEST_EXPORT HbSensorListener
#ifdef Q_OS_SYMBIAN
: public MSensrvDataListener
#endif
@@ -64,37 +65,37 @@
void setSensorOrientation(Qt::Orientation dataOrientation);
void enableSensors(bool enable, bool notify);
bool isEnabled() const;
-
+
#ifdef Q_OS_SYMBIAN
void cenrepValueChanged(TInt aValue, bool notify = true);
#endif
-
+
private:
void checkCenrepValue();
void startSensorChannel();
#ifdef Q_OS_SYMBIAN
- Qt::Orientation orientationFromData(CSensrvChannel& aChannel, TInt aCount);
- Qt::Orientation sensorOrientationToQtOrientation(TSensrvOrientationData::TSensrvDeviceOrientation
- sensorOrientation) const;
+ Qt::Orientation orientationFromData(CSensrvChannel &aChannel, TInt aCount);
+ Qt::Orientation sensorOrientationToQtOrientation(TSensrvOrientationData::TSensrvDeviceOrientation
+ sensorOrientation) const;
void enableSensorListening(bool enable);
//From MSensrvDataListener
- void DataReceived(CSensrvChannel& aChannel, TInt aCount, TInt aDataLost);
- void DataError(CSensrvChannel& aChannel, TSensrvErrorSeverity aError);
+ void DataReceived(CSensrvChannel &aChannel, TInt aCount, TInt aDataLost);
+ void DataError(CSensrvChannel &aChannel, TSensrvErrorSeverity aError);
void GetDataListenerInterfaceL(TUid aInterfaceUid, TAny*& aInterface);
#endif
-
+
private:
- HbSensorListenerObserver& mObserver;
+ HbSensorListenerObserver &mObserver;
Qt::Orientation mDefaultOrientation;
Qt::Orientation mOrientation;
bool mEnabled;
bool mSettingsEnabled;
#ifdef Q_OS_SYMBIAN
- HbSensorNotifyHandler* mNotifyHandler;
- CSensrvChannel* mSensrvChannel;
+ HbSensorNotifyHandler *mNotifyHandler;
+ CSensrvChannel *mSensrvChannel;
friend class TestHbSensorOrientation;
#endif
};
--- a/src/hbcore/core/hbsensornotifyhandler_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbsensornotifyhandler_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -23,73 +23,73 @@
**
****************************************************************************/
-//These active objects observe the changing of the sensor cenrep value
-//and notify the sensorlistener when the change has occured
+// These active objects observe the changing of the sensor cenrep value
+// and notify the sensorlistener when the change has ocurred.
#include "hbsensornotifyhandler_p.h"
#include "hbcommoncrkeys.h"
#include <centralrepository.h>
#include <QtGlobal>
- HbSensorNotifyHandler* HbSensorNotifyHandler::NewL(HbSensorListener& aObserver)
- {
- HbSensorNotifyHandler* self = new (ELeave) HbSensorNotifyHandler(aObserver);
- CleanupStack::PushL(self);
- self->ConstructL();
- CleanupStack::Pop();
- return self;
- }
+HbSensorNotifyHandler *HbSensorNotifyHandler::NewL(HbSensorListener &aObserver)
+{
+ HbSensorNotifyHandler *self = new(ELeave) HbSensorNotifyHandler(aObserver);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop();
+ return self;
+}
- HbSensorNotifyHandler::HbSensorNotifyHandler(HbSensorListener& aObserver)
- : CActive(EPriorityStandard), mObserver(aObserver)
- {
- }
+HbSensorNotifyHandler::HbSensorNotifyHandler(HbSensorListener &aObserver)
+ : CActive(EPriorityStandard), mObserver(aObserver)
+{
+}
- void HbSensorNotifyHandler::ConstructL()
- {
- TRAPD(err, mRepository = CRepository::NewL(KHbSensorCenrepUid));
- if (err) {
- qWarning( "mRepository::NewL fails, error code = %d", err );
- }
- CActiveScheduler::Add(this);
- }
+void HbSensorNotifyHandler::ConstructL()
+{
+ TRAPD(err, mRepository = CRepository::NewL(KHbSensorCenrepUid));
+ if (err) {
+ qWarning("mRepository::NewL fails, error code = %d", err);
+ }
+ CActiveScheduler::Add(this);
+}
- HbSensorNotifyHandler::~HbSensorNotifyHandler()
- {
- Cancel(); //first cancel because iRepository is used there
- delete mRepository;
- }
+HbSensorNotifyHandler::~HbSensorNotifyHandler()
+{
+ Cancel(); //first cancel because iRepository is used there
+ delete mRepository;
+}
- void HbSensorNotifyHandler::startObservingL()
- {
- if (IsActive()) {
- return; //do nothing if allready observing
- }
- User::LeaveIfError(mRepository->NotifyRequest(KHbSensorCenrepKey, iStatus));
- SetActive();
- }
-
- void HbSensorNotifyHandler::stopObserving()
- {
- Cancel();
- }
+void HbSensorNotifyHandler::startObservingL()
+{
+ if (IsActive()) {
+ return; // do nothing if already observing
+ }
+ User::LeaveIfError(mRepository->NotifyRequest(KHbSensorCenrepKey, iStatus));
+ SetActive();
+}
+
+void HbSensorNotifyHandler::stopObserving()
+{
+ Cancel();
+}
- void HbSensorNotifyHandler::DoCancel()
- {
- mRepository->NotifyCancel(KHbSensorCenrepKey);
- }
+void HbSensorNotifyHandler::DoCancel()
+{
+ mRepository->NotifyCancel(KHbSensorCenrepKey);
+}
- void HbSensorNotifyHandler::RunL()
- {
- TInt value = 0;
- TInt error = mRepository->Get(KHbSensorCenrepKey, value);
- if (error == KErrNone) {
+void HbSensorNotifyHandler::RunL()
+{
+ TInt value = 0;
+ TInt error = mRepository->Get(KHbSensorCenrepKey, value);
+ if (error == KErrNone) {
mObserver.cenrepValueChanged(value);
- }
- // Re-subscribe
- error = mRepository->NotifyRequest(KHbSensorCenrepKey, iStatus);
- if (error == KErrNone) {
- SetActive();
- }
- }
-
+ }
+ // Re-subscribe
+ error = mRepository->NotifyRequest(KHbSensorCenrepKey, iStatus);
+ if (error == KErrNone) {
+ SetActive();
+ }
+}
+
--- a/src/hbcore/core/hbsensornotifyhandler_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbsensornotifyhandler_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -27,31 +27,32 @@
#define HB_SENSOR_NOTIFY_HANDLER_H
#include "hbsensorlistener_p.h"
-#include <e32base.h>
+#include <e32base.h>
class CRepository;
class HbSensorListener;
-class HbSensorNotifyHandler : public CActive {
+class HbSensorNotifyHandler : public CActive
+{
public:
- static HbSensorNotifyHandler* NewL(HbSensorListener& aObserver);
+ static HbSensorNotifyHandler *NewL(HbSensorListener &aObserver);
virtual ~HbSensorNotifyHandler();
void startObservingL();
void stopObserving();
-
+
protected: // From CActive
void RunL();
void DoCancel();
-
+
private:
- HbSensorNotifyHandler(HbSensorListener& aObserver);
+ HbSensorNotifyHandler(HbSensorListener &aObserver);
void ConstructL();
private:
- CRepository* mRepository;
- HbSensorListener& mObserver;
+ CRepository *mRepository;
+ HbSensorListener &mObserver;
};
#endif //HB_SENSOR_NOTIFY_HANDLER_H
--- a/src/hbcore/core/hbsharedcache.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbsharedcache.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -29,6 +29,11 @@
static QLatin1String SemaphoreName("hbsharedcache_semaphore");
+static const QString ColorCSSEnding = "_color.css";
+static const QString CSSFileExtension = ".css";
+static const QString WidgetMLFileExtension = ".widgetml";
+static const QChar KeySeparator('\0');
+
#include "hbsharedcache_p.h"
#include "hbsharedmemorymanager_p.h"
@@ -36,6 +41,9 @@
#include "hbcssconverterutils_p.h"
#endif
+/*!
+ Helper class for locking the cache.
+*/
class HbCacheLocker
{
public:
@@ -50,32 +58,9 @@
QSystemSemaphore &semaphore;
};
-const HbOffsetItem *binaryFind(const QStringRef &key, const HbOffsetItem *itemArray, int count)
-{
- int begin = 0;
- int end = count - 1;
-
- // binary search
- while (begin <= end) {
- int mid = begin + (end - begin) / 2;
- // Fast string comparison, no unnecessary mem copy
- QLatin1String offsetName(reinterpret_cast<const char*>(itemArray)
- + itemArray[mid].nameOffset);
- int comparison = key.compare(offsetName);
- // If the item was found, we're done.
- if (!comparison) {
- return &itemArray[mid];
- } else if (comparison < 0) {
- end = mid - 1;
- } else {
- begin = mid + 1;
- }
- }
-
- // Did not find the target, return 0.
- return 0;
-}
-
+/*!
+ return the singleton instance.
+*/
HbSharedCache *HbSharedCache::instance()
{
GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
@@ -86,13 +71,42 @@
return ptr;
}
-//doesn't check, if the item is already in the cache.
+/*!
+ return hash value for \a string.
+*/
+quint32 HbSharedCache::hash(const QStringRef &string)
+{
+ quint32 hashValue = 0;
+ const QChar *data = string.unicode();
+ int size = string.size();
+ while (size--) {
+ hashValue = data->unicode() + (hashValue << 6) + (hashValue << 16) - hashValue;
+ ++data;
+ }
+ return hashValue;
+}
+
+/*!
+ adds \a offset using key \a key. \a itemType is the type of the structure,
+ where offset points to.
+ Only acceptable separator for key is '/'.
+
+ doesn't check, if the item is already in the cache.
+*/
bool HbSharedCache::add(ItemType itemType, const QString &key, int offset)
{
bool added = false;
if (offset >= 0) {
+ QString cacheKey(key);
+ if (cacheKey.at(0) == ':') {
+ //use only filename as a key.
+ int index = cacheKey.lastIndexOf('/');
+ if (index >= 0) {
+ cacheKey = cacheKey.right((cacheKey.size() - 1) - index);
+ }
+ }
try {
- CacheItem cacheItem(key, offset);
+ CacheItem cacheItem(cacheKey, offset);
HbVector<CacheItem> &vector = itemCache(itemType);
HbCacheLocker locker(*Semaphore);
vector.append(cacheItem);
@@ -104,39 +118,132 @@
return added;
}
-int HbSharedCache::offset(ItemType itemType, const QString &key) const
+/*!
+ adds layout definition \a offset for a path \a filePath, \a layout, \a section.
+
+ doesn't check, if the item is already in the cache.
+ Only acceptable separator for filePath is '/'.
+*/
+bool HbSharedCache::addLayoutDefinition(const QString &filePath,
+ const QString &layout,
+ const QString §ion,
+ int offset)
+{
+ return add(LayoutDefinition, layoutDefinitionKey(filePath, layout, section), offset);
+}
+
+/*!
+ return layout offset for a \a filePath, \a layout, \a section.
+
+ Only acceptable separator for filePath is '/'.
+*/
+int HbSharedCache::layoutDefinitionOffset(const QString &filePath,
+ const QString &layout,
+ const QString §ion) const
{
int offset = -1;
- if (itemType == Stylesheet && mOffsetItemCount > 0) {
- //try first in offset map.
- QStringRef cacheKey(&key);
- if (key.at(0) == ':') {
- //resource css use only filename as a key.
- int index = key.lastIndexOf('/');
- if (index >= 0) {
- cacheKey = key.rightRef((key.size() - 1) - index);
+ int position = 0;
+ int length = filePath.length();
+ if (filePath.at(0) == ':') {
+ //resource css use only file name as a key.
+ int index = filePath.lastIndexOf('/');
+ if (index >= 0) {
+ position = index + 1;
+ length = filePath.length() - position;
+ }
+ }
+ if (mOffsetItemCount > 0) {
+ //try first in prebuilt offset map.
+ length -= WidgetMLFileExtension.length();
+ QStringRef widgetname(&filePath, position, length);
+ HbOffsetItem find(hash(widgetname));
+ const HbOffsetItem *end = mOffsetItems + mOffsetItemCount;
+ const HbOffsetItem *offsetItem = qBinaryFind(mOffsetItems, end, find);
+ if (offsetItem != end) {
+#ifdef CSSBIN_TRACES
+ qDebug() << "Offset item found from static cache map for widget: " << widgetname;
+#endif
+ int tableSize = 0;
+ const HbLayoutIndexItem *begin = layoutIndexItemBegin(
+ offsetItem->offsetLayoutIndexTable, &tableSize);
+ if (begin) {
+ const HbLayoutIndexItem *end = begin + tableSize;
+ HbLayoutIndexItem find(hash(QStringRef(&layout)), hash(QStringRef(§ion)));
+ const HbLayoutIndexItem *item = qBinaryFind(begin, end, find);
+ if (item != end) {
+#ifdef CSSBIN_TRACES
+ qDebug() << "Layout definition offset found for layout: " << layout;
+#endif
+ offset = item->offset;
+ }
}
}
- const HbOffsetItem *offsetItem = binaryFind(cacheKey, mOffsetItems, mOffsetItemCount);
- if (offsetItem) {
-#ifdef CSSBIN_TRACES
- qDebug() << "Css offset found from static map for key: " << cacheKey;
-#endif
- offset = offsetItem->offset;
- return offset;
- }
}
- const HbVector<CacheItem> &cacheVector = itemCache(itemType);
- HbCacheLocker locker(*Semaphore);
- Q_FOREACH(const CacheItem &item, cacheVector) {
- if (item.key == key) {
- offset = item.offset;
- break;
- }
+ if (offset == -1) {
+ QStringRef filePathRef(&filePath, position, filePath.length() - position);
+ QString key;
+ key.reserve(filePathRef.length() + 2 //key separators
+ + layout.length() + section.length());
+ key.append(filePathRef)
+ .append(KeySeparator)
+ .append(layout)
+ .append(KeySeparator)
+ .append(section);
+ offset = findOffsetFromDynamicMap(LayoutDefinition, QStringRef(&key));
}
return offset;
}
+/*!
+ return offset for a key \a key. \a itemType is the type of the structure,
+ where offset points to.
+
+ Only acceptable separator for key is '/'.
+*/
+int HbSharedCache::offset(ItemType itemType, const QString &key) const
+{
+ int offset = -1;
+ int position = 0;
+ int length = key.length();
+ if (key.at(0) == ':') {
+ //resource css use only filename as a key.
+ int index = key.lastIndexOf('/');
+ if (index >= 0) {
+ position = index + 1;
+ length = key.length() - position;
+ }
+ }
+ if (itemType == Stylesheet && mOffsetItemCount > 0) {
+ //try first in prebuilt offset map.
+ int isColorCSS = false;
+ if (key.endsWith(ColorCSSEnding)) {
+ length -= ColorCSSEnding.length();
+ isColorCSS = true;
+ } else {
+ length -= CSSFileExtension.length();
+ }
+ QStringRef widgetname(&key, position, length);
+ HbOffsetItem find(hash(widgetname));
+ const HbOffsetItem *end = mOffsetItems + mOffsetItemCount;
+ const HbOffsetItem *offsetItem = qBinaryFind(mOffsetItems, end, find);
+ if (offsetItem != end) {
+#ifdef CSSBIN_TRACES
+ qDebug() << "Offset item found from static cache map for widget: " << widgetname;
+#endif
+ offset = (isColorCSS) ? offsetItem->offsetColorCSS : offsetItem->offsetCSS;
+ }
+ }
+ if (offset == -1) {
+ QStringRef keyRef(&key, position, key.length() - position);
+ offset = findOffsetFromDynamicMap(itemType, keyRef);
+ }
+ return offset;
+}
+
+/*!
+ remove offset for a key \a key. \a itemType is the type of the structure,
+ where offset points to.
+*/
bool HbSharedCache::remove(ItemType itemType, const QString &key)
{
bool removed = false;
@@ -154,14 +261,34 @@
return removed;
}
+/*!
+ remove layout definition offset.
+*/
+bool HbSharedCache::removeLayoutDefinition(const QString &filePath,
+ const QString &layout,
+ const QString §ion)
+{
+ return remove(LayoutDefinition, layoutDefinitionKey(filePath, layout, section));
+}
+
+/*!
+ add static offset map.
+*/
void HbSharedCache::addOffsetMap(const char *offsetMapData, int size, int offsetItemCount)
{
if (offsetMapData) {
memcpy(mOffsetItems, offsetMapData, size);
mOffsetItemCount = offsetItemCount;
#ifdef HB_BIN_CSS
- for (int i=0; i<offsetItemCount; ++i) {
- HbCssConverterUtils::registerOffsetHolder(&(mOffsetItems[i].offset));
+ for (int i = 0; i < offsetItemCount; ++i) {
+ HbCssConverterUtils::registerOffsetHolder(&(mOffsetItems[i].offsetCSS));
+ HbCssConverterUtils::registerOffsetHolder(&(mOffsetItems[i].offsetColorCSS));
+ int size = 0;
+ HbLayoutIndexItem *layoutItem = layoutIndexItemBegin(
+ mOffsetItems[i].offsetLayoutIndexTable, &size);
+ for(;size > 0; --size, ++layoutItem) {
+ HbCssConverterUtils::registerOffsetHolder(&(layoutItem->offset));
+ }
}
#endif
} else {
@@ -176,36 +303,99 @@
{
}
+int HbSharedCache::findOffsetFromDynamicMap(ItemType itemType, const QStringRef &key) const
+{
+ int offset = -1;
+ const HbVector<CacheItem> &cacheVector = itemCache(itemType);
+ HbCacheLocker locker(*Semaphore);
+ Q_FOREACH(const CacheItem &item, cacheVector) {
+ if (item.key == key) {
+ offset = item.offset;
+ break;
+ }
+ }
+ return offset;
+}
+
+/*!
+ return the first layoutindextitem and size in offset \a offset.
+ \a offset is a value in HbOffsetItem::offsetLayoutIndexTable.
+*/
+HbLayoutIndexItem *HbSharedCache::layoutIndexItemBegin(int offset, int *size)
+{
+ HbLayoutIndexItem *begin = 0;
+ *size = 0;
+ if (offset >= 0) {
+ void *layoutIndexBase = mOffsetItems;
+ int *sizePtr = reinterpret_cast<int *>(
+ static_cast<char *>(layoutIndexBase) + offset);
+ *size = *sizePtr;
+ begin = reinterpret_cast<HbLayoutIndexItem *>(sizePtr + 1);
+ }
+ return begin;
+}
+
+/*!
+ build a layoutdefinition key.
+*/
+QString HbSharedCache::layoutDefinitionKey(const QString &filePath,
+ const QString &layout,
+ const QString §ion)
+{
+ QStringRef nameKey(&filePath);
+ if (nameKey.at(0) == ':') {
+ //use only filename as a key.
+ int index = filePath.lastIndexOf('/');
+ if (index >= 0) {
+ nameKey = filePath.rightRef((filePath.size() - 1) - index);
+ }
+ }
+ QString key;
+ key.append(nameKey) += KeySeparator + layout + KeySeparator + section;
+ return key;
+}
+
void HbSharedCache::freeResources()
{
delete Semaphore;
Semaphore = 0;
}
+/*!
+ themeserver initialization function.
+*/
void HbSharedCache::initServer()
{
- mLayoutDefCache.reserve(20);
mEffectCache.reserve(20);
//server creates the semaphore.
Semaphore = new QSystemSemaphore(SemaphoreName, 1, QSystemSemaphore::Create);
#ifdef CSSBIN_TRACES
- qDebug() << "css offsets total: " << mOffsetItemCount;
+ qDebug() << "css offset items total: " << mOffsetItemCount;
#endif
}
+/*!
+ client side initialization function.
+*/
void HbSharedCache::initClient()
{
//client opens the semaphore created by the server.
Semaphore = new QSystemSemaphore(SemaphoreName, 1, QSystemSemaphore::Open);
}
+/*!
+ return the cache for a cache item type.
+*/
HbVector<HbSharedCache::CacheItem> &HbSharedCache::itemCache(ItemType type)
{
const HbVector<CacheItem> &items = const_cast<const HbSharedCache*>(this)->itemCache(type);
return const_cast<HbVector<CacheItem>&>(items);
}
+/*!
+ return the cache for a cache item type.
+*/
const HbVector<HbSharedCache::CacheItem> &HbSharedCache::itemCache(ItemType type) const
{
const HbVector<CacheItem> *items = 0;
@@ -225,4 +415,3 @@
}
return *items;
}
-
--- a/src/hbcore/core/hbsharedcache_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbsharedcache_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -31,13 +31,49 @@
struct HbOffsetItem
{
- HbOffsetItem() : nameOffset(-1), offset(-1) {}
- HbOffsetItem(int nameOffset, int offset)
- : nameOffset(nameOffset), offset(offset) {}
- int nameOffset;
- int offset;
+ explicit HbOffsetItem(quint32 widgetHash = 0) :
+ widgetHash(widgetHash),
+ offsetCSS(-1),
+ offsetColorCSS(-1),
+ offsetLayoutIndexTable(-1) {}
+
+ quint32 widgetHash;
+ qint32 offsetCSS;
+ qint32 offsetColorCSS;
+ qint32 offsetLayoutIndexTable;
};
+inline
+bool operator < (const HbOffsetItem &offsetItem1,
+ const HbOffsetItem &offsetItem2)
+{
+ return offsetItem1.widgetHash < offsetItem2.widgetHash;
+}
+
+struct HbLayoutIndexItem
+{
+ explicit HbLayoutIndexItem(quint32 layoutNameHash = 0, quint32 sectionNameHash = 0) :
+ layoutNameHash(layoutNameHash),
+ sectionNameHash(sectionNameHash),
+ offset(-1) {}
+ quint32 layoutNameHash;
+ quint32 sectionNameHash;
+ qint32 offset;
+};
+
+inline
+bool operator < (const HbLayoutIndexItem &layoutIndexItem1,
+ const HbLayoutIndexItem &layoutIndexItem2)
+{
+ if (layoutIndexItem1.layoutNameHash < layoutIndexItem2.layoutNameHash) {
+ return true;
+ }
+ if (layoutIndexItem1.layoutNameHash > layoutIndexItem2.layoutNameHash) {
+ return false;
+ }
+ return (layoutIndexItem1.sectionNameHash < layoutIndexItem2.sectionNameHash);
+}
+
class HB_CORE_PRIVATE_EXPORT HbSharedCache
{
private:
@@ -61,9 +97,20 @@
Effect
};
static HbSharedCache *instance();
+ static quint32 hash(const QStringRef &string);
bool add(ItemType itemType, const QString &key, int offset);
+ bool addLayoutDefinition(const QString &filePath,
+ const QString &layout,
+ const QString §ion,
+ int offset);
+ int layoutDefinitionOffset(const QString &filePath,
+ const QString &layout,
+ const QString §ion) const;
int offset(ItemType itemType, const QString &key) const;
bool remove(ItemType itemType, const QString &key);
+ bool removeLayoutDefinition(const QString &filePath,
+ const QString &layout,
+ const QString §ion);
private:
HbSharedCache();
@@ -73,16 +120,26 @@
HbVector<CacheItem> &itemCache(ItemType type);
const HbVector<CacheItem> &itemCache(ItemType type) const;
void addOffsetMap(const char *offsetMapData, int size, int offsetItemCount);
+ int findOffsetFromDynamicMap(ItemType itemType, const QStringRef &key) const;
+ const HbLayoutIndexItem *layoutIndexItemBegin(int offset, int *size) const
+ {
+ return const_cast<HbSharedCache*>(this)->layoutIndexItemBegin(offset, size);
+ }
+ HbLayoutIndexItem *layoutIndexItemBegin(int offset, int *size);
+ static QString layoutDefinitionKey(const QString &filePath,
+ const QString &layout,
+ const QString §ion);
+
friend class HbSharedMemoryManager;
friend class HbSharedMemoryManagerUt;
private:
- friend bool writeCssBinary(const QStringList &, const QString &);
+ friend bool testCss();
HbVector<CacheItem> mLayoutDefCache;
HbVector<CacheItem> mStylesheetCache;
HbVector<CacheItem> mEffectCache;
int mOffsetItemCount;
- HbOffsetItem mOffsetItems[1]; //actual size or array is mOffsetItemCount
+ HbOffsetItem mOffsetItems[1]; //actual size of array is mOffsetItemCount
};
#endif // HBSHAREDCACHE_P_H
--- a/src/hbcore/core/hbstandarddirs.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbstandarddirs.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -303,7 +303,9 @@
file.setFileName(absolutePath);
fileExists = file.open(QIODevice::ReadOnly);
file.close();
- return absolutePath;
+ if ( fileExists ) {
+ return absolutePath;
+ }
}
}
else if (resType == Hb::EffectResource) {
@@ -330,6 +332,12 @@
/* @param pathList. List of paths, relative or absolute. Modified to absolute paths.
* @param typeOfResource Type of Resource, can be Hb::StyleSheetResource or Hb::EffectResource.
*
+ * --------------------------------------------------------------------------------------
+ * This function is no longer needed for anything else than finding colorgroup css files.
+ *
+ * It can be removed (or whole HbStandardDirs can be removed) when color css files are moved to themeindex.
+ * --------------------------------------------------------------------------------------
+ *
*/
void HbStandardDirs::findResourceList(QMap<int, QString> &pathList,
Hb::ResourceType resType, bool assumeAbsolutesExists)
@@ -375,10 +383,19 @@
}
}
-QStringList HbStandardDirs::findExistingFolderList(const QStringList &relativeFolderPaths,
+QStringList HbStandardDirs::findExistingFolderList(const QStringList &relativeFolderPaths,
const QString ¤tThemeName,
Hb::ResourceType resType)
{
+ int baseThemeIndex = 0;
+ return findExistingFolderList(relativeFolderPaths, currentThemeName, resType, baseThemeIndex);
+}
+
+QStringList HbStandardDirs::findExistingFolderList(const QStringList &relativeFolderPaths,
+ const QString ¤tThemeName,
+ Hb::ResourceType resType,
+ int &baseThemeIndex)
+{
QString absolutePath;
QStringList existingPaths;
@@ -414,18 +431,22 @@
const HbThemeInfo &themeInfo = HbThemeUtils::baseTheme();
if (themeInfo.name != currentThemeName && resType == Hb::EffectResource) {
existingPaths.append(themeInfo.rootDir + '/' + HbThemeUtils::platformHierarchy + '/' + HbThemeUtils::effectsResourceFolder + '/' + themeInfo.name + '/');
+ baseThemeIndex = existingPaths.count() - 1;
}
return existingPaths;
}
-const QString &HbStandardDirs::themesDir()
+QString HbStandardDirs::themesDir()
{
#ifdef Q_OS_SYMBIAN
- static QString mainThemesDir("Z:\\resource\\hb\\");
+ static QString mainThemesDir("Z:/resource/hb");
#else
static QString mainThemesDir = QDir::fromNativeSeparators(qgetenv("HB_THEMES_DIR"));
#endif
- return mainThemesDir;
+ QString s("");
+ if (!mainThemesDir.isEmpty()) {
+ s.append(QDir(mainThemesDir).absolutePath());
+ }
+ return s;
}
-
--- a/src/hbcore/core/hbstandarddirs_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbstandarddirs_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -61,7 +61,12 @@
const QStringList &relativeFolderPaths,
const QString ¤tThemeName, Hb::ResourceType resType);
- static const QString &themesDir();
+ static QStringList findExistingFolderList(
+ const QStringList &relativeFolderPaths,
+ const QString ¤tThemeName, Hb::ResourceType resType,
+ int &baseThemeIndex);
+
+ static QString themesDir();
};
#endif
--- a/src/hbcore/core/hbstring_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbstring_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -515,6 +515,15 @@
}
/*
+ Overloaded "==" operator that takes QStringRef as
+ argument and returns boolean value.
+*/
+bool HbString::operator==(const QStringRef &strRef) const
+{
+ return compareString(strRef.constData(), strRef.length());
+}
+
+/*
Overloaded "!=" operator that takes HbString as argument
and returns boolean value
*/
@@ -819,6 +828,21 @@
return compare_helper(stringData, data->mLength, other);
}
+#ifdef CSS_PARSER_TRACES
+/*
+* Debugging support
+*/
+void HbString::print() const
+{
+ if (mDataOffset != -1 && mDataOffset != -2) {
+ GET_MEMORY_MANAGER(mMemoryType)
+ HbStringData * mData = HbMemoryUtils::getAddress<HbStringData>( mMemoryType, mDataOffset);
+ qDebug() << QString::fromRawData( (QChar*)((char*)manager->base()
+ + mData->mStartOffset), mData->mLength );
+ }
+}
+#endif // CSS_PARSER_TRACES
+
/*
Reads a HbString from the QDataStream
*/
--- a/src/hbcore/core/hbstring_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbstring_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -61,6 +61,7 @@
bool operator==( const HbString &str ) const;
bool operator==( const QLatin1String &str ) const;
bool operator==( const QString &str ) const;
+ bool operator==( const QStringRef &strRef ) const;
bool operator!=( const HbString &str ) const;
bool operator!=( const QLatin1String &str ) const;
bool operator!=( const QString &str ) const;
@@ -80,20 +81,8 @@
int compare( const QLatin1String &other ) const;
#ifdef CSS_PARSER_TRACES
- bool supportsPrinting() const
- {
- return true;
- }
- void print() const
- {
- if (mDataOffset != -1 && mDataOffset != -2) {
- GET_MEMORY_MANAGER(mMemoryType)
- HbStringData * mData = HbMemoryUtils::getAddress<HbStringData>( mMemoryType, mDataOffset);
- qDebug() << QString::fromRawData( (QChar*)((char*)manager->base()
- + mData->mStartOffset), mData->mLength );
- }
- }
-#endif //CSS_PARSER_TRACES
+ void print() const;
+#endif
private:
void copyString( const QChar *arr, int size );
--- a/src/hbcore/core/hbthemeindex.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbthemeindex.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -330,7 +330,6 @@
default:
{
return fullFileName(); // There was no mirrored icon, return normal icon
- break;
}
}
--- a/src/hbcore/core/hbthemesystemeffect.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbthemesystemeffect.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -26,6 +26,7 @@
#include "hbstandarddirs_p.h"
#include "hbthemesystemeffect_p.h"
+#include "hbthemesystemeffectmap_p.h"
#include <QApplication>
#include <QDebug>
@@ -33,13 +34,10 @@
#include <QFile>
#include <QStringList>
#ifdef Q_OS_SYMBIAN
-#include <babitflags.h>
#include <coemain.h>
-#include <w32std.h>
#endif //Q_OS_SYMBIAN
-// Define this to enable debug traces
-//#define HBTHEMESYSTEMEFFECT_DEBUG
+const char *confFilePath = "conf/system_effects_configuration.xml";
// Configuration XML elements
const QLatin1String mainElement("effects_configuration");
@@ -55,33 +53,30 @@
const QLatin1String appSwitchEffectId("app_switch");
// Helper class for storing effect info
-class EffectInfoEntry {
+class EffectInfoEntry
+{
public:
- HbThemeSystemEffect::SystemEffectId mEffectId;
+ HbThemeSystemEffectMap::SystemEffectId mEffectId;
QLatin1String mEffectIdStr;
};
// Effect info array
const EffectInfoEntry effectInfoArray[] = {
- { HbThemeSystemEffect::AppStart, appStartEffectId },
- { HbThemeSystemEffect::AppExit, appEndEffectId },
- { HbThemeSystemEffect::AppSwitch, appSwitchEffectId }
+ { HbThemeSystemEffectMap::AppStart, appStartEffectId },
+ { HbThemeSystemEffectMap::AppExit, appEndEffectId },
+ { HbThemeSystemEffectMap::AppSwitch, appSwitchEffectId }
};
const int effectInfoCount = sizeof(effectInfoArray) / sizeof(EffectInfoEntry);
-#ifdef Q_OS_SYMBIAN
-//const TInt tfxPurpose = Qt::Window;
-#endif //Q_OS_SYMBIAN
-
-
static HbThemeSystemEffect *systemEffect = 0;
HbThemeSystemEffect::~HbThemeSystemEffect()
{
+ delete mBaseEffects;
}
-void HbThemeSystemEffect::handleThemeChange(const QString& themeName)
+void HbThemeSystemEffect::handleThemeChange(const QString &themeName)
{
HbThemeSystemEffect *effect = instance();
if (effect) {
@@ -89,6 +84,139 @@
}
}
+HbThemeSystemEffect::HbThemeSystemEffect(QObject *parent)
+ : QObject(parent),
+ mBaseEffects(0),
+ mBaseEffectsRegistered(false)
+#ifdef Q_OS_SYMBIAN
+ , mWsSession(CCoeEnv::Static()->WsSession())
+#endif //Q_OS_SYMBIAN
+{
+}
+
+void HbThemeSystemEffect::setCurrentTheme(const QString &themeName)
+{
+#ifdef HBTHEMESYSTEMEFFECT_DEBUG
+ qDebug() << "HbThemeSystemEffect::setCurrentTheme:" << themeName;
+#endif //HBTHEMESYSTEMEFFECT_DEBUG
+
+ if (!themeName.isEmpty()) {
+
+ bool registeringOk = false;
+ QString confPath;
+
+ // Try registering the theme specific effects
+ if (getThemeEffectFolder(confPath, themeName)) {
+ HbThemeSystemEffectMap *themeEffects = parseConfigurationFile(confPath);
+ if (themeEffects->entryCount()) {
+ verifyAllEffectsFound(*themeEffects);
+ registerEffects(themeEffects);
+ registeringOk = true;
+ }
+ delete themeEffects;
+ themeEffects = 0;
+ }
+ // Theme specific effects registration failed
+ // Try registering the base theme effects
+ if (!registeringOk) {
+ // If base theme configuration does not exist, all effects are unregistered
+ registerEffects(baseThemeEffects());
+ }
+ }
+}
+
+bool HbThemeSystemEffect::getThemeEffectFolder(QString &path, const QString &themeName)
+{
+ bool pathFound = false;
+ QString effectDir = "themes/effects/" + themeName + "/";
+ QStringList queryList;
+ queryList.append(effectDir);
+ int baseThemeIndex = -1;
+ QStringList folderList = HbStandardDirs::findExistingFolderList(queryList,
+ themeName,
+ Hb::EffectResource,
+ baseThemeIndex);
+
+ // Search for current theme effect folder
+ QString pathCandidate;
+ for (int i = 0; i < folderList.count(); i++) {
+ pathCandidate = folderList.at(i);
+ // Skip resource folders
+ if (!pathCandidate.startsWith(":/") && i != baseThemeIndex) {
+ path = pathCandidate;
+ pathFound = true;
+ break;
+ }
+ }
+
+ // Save base theme effect folder path if not saved already
+ if (baseThemeIndex >= 0 && mBaseEffectsFolder.isEmpty()) {
+ QString baseEffectsFolder = folderList.at(baseThemeIndex);
+ if (!baseEffectsFolder.startsWith(":/")) {
+ mBaseEffectsFolder = baseEffectsFolder;
+ }
+ }
+ return pathFound;
+}
+
+void HbThemeSystemEffect::verifyAllEffectsFound(HbThemeSystemEffectMap &effects)
+{
+ if (effects.entryCount()) {
+ for (int i = 0; i < effectInfoCount; i++) {
+ HbThemeSystemEffectMap::SystemEffectId id = effectInfoArray[i].mEffectId;
+ if (!effects.defaultEntryFound(id)) {
+ if (mBaseEffects || baseThemeEffects()) {
+ effects.addDefaultEntry(id, mBaseEffects);
+ } else {
+ break;
+ }
+ }
+ }
+ }
+}
+
+void HbThemeSystemEffect::registerEffects(const HbThemeSystemEffectMap *effects)
+{
+ if (effects == mBaseEffects && mBaseEffectsRegistered) {
+#ifdef HBTHEMESYSTEMEFFECT_DEBUG
+ qDebug() << "HbThemeSystemEffect::registerEffects: not registering base theme effects"
+ << "since already registered!";
+#endif //HBTHEMESYSTEMEFFECT_DEBUG
+ return;
+ }
+ mBaseEffectsRegistered = false;
+ if (effects && effects->entryCount()) {
+ mBaseEffectsRegistered = effects == mBaseEffects;
+#ifdef HBTHEMESYSTEMEFFECT_DEBUG
+ if (mBaseEffectsRegistered) {
+ qDebug() << "HbThemeSystemEffect::registerEffects: registering base theme effects";
+ } else {
+ qDebug() << "HbThemeSystemEffect::registerEffects: registering theme specific effects";
+ }
+ effects->traceEffects();
+#endif //HBTHEMESYSTEMEFFECT_DEBUG
+#ifdef Q_OS_SYMBIAN
+ effects->registerEffects(mWsSession, mBaseEffectsFolder);
+#endif //Q_OS_SYMBIAN
+ } else {
+ // Disable warning until themes have the conf file
+ //qWarning() << "HbThemeSystemEffect::registerEffects: no system effects configuration"
+ // << "found - unregistering all system effects.";
+#ifdef Q_OS_SYMBIAN
+ effects->unregisterAllEffects(mWsSession);
+#endif //Q_OS_SYMBIAN
+ }
+}
+
+HbThemeSystemEffectMap *HbThemeSystemEffect::baseThemeEffects()
+{
+ // Base theme effects haven't been parsed yet
+ if (!mBaseEffects && !mBaseEffectsFolder.isEmpty()) {
+ mBaseEffects = parseConfigurationFile(mBaseEffectsFolder);
+ }
+ return mBaseEffects;
+}
+
HbThemeSystemEffect *HbThemeSystemEffect::instance()
{
if (!systemEffect) {
@@ -97,152 +225,74 @@
return systemEffect;
}
-HbThemeSystemEffect::HbThemeSystemEffect(QObject *parent)
- : QObject(parent)
-#ifdef Q_OS_SYMBIAN
- , mWsSession(CCoeEnv::Static()->WsSession())
-#endif //Q_OS_SYMBIAN
-{
-}
-
-void HbThemeSystemEffect::setCurrentTheme(const QString& themeName)
-{
-#ifdef HBTHEMESYSTEMEFFECT_DEBUG
- qDebug() << "HbThemeSystemEffect::setCurrentTheme:" << themeName;
-#endif //HBTHEMESYSTEMEFFECT_DEBUG
- if (!themeName.isEmpty()) {
- QString confPath;
- if (getThemeEffectFolder(confPath, themeName)) {
- mThemeEffectFolder = QDir::toNativeSeparators(confPath);
- confPath += "conf/system_effects_configuration.xml";
-#ifdef HBTHEMESYSTEMEFFECT_DEBUG
- qDebug() << "HbThemeSystemEffect::setCurrentTheme trying to parse file" << confPath;
-#endif //HBTHEMESYSTEMEFFECT_DEBUG
- bool parsingOk = parseConfigurationFile(confPath);
-#ifdef HBTHEMESYSTEMEFFECT_DEBUG
- QMapIterator<SystemEffectKey, SystemEffectValue> mapIt(mSystemEffects);
- while (mapIt.hasNext()) {
- mapIt.next();
- qDebug() << "HbThemeSystemEffect::setCurrentTheme appUid:"
- << mapIt.key().mAppUid << "effect id:" << mapIt.key().mEffectId
- << "outgoing effect file:" << mapIt.value().mOutgoingFile
- << "incoming effect file:" << mapIt.value().mIncomingFile;
- }
-#endif //HBTHEMESYSTEMEFFECT_DEBUG
- // Register effects
- // TODO: what to do if conf file not found (or some effect file not found)?
- if (parsingOk) {
- registerEffects();
- }
- }
- }
-}
-
-void HbThemeSystemEffect::registerEffects()
+HbThemeSystemEffectMap *HbThemeSystemEffect::parseConfigurationFile(const QString &effectsFolder)
{
-#ifdef Q_OS_SYMBIAN
- // Unregister all previous theme effects
- //mWsSession.UnregisterAllEffects();
-#endif //Q_OS_SYMBIAN
- QMapIterator<SystemEffectKey, SystemEffectValue> mapIt(mSystemEffects);
-#ifdef Q_OS_SYMBIAN
- TPtrC resourceDir = mThemeEffectFolder.utf16();
-#endif //Q_OS_SYMBIAN
- while (mapIt.hasNext()) {
- mapIt.next();
- // Register entry
+ HbThemeSystemEffectMap *effects = new HbThemeSystemEffectMap;
+ effects->setEffectsFolder(QDir::toNativeSeparators(effectsFolder));
+ QString filePath = effectsFolder + confFilePath;
#ifdef HBTHEMESYSTEMEFFECT_DEBUG
- if (!mapIt.key().mAppUid) {
- qDebug() << "HbThemeSystemEffect: Registering default system effect:"
- << mapIt.key().mEffectId << mapIt.value().mOutgoingFile << mapIt.value().mIncomingFile;
- } else {
- qDebug() << "HbThemeSystemEffect: Registering application (" << mapIt.key().mAppUid
- << ") specific system effect:" << mapIt.key().mEffectId
- << mapIt.value().mOutgoingFile << mapIt.value().mIncomingFile;
- }
+ qDebug() << "HbThemeSystemEffect::parseConfigurationFile trying to parse file" << filePath;
#endif //HBTHEMESYSTEMEFFECT_DEBUG
-#ifdef Q_OS_SYMBIAN
- TInt tfxAction = tfxTransitionAction(mapIt.key().mEffectId);
- // If no effect files defined, unregister effect
- if (mapIt.value().mOutgoingFile.isEmpty()
- && mapIt.value().mIncomingFile.isEmpty()) {
-// mWsSession.UnregisterEffect(tfxAction, tfxPurpose, mapIt.key().mAppUid);
- } else {
- TPtrC outgoingEffect = mapIt.value().mOutgoingFile.utf16();
- TPtrC incomingEffect = mapIt.value().mIncomingFile.utf16();
- TBitFlags effectFlags;
- if (mapIt.value().mIncomingHasPriority) {
-// effectFlags.Set(TTfxFlags::ETfxIncomingTakesPriority);
- }
-// mWsSession.RegisterEffect(tfxAction,
-// tfxPurpose,
-// resourceDir,
-// outgoingEffect,
-// incomingEffect,
-// mapIt.key().mAppUid,
-// effectFlags);
- }
-#endif //Q_OS_SYMBIAN
- }
-}
-
-bool HbThemeSystemEffect::parseConfigurationFile(const QString& filePath)
-{
bool success = true;
- mSystemEffects.clear();
QFile confFile(filePath);
success = confFile.open(QIODevice::ReadOnly);
if (success) {
QXmlStreamReader xml(&confFile);
success = checkStartElement(xml, mainElement);
if (success) {
- parseEffects(xml);
+ parseEffects(xml, effects);
if (xml.error()) {
- qWarning() << "HbThemeSystemEffect::parseConfigurationFile: Error when parsing xml " << xml.errorString();
+ qWarning() << "HbThemeSystemEffect::parseConfigurationFile: Error when parsing xml "
+ << xml.errorString();
success = false;
}
}
confFile.close();
} else {
- qWarning() << "HbThemeSystemEffect::parseConfigurationFile:" << filePath << "not found.";
+#ifdef HBTHEMESYSTEMEFFECT_DEBUG
+ qDebug() << "HbThemeSystemEffect::parseConfigurationFile:"
+ << confFile.fileName() << "not found.";
+#endif //HBTHEMESYSTEMEFFECT_DEBUG
}
- return success;
+ return effects;
}
-void HbThemeSystemEffect::parseEffects(QXmlStreamReader &xml)
+void HbThemeSystemEffect::parseEffects(QXmlStreamReader &xml, HbThemeSystemEffectMap *effects)
{
// Go through effects section
while (!xml.atEnd()) {
if (checkStartElement(xml, effectElement)) {
- SystemEffectId effectId = Invalid;
+ HbThemeSystemEffectMap::SystemEffectId effectId = HbThemeSystemEffectMap::Invalid;
uint appId = 0;
QString incomingFile;
QString outgoingFile;
bool incomingHasPriority = false;
bool validEntry = true;
bool effectFileEntryFound = false;
+ bool fromBaseTheme = false;
// Single effect entry
while (validEntry && xml.readNextStartElement()) {
// Effect id
if (xml.name() == effectIdElement) {
- effectId = (SystemEffectId)idFromEffectIdString(xml.readElementText());
- validEntry = !(effectId == Invalid);
- // App id
+ effectId = (HbThemeSystemEffectMap::SystemEffectId)
+ idFromEffectIdString(xml.readElementText());
+ validEntry = !(effectId == HbThemeSystemEffectMap::Invalid);
+ // App id
} else if (xml.name() == appIdElement) {
appId = validApplicationUid(xml.readElementText());
- // Outgoing effect file
+ // Outgoing effect file
} else if (xml.name() == outgoingFileElement) {
effectFileEntryFound = true;
outgoingFile = xml.readElementText();
- validEntry = validEffectFile(outgoingFile);
- // Incoming effect file
+ validEntry = validEffectFile(outgoingFile, effects, fromBaseTheme);
+ // Incoming effect file
} else if (xml.name() == incomingFileElement) {
effectFileEntryFound = true;
incomingFile = xml.readElementText();
- validEntry = validEffectFile(incomingFile);
- // If incoming file has the priority
+ validEntry = validEffectFile(incomingFile, effects, fromBaseTheme);
+ // If incoming file has the priority
} else if (xml.name() == incomingPriorityElement) {
incomingHasPriority = booleanFromString(xml.readElementText());
}
@@ -254,13 +304,19 @@
}
// If valid entry was found, store it to system effects map
if (validEntry) {
- addEntryToEffectMap(appId, effectId, incomingFile, outgoingFile, incomingHasPriority);
+ effects->addEntry(appId,
+ effectId,
+ incomingFile,
+ outgoingFile,
+ incomingHasPriority,
+ fromBaseTheme);
}
}
}
}
-bool HbThemeSystemEffect::checkStartElement(QXmlStreamReader &xml, const QLatin1String &startElement) const
+bool HbThemeSystemEffect::checkStartElement(QXmlStreamReader &xml,
+ const QLatin1String &startElement)
{
xml.readNext();
while (!xml.isStartElement() && !xml.atEnd()) {
@@ -270,41 +326,48 @@
if (success && xml.name() != startElement) {
success = false;
} else if (xml.error()) {
- qWarning()
- << "HbThemeSystemEffect::checkStartElement: Error when parsing system effect configuration : "
- << xml.errorString();
+ qWarning() << "HbThemeSystemEffect::checkStartElement:"
+ << " Error when parsing system effect configuration : " << xml.errorString();
} else if (!success && !xml.name().isEmpty()) {
- qWarning()
- << "HbThemeSystemEffect::checkStartElement: Error when parsing system effect configuration with element: "
- << xml.name();
+ qWarning() << "HbThemeSystemEffect::checkStartElement: "
+ << "Error when parsing system effect configuration with element: " << xml.name();
}
return success;
}
-int HbThemeSystemEffect::idFromEffectIdString(const QString &effectIdString) const
+int HbThemeSystemEffect::idFromEffectIdString(const QString &effectIdString)
{
- for (int i=0; i<effectInfoCount; i++) {
+ for (int i = 0; i < effectInfoCount; i++) {
if (effectInfoArray[i].mEffectIdStr == effectIdString) {
return effectInfoArray[i].mEffectId;
}
}
- return Invalid;
+ return HbThemeSystemEffectMap::Invalid;
}
-bool HbThemeSystemEffect::validEffectFile(const QString &effectFile) const
+bool HbThemeSystemEffect::validEffectFile(const QString &effectFile,
+ HbThemeSystemEffectMap *effects, bool &fromBaseTheme)
{
- bool validFile = true;
- // Validate file existance only if effects folder is found
- // (no validating with unit tests nonexistent effect files)
- if (!mThemeEffectFolder.isEmpty()) {
- if (!QFile(mThemeEffectFolder + effectFile).exists()) {
- validFile = false;
+ bool validFile = false;
+ // Check if file is found in theme effect folder
+ if (!fromBaseTheme) {
+ validFile = QFile(effects->effectsFolder() + effectFile).exists();
+ // Not found -> Check if file is found in base theme effect folder
+ if (!validFile && !instance()->mBaseEffectsFolder.isEmpty()
+ && instance()->mBaseEffectsFolder != effects->effectsFolder()) {
+ validFile = QFile(instance()->mBaseEffectsFolder + effectFile).exists();
+ if (validFile) {
+ fromBaseTheme = true;
+ }
}
+ // Other entry files found in base theme -> this should be found there too
+ } else {
+ validFile = QFile(instance()->mBaseEffectsFolder + effectFile).exists();
}
return validFile;
}
-uint HbThemeSystemEffect::validApplicationUid(const QString &appUid) const
+uint HbThemeSystemEffect::validApplicationUid(const QString &appUid)
{
bool ok = false;
int base = 10;
@@ -315,7 +378,7 @@
return uid;
}
-bool HbThemeSystemEffect::booleanFromString(const QString &boolAttribute) const
+bool HbThemeSystemEffect::booleanFromString(const QString &boolAttribute)
{
bool value = false;
if (boolAttribute == QLatin1String("true") || boolAttribute == QLatin1String("1")) {
@@ -324,62 +387,3 @@
return value;
}
-bool HbThemeSystemEffect::getThemeEffectFolder(QString &path, const QString &themeName) const
-{
- bool pathFound = false;
- QString effectDir = "themes/effects/" + themeName + "/";
- QStringList queryList;
- queryList.append(effectDir);
- QStringList folderList = HbStandardDirs::findExistingFolderList(queryList,
- themeName,
- Hb::EffectResource);
- QString pathCandidate;
- for (int i=0; i<folderList.count(); i++) {
- pathCandidate = folderList.at(i);
- // Skip resource folders
- if (!pathCandidate.startsWith(":/")) {
- path = pathCandidate;
- pathFound = true;
- break;
- }
- }
- return pathFound;
-}
-
-void HbThemeSystemEffect::addEntryToEffectMap(uint appUid,
- SystemEffectId id,
- const QString &incomingFile,
- const QString &outgoingFile,
- bool incomingHasPriority)
-{
- if (id != Invalid) {
- SystemEffectKey key(id, appUid);
- SystemEffectValue value(incomingFile, outgoingFile, incomingHasPriority);
- SystemEffectMap::iterator i = mSystemEffects.find(key);
- if (i == mSystemEffects.end()) {
- i = mSystemEffects.insert(key, value);
- }
- }
-}
-
-#ifdef Q_OS_SYMBIAN
-TInt HbThemeSystemEffect::tfxTransitionAction(const SystemEffectId id) const
-{
- TInt tfxTransitionAction = 0;
- switch (id) {
- case (AppStart) :
- //tfxTransitionAction = TTfxTransitionActions::ETfxActionStart;
- break;
- case (AppExit) :
- //tfxTransitionAction = TTfxTransitionActions::ETfxActionShutDown;
- break;
- case (AppSwitch) :
- //tfxTransitionAction = TTfxTransitionActions::ETfxActionSwitching;
- break;
- default:
- break;
- }
- return tfxTransitionAction;
-}
-#endif //Q_OS_SYMBIAN
-
--- a/src/hbcore/core/hbthemesystemeffect_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbthemesystemeffect_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -26,11 +26,11 @@
#ifndef HBTHEMESYSTEMEFFECT_P_H
#define HBTHEMESYSTEMEFFECT_P_H
-#include <hbglobal.h>
-#include <QMap>
#include <QObject>
#include <QXmlStreamReader>
+#include <hbglobal.h>
+class HbThemeSystemEffectMap;
#ifdef Q_OS_SYMBIAN
class RWsSession;
#endif //Q_OS_SYMBIAN
@@ -40,72 +40,33 @@
Q_OBJECT
public:
- enum SystemEffectId {
- Invalid = 0,
- AppStart,
- AppExit,
- AppSwitch
- };
-
~HbThemeSystemEffect();
static void handleThemeChange(const QString &themeName);
private:
- static HbThemeSystemEffect *instance();
HbThemeSystemEffect(QObject *parent);
void setCurrentTheme(const QString &themeName);
- void registerEffects();
- bool parseConfigurationFile(const QString& filePath);
- void parseEffects(QXmlStreamReader &xml);
- bool checkStartElement(QXmlStreamReader &xml, const QLatin1String &startElement) const;
- int idFromEffectIdString(const QString &effectIdString) const;
- bool validEffectFile(const QString &effectFile) const;
- uint validApplicationUid(const QString &appUid) const;
- bool booleanFromString(const QString &boolAttribute) const;
- bool getThemeEffectFolder(QString &path, const QString &themeName) const;
- void addEntryToEffectMap(uint appUid,
- SystemEffectId id,
- const QString &incomingFile,
- const QString &outgoingFile,
- bool incomingHasPriority);
+ bool getThemeEffectFolder(QString &path, const QString &themeName);
+ void verifyAllEffectsFound(HbThemeSystemEffectMap &effects);
+ void registerEffects(const HbThemeSystemEffectMap *effects);
+ HbThemeSystemEffectMap *parseBaseThemeEffects();
+ HbThemeSystemEffectMap *baseThemeEffects();
-#ifdef Q_OS_SYMBIAN
- TInt tfxTransitionAction(const SystemEffectId id) const;
-#endif //Q_OS_SYMBIAN
+ static HbThemeSystemEffect *instance();
+ static HbThemeSystemEffectMap *parseConfigurationFile(const QString &effectsFolder);
+ static void parseEffects(QXmlStreamReader &xml, HbThemeSystemEffectMap *effects);
+ static bool checkStartElement(QXmlStreamReader &xml, const QLatin1String &startElement);
+ static int idFromEffectIdString(const QString &effectIdString);
+ static bool validEffectFile(const QString &effectFile,
+ HbThemeSystemEffectMap *effects,
+ bool &fromBaseTheme);
+ static uint validApplicationUid(const QString &appUid);
+ static bool booleanFromString(const QString &boolAttribute);
private:
- class SystemEffectKey {
- public:
- inline SystemEffectKey(SystemEffectId effectId, uint appUid)
- : mEffectId(effectId), mAppUid(appUid){}
-
- inline bool operator<(const SystemEffectKey &other) const {
- return other.mAppUid == mAppUid ? other.mEffectId > mEffectId : other.mAppUid > mAppUid;
- }
-
- public:
- SystemEffectId mEffectId;
- uint mAppUid;
- };
-
- class SystemEffectValue {
- public:
- inline SystemEffectValue(const QString &incomingFile,
- const QString &outgoingFile,
- bool incomingHasPriority)
- : mIncomingFile(incomingFile),
- mOutgoingFile(outgoingFile),
- mIncomingHasPriority(incomingHasPriority) {}
-
- public:
- QString mIncomingFile;
- QString mOutgoingFile;
- bool mIncomingHasPriority;
- };
-
- typedef QMap<SystemEffectKey, SystemEffectValue> SystemEffectMap;
- SystemEffectMap mSystemEffects;
- QString mThemeEffectFolder;
+ HbThemeSystemEffectMap *mBaseEffects;
+ QString mBaseEffectsFolder;
+ bool mBaseEffectsRegistered;
#ifdef Q_OS_SYMBIAN
RWsSession &mWsSession;
#endif //Q_OS_SYMBIAN
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/core/hbthemesystemeffectmap.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,211 @@
+/****************************************************************************
+**
+** 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 <QDebug>
+#include "hbthemesystemeffectmap_p.h"
+
+#ifdef Q_OS_SYMBIAN
+#include <babitflags.h>
+//#include <w32std.h>
+//#include <graphics/wstfxconst.h>
+
+//const TInt tfxPurpose = Qt::Window;
+#endif //Q_OS_SYMBIAN
+
+#ifdef HBTHEMESYSTEMEFFECT_DEBUG
+const char *dbgRegister = "REGISTER ";
+const char *dbgUnregister = "UNREGISTER ";
+const char *dbgDefault = "Default effect ";
+const char *dbgAppSpecific = "App specific effect ";
+const char *dbgAppStart = "AppStart ";
+const char *dbgAppExit = "AppExit ";
+const char *dbgAppSwitch = "AppSwitch ";
+const char *dbgInvalid = "Invalid ";
+const char *dbgIncomingPrio = "Incoming has priority ";
+const char *dgbFromBaseTheme = "From base theme ";
+const char *dbgIn = " In: ";
+const char *dbgOut = "Out: ";
+#endif //HBTHEMESYSTEMEFFECT_DEBUG
+
+HbThemeSystemEffectMap::HbThemeSystemEffectMap()
+{
+}
+
+HbThemeSystemEffectMap::~HbThemeSystemEffectMap()
+{
+}
+
+void HbThemeSystemEffectMap::setEffectsFolder(const QString &effectsFolder)
+{
+ mEffectsFolder = effectsFolder;
+}
+
+const QString &HbThemeSystemEffectMap::effectsFolder() const
+{
+ return mEffectsFolder;
+}
+
+void HbThemeSystemEffectMap::addEntry(uint appUid,
+ SystemEffectId id,
+ const QString &incomingFile,
+ const QString &outgoingFile,
+ bool incomingHasPriority,
+ bool fromBaseTheme)
+{
+ SystemEffectKey key(id, appUid);
+ SystemEffectValue value(incomingFile, outgoingFile, incomingHasPriority, fromBaseTheme);
+ SystemEffectMap::iterator i = mSystemEffects.find(key);
+ if (i == mSystemEffects.end()) {
+ i = mSystemEffects.insert(key, value);
+ }
+}
+
+int HbThemeSystemEffectMap::entryCount() const
+{
+ return mSystemEffects.count();
+}
+
+bool HbThemeSystemEffectMap::defaultEntryFound(SystemEffectId id) const
+{
+ SystemEffectKey key(id, 0);
+ return mSystemEffects.find(key) != mSystemEffects.end();
+}
+
+void HbThemeSystemEffectMap::addDefaultEntry(SystemEffectId id, HbThemeSystemEffectMap *effects)
+{
+ SystemEffectKey key(id, 0);
+ SystemEffectMap::iterator i = effects->mSystemEffects.find(key);
+ if (i != effects->mSystemEffects.end()) {
+ SystemEffectValue value = i.value();
+ value.mFromBaseTheme = true;
+ mSystemEffects.insert(key, value);
+ }
+}
+
+#ifdef HBTHEMESYSTEMEFFECT_DEBUG
+void HbThemeSystemEffectMap::traceEffects() const
+{
+ QString dbgString;
+ QMapIterator<SystemEffectKey, SystemEffectValue> mapIt(mSystemEffects);
+ while (mapIt.hasNext()) {
+ mapIt.next();
+ bool unregister = mapIt.value().mIncomingFile.isEmpty()
+ && mapIt.value().mOutgoingFile.isEmpty();
+ if (unregister) {
+ dbgString = dbgUnregister;
+ } else {
+ dbgString = dbgRegister;
+ }
+ if (!mapIt.key().mAppUid) {
+ dbgString += dbgDefault;
+ } else {
+ dbgString += dbgAppSpecific + QString::number(mapIt.key().mAppUid) + " ";
+ }
+ if (mapIt.key().mEffectId == AppStart) {
+ dbgString += dbgAppStart;
+ } else if (mapIt.key().mEffectId == AppExit) {
+ dbgString += dbgAppExit;
+ } else if (mapIt.key().mEffectId == AppSwitch) {
+ dbgString += dbgAppSwitch;
+ } else {
+ dbgString += dbgInvalid;
+ }
+ if (mapIt.value().mIncomingHasPriority) {
+ dbgString += dbgIncomingPrio;
+ }
+ if (mapIt.value().mFromBaseTheme) {
+ dbgString += dgbFromBaseTheme;
+ }
+ if (!unregister) {
+ dbgString += dbgOut + mapIt.value().mOutgoingFile;
+ dbgString += dbgIn + mapIt.value().mIncomingFile;
+ }
+ qDebug() << "HbThemeSystemEffectMap::traceEffects" << dbgString;
+ }
+}
+#endif //HBTHEMESYSTEMEFFECT_DEBUG
+
+#ifdef Q_OS_SYMBIAN
+void HbThemeSystemEffectMap::unregisterAllEffects(RWsSession &/*wsSession*/) const
+{
+ // Unregister all previous theme effects
+ //wsSession.UnregisterAllEffects();
+}
+
+void HbThemeSystemEffectMap::registerEffects(RWsSession &wsSession,
+ const QString &baseEffectsFolder) const
+{
+ unregisterAllEffects(wsSession);
+ QMapIterator<SystemEffectKey, SystemEffectValue> mapIt(mSystemEffects);
+ TPtrC themeResourceDir = mEffectsFolder.utf16();
+ TPtrC baseResourceDir = baseEffectsFolder.utf16();
+ while (mapIt.hasNext()) {
+ mapIt.next();
+ // Register entry
+ TInt tfxAction = tfxTransitionAction(mapIt.key().mEffectId);
+ // If no effect files defined, unregister effect
+ if (mapIt.value().mOutgoingFile.isEmpty()
+ && mapIt.value().mIncomingFile.isEmpty()) {
+ //wsSession.UnregisterEffect(tfxAction, tfxPurpose, mapIt.key().mAppUid);
+ } else {
+ TPtrC outgoingEffect = mapIt.value().mOutgoingFile.utf16();
+ TPtrC incomingEffect = mapIt.value().mIncomingFile.utf16();
+ TPtrC resourceDir = mapIt.value().mFromBaseTheme ? baseResourceDir : themeResourceDir;
+ TBitFlags effectFlags;
+ if (mapIt.value().mIncomingHasPriority) {
+ //effectFlags.Set(ETfxIncomingTakesPriority);
+ }
+ //wsSession.RegisterEffect(tfxAction,
+ // tfxPurpose,
+ // resourceDir,
+ // outgoingEffect,
+ // incomingEffect,
+ // mapIt.key().mAppUid,
+ // effectFlags);
+ }
+ }
+}
+
+TInt HbThemeSystemEffectMap::tfxTransitionAction(SystemEffectId id) const
+{
+ TInt tfxTransitionAction = 0;
+ switch (id) {
+ case(AppStart) :
+ //tfxTransitionAction = ETfxActionStart;
+ break;
+ case(AppExit) :
+ //tfxTransitionAction = ETfxActionShutDown;
+ break;
+ case(AppSwitch) :
+ //tfxTransitionAction = ETfxActionSwitching;
+ break;
+ default:
+ break;
+ }
+ return tfxTransitionAction;
+}
+#endif //Q_OS_SYMBIAN
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/core/hbthemesystemeffectmap_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,116 @@
+/****************************************************************************
+**
+** 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 HBTHEMESYSTEMEFFECTMAP_P_H
+#define HBTHEMESYSTEMEFFECTMAP_P_H
+
+#include <QMap>
+#include <QString>
+#ifdef Q_OS_SYMBIAN
+class RWsSession;
+#endif //Q_OS_SYMBIAN
+
+// Define this to enable debug traces
+//#define HBTHEMESYSTEMEFFECT_DEBUG
+
+
+class HbThemeSystemEffectMap
+{
+public:
+ enum SystemEffectId {
+ Invalid = 0,
+ AppStart,
+ AppExit,
+ AppSwitch
+ };
+
+ HbThemeSystemEffectMap();
+ virtual ~HbThemeSystemEffectMap();
+
+ void setEffectsFolder(const QString &effectsFolder);
+ const QString &effectsFolder() const;
+ void addEntry(uint appUid,
+ SystemEffectId id,
+ const QString &incomingFile,
+ const QString &outgoingFile,
+ bool incomingHasPriority,
+ bool fromBaseTheme);
+
+ int entryCount() const;
+ bool defaultEntryFound(SystemEffectId id) const;
+ void addDefaultEntry(SystemEffectId id, HbThemeSystemEffectMap *effects);
+#ifdef HBTHEMESYSTEMEFFECT_DEBUG
+ void traceEffects() const;
+#endif //HBTHEMESYSTEMEFFECT_DEBUG
+
+#ifdef Q_OS_SYMBIAN
+ void unregisterAllEffects(RWsSession &wsSession) const;
+ void registerEffects(RWsSession &wsSession, const QString &baseEffectsFolder) const;
+ TInt tfxTransitionAction(SystemEffectId id) const;
+#endif //Q_OS_SYMBIAN
+
+private:
+ class SystemEffectKey
+ {
+ public:
+ inline SystemEffectKey(SystemEffectId effectId, uint appUid)
+ : mEffectId(effectId), mAppUid(appUid) {}
+
+ inline bool operator<(const SystemEffectKey &other) const {
+ return other.mAppUid == mAppUid ? other.mEffectId > mEffectId : other.mAppUid > mAppUid;
+ }
+
+ public:
+ SystemEffectId mEffectId;
+ uint mAppUid;
+ };
+
+ class SystemEffectValue
+ {
+ public:
+ inline SystemEffectValue(const QString &incomingFile,
+ const QString &outgoingFile,
+ bool incomingHasPriority,
+ bool fromBaseTheme)
+ : mIncomingFile(incomingFile),
+ mOutgoingFile(outgoingFile),
+ mIncomingHasPriority(incomingHasPriority),
+ mFromBaseTheme(fromBaseTheme) {}
+
+ public:
+ QString mIncomingFile;
+ QString mOutgoingFile;
+ bool mIncomingHasPriority;
+ bool mFromBaseTheme;
+ };
+
+ typedef QMap<SystemEffectKey, SystemEffectValue> SystemEffectMap;
+ SystemEffectMap mSystemEffects;
+ QString mEffectsFolder;
+
+ friend class TestHbThemeSystemEffect;
+};
+
+#endif // HBTHEMESYSTEMEFFECTMAP_P_H
--- a/src/hbcore/core/hbvariant_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbvariant_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -36,10 +36,11 @@
#include "hbcssconverterutils_p.h"
#endif
-HbVariant::HbVariantData::HbVariantData()
- :stringSize(0),
- mRef(1),
- mDataType(Invalid)
+HbVariant::HbVariantData::HbVariantData() :
+ stringSize(0),
+ stringListCount(0),
+ mRef(1),
+ mDataType(Invalid)
{
}
@@ -185,6 +186,20 @@
}
/*
+* C'tor taking stringlist
+*/
+HbVariant::HbVariant(const QStringList &val, HbMemoryManager::MemoryType type)
+ : mMemoryType( type ), mShared( false )
+{
+ initializeData();
+ fillStringListData(val);
+
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::registerOffsetHolder(&mDataOffset);
+#endif
+}
+
+/*
* C'tor taking QColor
*/
HbVariant::HbVariant( const QColor &col, HbMemoryManager::MemoryType type )
@@ -203,7 +218,6 @@
*/
HbVariant::HbVariant( const HbVariant &other )
{
-
mMemoryType = other.mMemoryType;
GET_MEMORY_MANAGER(other.mMemoryType)
@@ -287,6 +301,12 @@
case HbVariant::Color:
return getColor().name();
case HbVariant::StringList:
+ if (data->stringListCount == 1) {
+ const char *address = getAddress<char>(mMemoryType, data->mData.offset, mShared);
+ int length = *((int*)address);
+ return QString((const QChar *)(address + sizeof(int)), length);
+ }
+
return QString();
default:
return QString();
@@ -345,10 +365,31 @@
/*
* to get stringlist
*/
-QStringList HbVariant::toStringList () const
+QStringList HbVariant::toStringList() const
{
- // ToDo: Implement it
- return QStringList();
+ HbVariantData *data = getAddress<HbVariantData>(mMemoryType, mDataOffset, mShared);
+ QStringList list;
+
+ if (data) {
+ if (data->dataType() == HbVariant::StringList) {
+ const char *address = getAddress<char>(mMemoryType, data->mData.offset, mShared);
+ const char *end = address + data->stringSize;
+
+ // Append strings to stringlist
+ while (address < end) {
+ int length = *(int *)address;
+ address += sizeof(int);
+
+ QString string((const QChar *)address, length);
+ list.append(string);
+ address += sizeof(QChar) * length;
+ }
+ } else {
+ list.append(toString());
+ }
+ }
+
+ return list;
}
/*
@@ -412,6 +453,52 @@
}
/*
+* fillStringListData
+*/
+void HbVariant::fillStringListData(const QStringList &stringList)
+{
+ GET_MEMORY_MANAGER(mMemoryType);
+ HbVariantData *data = getAddress<HbVariantData>(mMemoryType, mDataOffset, mShared);
+ int oldOffset = reservesMemory(data) ? data->mData.offset : -1;
+ int allocBytes = 0;
+
+ if (stringList.isEmpty()) {
+ data->mData.offset = -1;
+ } else {
+ // allocate memory and copy data.
+ for (int i=0; i<stringList.count(); ++i) {
+ allocBytes += sizeof(int); // Length information
+ allocBytes += stringList.at(i).length() * sizeof(QChar); // String data
+ }
+
+ data->mData.offset = manager->alloc(allocBytes);
+ char *address = getAddress<char>(mMemoryType, data->mData.offset, mShared);
+
+ for (int j=0; j<stringList.count(); ++j) {
+ QString string = stringList.at(j);
+ // Put string length first
+ int length = string.length();
+ *((int*)address) = length;
+ address += sizeof(int);
+ // String data after length information
+ memcpy((QChar *)address, string.constData(), length * sizeof(QChar));
+ address += sizeof(QChar) * length;
+ }
+ }
+
+ // In stringlist case, set stringSize to indicate size allocated for the whole stringlist buffer
+ data->stringSize = allocBytes;
+ data->stringListCount = stringList.count();
+
+ data->setDataType(StringList);
+ if (oldOffset != -1) {
+ // Free old memory block
+ HbMemoryUtils::freeMemory(mMemoryType, oldOffset);
+ }
+}
+
+
+/*
* fillColorData
*/
void HbVariant::fillColorData( const QColor &col )
@@ -493,9 +580,9 @@
/*
* = operator taking QStringList
*/
-HbVariant& HbVariant::operator=(const QStringList& /*strList*/)
+HbVariant& HbVariant::operator=(const QStringList& strList)
{
- // ToDo: Implement it
+ fillStringListData(strList);
return *this;
}
@@ -555,10 +642,13 @@
return data->dataType() == HbVariant::Int
|| data->dataType() == HbVariant::String;
case HbVariant::String:
- return data->dataType() == HbVariant::Int
- || data->dataType() == HbVariant::StringList
- || data->dataType() == HbVariant::Double
- || data->dataType() == HbVariant::Color;
+ if (data->dataType() == HbVariant::StringList) {
+ return data->stringListCount <= 1;
+ } else {
+ return data->dataType() == HbVariant::Int
+ || data->dataType() == HbVariant::Double
+ || data->dataType() == HbVariant::Color;
+ }
case HbVariant::StringList:
case HbVariant::Color:
return data->dataType() == HbVariant::String;
@@ -579,6 +669,8 @@
int tempOffset = -1;
QColor col;
QString str;
+ QStringList strList;
+
if(data->dataType() == t) {
return true;
}
@@ -635,8 +727,14 @@
return true;
}
case HbVariant::StringList:
- // ToDo: Handle it
- return false;
+ // canConvert checks that there is max 1 string in the stringlist
+ if (data->stringListCount == 0) {
+ fillStringData(0, 0);
+ } else {
+ QString string = toString();
+ fillStringData(string.constData(), string.length());
+ }
+ return true;
case HbVariant::Color: {
QString colName = getColor().name();
fillStringData(colName.constData(), colName.length());
@@ -660,7 +758,14 @@
}
case HbVariant::StringList:
- return false;
+ switch(data->dataType()) {
+ case HbVariant::String:
+ strList.append(getString());
+ fillStringListData(strList);
+ return true;
+ default:
+ return false;
+ }
default:
return false;
@@ -682,7 +787,7 @@
case HbVariant::String :
return QVariant(getString());
case HbVariant::StringList :
- return QVariant(QVariant::StringList);
+ return QVariant(toStringList());
case HbVariant::Color : {
QVariant var = getColor();
return var;
@@ -693,7 +798,7 @@
}
/*
-* clears the variant, frees any alocated memory
+* clears the variant, frees any allocated memory
*/
void HbVariant::clear()
{
@@ -709,11 +814,9 @@
break;
case HbVariant::String :
case HbVariant::Color :
+ case HbVariant::StringList :
HbMemoryUtils::freeMemory(mMemoryType, data->mData.offset);
- break;
- case HbVariant::StringList :
- // ToDo: Handle it
- break;
+ break;
default:
break;
}
@@ -723,13 +826,8 @@
#ifdef CSS_PARSER_TRACES
/*
-* These routines are there to support debugging
+* Debugging support
*/
-bool HbVariant::supportsPrinting() const
-{
- return true;
-}
-
void HbVariant::print() const
{
HbVariantData * data = getAddress<HbVariantData>( mMemoryType, mDataOffset, mShared);
@@ -748,9 +846,9 @@
qDebug() << getColor();
break;
case HbVariant::StringList:
+ qDebug() << toStringList();
default:
qDebug() << "Invalid Type";
}
}
-
-#endif
+#endif // CSS_PARSER_TRACES
--- a/src/hbcore/core/hbvariant_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbvariant_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -68,6 +68,7 @@
} mData;
int stringSize;
+ int stringListCount;
QAtomicInt mRef;
private:
Type mDataType;
@@ -80,6 +81,7 @@
HbVariant(double val, HbMemoryManager::MemoryType type);
HbVariant(const QString &str, HbMemoryManager::MemoryType type);
HbVariant(const char *val, HbMemoryManager::MemoryType type);
+ HbVariant(const QStringList &val, HbMemoryManager::MemoryType type);
HbVariant(const QColor &col, HbMemoryManager::MemoryType type);
~HbVariant();
@@ -95,7 +97,6 @@
}
#ifdef CSS_PARSER_TRACES
- bool supportsPrinting() const;
void print() const;
#endif
@@ -110,7 +111,7 @@
HbVariant & operator=( const QString& val );
HbVariant & operator=( const HbString& val );
HbVariant & operator=( const QColor& col );
- HbVariant & operator=( const QStringList& /*strList*/ );
+ HbVariant & operator=( const QStringList& strList );
HbVariant & operator=( const HbVariant& other );
bool canConvert ( HbVariant::Type t ) const;
@@ -122,6 +123,7 @@
private:
HbVariantData * initializeData();
void fillStringData(const QChar *str, int size);
+ void fillStringListData(const QStringList &stringList);
void fillColorData(const QColor &col);
QString getString() const;
QColor getColor() const;
@@ -144,7 +146,8 @@
static bool reservesMemory(const HbVariantData *data)
{
return data->dataType() == HbVariant::String
- || data->dataType() == HbVariant::Color;
+ || data->dataType() == HbVariant::Color
+ || data->dataType() == HbVariant::StringList;
}
void freeMemory(HbVariantData *data)
{
--- a/src/hbcore/core/hbvector_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/core/hbvector_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -297,7 +297,6 @@
{
const_iterator iter = begin();
while(iter != end()) {
- if(iter->supportsPrinting())
iter->print();
iter++;
}
--- a/src/hbcore/cssparser/hbcssformatter_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/cssparser/hbcssformatter_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -66,7 +66,8 @@
/*!
@internal
*/
-QString HbCssFormatter::weightedDeclarationsToString(const HbVector<HbCss::WeightedDeclaration> &decls)
+QString HbCssFormatter::weightedDeclarationsToString(
+ const HbVector<HbCss::WeightedDeclaration> &decls)
{
QString str;
#ifdef HB_DEVELOPER
@@ -198,7 +199,10 @@
// Worker function
-QString HbCssFormatter::styleRuleToHtml(const HbCss::StyleRule &rule, QVector<const HbCss::Declaration*> usedDecls, int specificity)
+QString HbCssFormatter::styleRuleToHtml(
+ const HbCss::StyleRule &rule,
+ QVector<const HbCss::Declaration*> usedDecls,
+ int specificity)
{
QString str;
#ifdef HB_DEVELOPER
@@ -237,7 +241,10 @@
// Worker function
-QString HbCssFormatter::selectorsToString(const HbVector<HbCss::Selector> &selectors, int specificity, bool html)
+QString HbCssFormatter::selectorsToString(
+ const HbVector<HbCss::Selector> &selectors,
+ int specificity,
+ bool html)
{
QString str;
#ifdef HB_DEVELOPER
--- a/src/hbcore/cssparser/hbcssformatter_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/cssparser/hbcssformatter_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -39,9 +39,13 @@
private:
static QString styleRuleToString(const HbCss::StyleRule &rule, int specificity=-1);
- static QString styleRuleToHtml(const HbCss::StyleRule &rule, QVector<const HbCss::Declaration*> usedDecls, int specificity=-1);
+ static QString styleRuleToHtml(
+ const HbCss::StyleRule &rule,
+ QVector<const HbCss::Declaration*> usedDecls,
+ int specificity=-1);
static QString declarationToString(const HbCss::Declaration &decl, bool html=false);
- static QString selectorsToString(const HbVector<HbCss::Selector> &selectors, int specificity=-1, bool html=false);
+ static QString selectorsToString(
+ const HbVector<HbCss::Selector> &selectors, int specificity=-1, bool html=false);
static QString selectorToString(const HbCss::Selector &sel, bool html=false);
};
--- a/src/hbcore/cssparser/hbcssparser_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/cssparser/hbcssparser_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -47,46 +47,6 @@
const QString GLOBAL_CSS_SELECTOR = "*";
-const char *Scanner::tokenName(HbCss::TokenType t)
-{
- switch (t) {
- case NONE: return "NONE";
- case S: return "S";
- case CDO: return "CDO";
- case CDC: return "CDC";
- case INCLUDES: return "INCLUDES";
- case DASHMATCH: return "DASHMATCH";
- case LBRACE: return "LBRACE";
- case PLUS: return "PLUS";
- case GREATER: return "GREATER";
- case COMMA: return "COMMA";
- case STRING: return "STRING";
- case INVALID: return "INVALID";
- case IDENT: return "IDENT";
- case HASH: return "HASH";
- case ATKEYWORD_SYM: return "ATKEYWORD_SYM";
- case EXCLAMATION_SYM: return "EXCLAMATION_SYM";
- case LENGTH: return "LENGTH";
- case PERCENTAGE: return "PERCENTAGE";
- case NUMBER: return "NUMBER";
- case FUNCTION: return "FUNCTION";
- case COLON: return "COLON";
- case SEMICOLON: return "SEMICOLON";
- case RBRACE: return "RBRACE";
- case SLASH: return "SLASH";
- case MINUS: return "MINUS";
- case DOT: return "DOT";
- case STAR: return "STAR";
- case LBRACKET: return "LBRACKET";
- case RBRACKET: return "RBRACKET";
- case EQUAL: return "EQUAL";
- case LPAREN: return "LPAREN";
- case RPAREN: return "RPAREN";
- case OR: return "OR";
- }
- return "";
-}
-
struct HbCssKnownValue
{
const char *name;
@@ -94,320 +54,111 @@
};
static const HbCssKnownValue properties[NumProperties - 1] = {
- { "-qt-background-role", QtBackgroundRole },
- { "-qt-block-indent", QtBlockIndent },
- { "-qt-list-indent", QtListIndent },
- { "-qt-paragraph-type", QtParagraphType },
- { "-qt-style-features", QtStyleFeatures },
- { "-qt-table-type", QtTableType },
- { "-qt-user-state", QtUserState },
- { "alternate-background-color", QtAlternateBackground },
- { "aspect-ratio", HbAspectRatio },
- { "background", Background },
- { "background-attachment", BackgroundAttachment },
- { "background-clip", BackgroundClip },
- { "background-color", BackgroundColor },
- { "background-image", BackgroundImage },
- { "background-origin", BackgroundOrigin },
- { "background-position", BackgroundPosition },
- { "background-repeat", BackgroundRepeat },
- { "border", Border },
- { "border-bottom", BorderBottom },
- { "border-bottom-color", BorderBottomColor },
- { "border-bottom-left-radius", BorderBottomLeftRadius },
- { "border-bottom-right-radius", BorderBottomRightRadius },
- { "border-bottom-style", BorderBottomStyle },
- { "border-bottom-width", BorderBottomWidth },
- { "border-color", BorderColor },
- { "border-image", BorderImage },
- { "border-left", BorderLeft },
- { "border-left-color", BorderLeftColor },
- { "border-left-style", BorderLeftStyle },
- { "border-left-width", BorderLeftWidth },
- { "border-radius", BorderRadius },
- { "border-right", BorderRight },
- { "border-right-color", BorderRightColor },
- { "border-right-style", BorderRightStyle },
- { "border-right-width", BorderRightWidth },
- { "border-style", BorderStyles },
- { "border-top", BorderTop },
- { "border-top-color", BorderTopColor },
- { "border-top-left-radius", BorderTopLeftRadius },
- { "border-top-right-radius", BorderTopRightRadius },
- { "border-top-style", BorderTopStyle },
- { "border-top-width", BorderTopWidth },
- { "border-width", BorderWidth },
- { "bottom", Bottom },
- { "center-horizontal", HbCenterHorizontal },
- { "center-vertical", HbCenterVertical },
- { "color", Color },
- { "column-narrow-width", HbColumnNarrowWidth },
- { "column-wide-width", HbColumnWideWidth },
- { "fixed-height", HbFixedHeight },
- { "fixed-size", HbFixedSize },
- { "fixed-width", HbFixedWidth },
- { "float", Float },
- { "font", Font },
- { "font-family", FontFamily },
- { "font-size", FontSize },
- { "font-style", FontStyle },
- { "font-variant", FontVariant },
- { "font-weight", FontWeight },
- { "height", Height },
- { "icon-left-alignment-weight", HbIconLeftAlignmentWeight },
- { "image", QtImage },
- { "image-position", QtImageAlignment },
- { "indent", HbIndent },
- { "large-icon-size", HbLargeIconSize },
- { "layout", HbLayout },
- { "layout-direction", HbLayoutDirection },
- { "left", Left },
- { "list-style", ListStyle },
- { "list-style-type", ListStyleType },
- { "margin" , Margin },
- { "margin-bottom", MarginBottom },
- { "margin-left", MarginLeft },
- { "margin-right", MarginRight },
- { "margin-top", MarginTop },
- { "margin-top-weight", HbTopMarginWeight },
- { "max-height", MaximumHeight },
- { "max-size", HbMaximumSize },
- { "max-width", MaximumWidth },
- { "min-height", MinimumHeight },
- { "min-size", HbMinimumSize },
- { "min-width", MinimumWidth },
- { "mirroring", Mirroring }, // deprecated
- { "outline", Outline },
- { "outline-bottom-left-radius", OutlineBottomLeftRadius },
- { "outline-bottom-right-radius", OutlineBottomRightRadius },
- { "outline-color", OutlineColor },
- { "outline-offset", OutlineOffset },
- { "outline-radius", OutlineRadius },
- { "outline-style", OutlineStyle },
- { "outline-top-left-radius", OutlineTopLeftRadius },
- { "outline-top-right-radius", OutlineTopRightRadius },
- { "outline-width", OutlineWidth },
- { "padding", Padding },
- { "padding-bottom", PaddingBottom },
- { "padding-left", PaddingLeft },
- { "padding-right", PaddingRight },
- { "padding-top", PaddingTop },
- { "page-break-after", PageBreakAfter },
- { "page-break-before", PageBreakBefore },
- { "position", Position },
- { "pref-height", HbPreferredHeight },
- { "pref-size", HbPreferredSize },
- { "pref-width", HbPreferredWidth },
- { "right", Right },
- { "section", HbSection },
- { "selection-background-color", QtSelectionBackground },
- { "selection-color", QtSelectionForeground },
- { "size-policy", HbSizePolicy },
- { "size-policy-horizontal", HbSizePolicyHorizontal },
- { "size-policy-vertical", HbSizePolicyVertical },
- { "small-icon-size", HbSmallIconSize },
- { "spacing", QtSpacing },
- { "spacing-horizontal", HbSpacingHorizontal },
- { "spacing-vertical", HbSpacingVertical },
- { "stretchable", HbStretchable },
- { "subcontrol-origin", QtOrigin },
- { "subcontrol-position", QtPosition },
- { "text-align", TextAlignment },
- { "text-decoration", TextDecoration },
- { "text-height", HbTextHeight },
- { "text-indent", TextIndent },
- { "text-line-count-max", HbTextLineCountMax },
- { "text-line-count-min", HbTextLineCountMin },
- { "text-transform", TextTransform },
- { "text-underline-style", TextUnderlineStyle },
- { "text-wrap-mode", HbTextWrapMode },
- { "top", Top },
- { "vertical-align", VerticalAlignment },
- { "white-space", Whitespace },
- { "width", Width },
- { "zvalue", ZValue }
+ { "aspect-ratio", Property_AspectRatio },
+ { "border-width", Property_BorderWidth },
+ { "border-width-bottom", Property_BorderWidthBottom },
+ { "border-width-left", Property_BorderWidthLeft },
+ { "border-width-right", Property_BorderWidthRight },
+ { "border-width-top", Property_BorderWidthTop },
+ { "bottom", Property_Bottom },
+ { "center-horizontal", Property_CenterHorizontal },
+ { "center-vertical", Property_CenterVertical },
+ { "color", Property_Color },
+ { "fixed-height", Property_FixedHeight },
+ { "fixed-size", Property_FixedSize },
+ { "fixed-width", Property_FixedWidth },
+ { "font", Property_Font },
+ { "font-family", Property_FontFamily },
+ { "font-size", Property_FontSize },
+ { "font-style", Property_FontStyle },
+ { "font-variant", Property_FontVariant },
+ { "font-weight", Property_FontWeight },
+ { "height", Property_Height },
+ { "layout", Property_Layout },
+ { "layout-direction", Property_LayoutDirection },
+ { "left", Property_Left },
+ { "max-height", Property_MaximumHeight },
+ { "max-size", Property_MaximumSize },
+ { "max-width", Property_MaximumWidth },
+ { "min-height", Property_MinimumHeight },
+ { "min-size", Property_MinimumSize },
+ { "min-width", Property_MinimumWidth },
+ { "mirroring", Property_Mirroring, }, // deprecated
+ { "pref-height", Property_PreferredHeight },
+ { "pref-size", Property_PreferredSize },
+ { "pref-width", Property_PreferredWidth },
+ { "right", Property_Right },
+ { "section", Property_Section },
+ { "size-policy", Property_SizePolicy },
+ { "size-policy-horizontal", Property_SizePolicyHorizontal },
+ { "size-policy-vertical", Property_SizePolicyVertical },
+ { "spacing", Property_Spacing },
+ { "spacing-horizontal", Property_SpacingHorizontal },
+ { "spacing-vertical", Property_SpacingVertical },
+ { "text-align", Property_TextAlignment },
+ { "text-decoration", Property_TextDecoration },
+ { "text-height", Property_TextHeight },
+ { "text-line-count-max", Property_TextLineCountMax },
+ { "text-line-count-min", Property_TextLineCountMin },
+ { "text-transform", Property_TextTransform },
+ { "text-wrap-mode", Property_TextWrapMode },
+ { "top", Property_Top },
+ { "width", Property_Width },
+ { "zvalue", Property_ZValue }
};
static const HbCssKnownValue values[NumKnownValues - 1] = {
{ "active", Value_Active },
- { "alternate-base", Value_AlternateBase },
- { "always", Value_Always },
- { "auto", Value_Auto },
- { "base", Value_Base },
{ "bold", Value_Bold },
{ "bottom", Value_Bottom },
- { "bright-text", Value_BrightText },
- { "button", Value_Button },
- { "button-text", Value_ButtonText },
{ "center", Value_Center },
- { "circle", Value_Circle },
- { "dark", Value_Dark },
- { "dashed", Value_Dashed },
- { "decimal", Value_Decimal },
{ "digital", Value_Digital },
{ "disabled", Value_Disabled },
- { "disc", Value_Disc },
- { "dot-dash", Value_DotDash },
- { "dot-dot-dash", Value_DotDotDash },
- { "dotted", Value_Dotted },
- { "double", Value_Double },
{ "expanding", Value_Expanding },
{ "fixed", Value_Fixed },
- { "groove", Value_Groove },
- { "highlight", Value_Highlight },
- { "highlighted-text", Value_HighlightedText },
{ "ignore", Value_Ignore },
{ "ignored", Value_Ignored },
- { "inset", Value_Inset },
{ "italic", Value_Italic },
{ "keep", Value_Keep },
{ "keep-expand", Value_KeepExpand },
- { "large", Value_Large },
{ "left", Value_Left },
{ "left-to-right", Value_LeftToRight },
- { "light", Value_Light },
{ "line-through", Value_LineThrough },
- { "link", Value_Link },
- { "link-visited", Value_LinkVisited },
- { "lower-alpha", Value_LowerAlpha },
{ "lowercase", Value_Lowercase },
{ "maximum", Value_Maximum },
- { "medium", Value_Medium },
- { "mid", Value_Mid },
- { "middle", Value_Middle },
- { "midlight", Value_Midlight },
{ "minimum", Value_Minimum },
{ "minimum-expanding", Value_MinimumExpanding },
{ "mirrored", Value_Mirrored }, // deprecated
- { "native", Value_Native },
{ "no-wrap", Value_NoWrap },
{ "none", Value_None },
{ "normal", Value_Normal },
{ "oblique", Value_Oblique },
{ "off", Value_Off },
{ "on", Value_On },
- { "outset", Value_Outset },
{ "overline", Value_Overline },
{ "parent", Value_Parent },
- { "pre", Value_Pre },
{ "preferred", Value_Preferred },
{ "primary", Value_Primary },
{ "primary-small", Value_PrimarySmall },
- { "ridge", Value_Ridge },
{ "right", Value_Right },
{ "right-to-left", Value_RightToLeft },
{ "secondary", Value_Secondary },
{ "selected", Value_Selected },
- { "shadow", Value_Shadow },
- { "small" , Value_Small },
{ "small-caps", Value_SmallCaps },
- { "solid", Value_Solid },
- { "square", Value_Square },
- { "sub", Value_Sub },
- { "super", Value_Super },
- { "text", Value_Text },
{ "title", Value_Title },
{ "top", Value_Top },
{ "transparent", Value_Transparent },
{ "underline", Value_Underline },
- { "upper-alpha", Value_UpperAlpha },
{ "uppercase", Value_Uppercase },
- { "wave", Value_Wave },
- { "window", Value_Window },
- { "window-text", Value_WindowText },
{ "word-wrap", Value_WordWrap },
- { "wrap-anywhere", Value_WrapAnywhere },
- { "x-large", Value_XLarge },
- { "xx-large", Value_XXLarge }
+ { "wrap-anywhere", Value_WrapAnywhere }
};
static const HbCssKnownValue pseudos[NumPseudos - 1] = {
- { "active", PseudoClass_Active },
- { "adjoins-item", PseudoClass_Item },
- { "alternate", PseudoClass_Alternate },
- { "bottom", PseudoClass_Bottom },
- { "checked", PseudoClass_Checked },
- { "closable", PseudoClass_Closable },
- { "closed", PseudoClass_Closed },
- { "default", PseudoClass_Default },
- { "disabled", PseudoClass_Disabled },
- { "edit-focus", PseudoClass_EditFocus },
- { "editable", PseudoClass_Editable },
- { "enabled", PseudoClass_Enabled },
- { "exclusive", PseudoClass_Exclusive },
- { "first", PseudoClass_First },
- { "flat", PseudoClass_Flat },
- { "floatable", PseudoClass_Floatable },
- { "focus", PseudoClass_Focus },
- { "has-children", PseudoClass_Children },
- { "has-siblings", PseudoClass_Sibling },
- { "horizontal", PseudoClass_Horizontal },
- { "hover", PseudoClass_Hover },
- { "indeterminate" , PseudoClass_Indeterminate },
{ "landscape", PseudoClass_Landscape },
- { "last", PseudoClass_Last },
- { "left", PseudoClass_Left },
{ "left-to-right", PseudoClass_LeftToRight },
- { "maximized", PseudoClass_Maximized },
- { "middle", PseudoClass_Middle },
- { "minimized", PseudoClass_Minimized },
- { "movable", PseudoClass_Movable },
- { "next-selected", PseudoClass_NextSelected },
- { "no-frame", PseudoClass_Frameless },
- { "non-exclusive", PseudoClass_NonExclusive },
- { "off", PseudoClass_Unchecked },
- { "on", PseudoClass_Checked },
- { "only-one", PseudoClass_OnlyOne },
- { "open", PseudoClass_Open },
{ "portrait", PseudoClass_Portrait },
- { "pressed", PseudoClass_Pressed },
- { "previous-selected", PseudoClass_PreviousSelected },
- { "read-only", PseudoClass_ReadOnly },
- { "right", PseudoClass_Right },
- { "right-to-left", PseudoClass_RightToLeft },
- { "selected", PseudoClass_Selected },
- { "top", PseudoClass_Top },
- { "unchecked" , PseudoClass_Unchecked },
- { "vertical", PseudoClass_Vertical },
- { "window", PseudoClass_Window }
-};
-
-static const HbCssKnownValue origins[NumKnownOrigins - 1] = {
- { "border", Origin_Border },
- { "content", Origin_Content },
- { "margin", Origin_Margin }, // not in css
- { "padding", Origin_Padding }
-};
-
-static const HbCssKnownValue repeats[NumKnownRepeats - 1] = {
- { "no-repeat", Repeat_None },
- { "repeat-x", Repeat_X },
- { "repeat-xy", Repeat_XY },
- { "repeat-y", Repeat_Y }
-};
-
-static const HbCssKnownValue tileModes[NumKnownTileModes - 1] = {
- { "repeat", TileMode_Repeat },
- { "round", TileMode_Round },
- { "stretch", TileMode_Stretch },
-};
-
-static const HbCssKnownValue positions[NumKnownPositionModes - 1] = {
- { "absolute", PositionMode_Absolute },
- { "fixed", PositionMode_Fixed },
- { "relative", PositionMode_Relative },
- { "static", PositionMode_Static }
-};
-
-static const HbCssKnownValue attachments[NumKnownAttachments - 1] = {
- { "fixed", Attachment_Fixed },
- { "scroll", Attachment_Scroll }
-};
-
-static const HbCssKnownValue styleFeatures[NumKnownStyleFeatures - 1] = {
- { "background-color", StyleFeature_BackgroundColor },
- { "background-gradient", StyleFeature_BackgroundGradient },
- { "none", StyleFeature_None }
+ { "right-to-left", PseudoClass_RightToLeft }
};
inline bool operator<(const QString &name, const HbCssKnownValue &prop)
@@ -432,19 +183,24 @@
#ifndef HB_BIN_CSS
///////////////////////////////////////////////////////////////////////////////
// Value Extractor
-ValueExtractor::ValueExtractor(const HbVector<Declaration> &decls, const HbDeviceProfile &profile, const QPalette &pal)
-: declarations(decls), adjustment(0), fontExtracted(false), pal(pal), currentProfile(profile)
+ValueExtractor::ValueExtractor(const HbVector<Declaration> &decls, const HbDeviceProfile &profile)
+: declarations(decls), currentProfile(profile)
{
}
-ValueExtractor::ValueExtractor(const HbVector<Declaration> &decls, const QHash<QString, HbCss::Declaration> &varDeclarations,
- const HbDeviceProfile &profile, const QPalette &pal)
-: declarations(decls), variableDeclarationsHash(varDeclarations), adjustment(0),
- fontExtracted(false), pal(pal), currentProfile(profile)
+ValueExtractor::ValueExtractor(
+ const HbVector<Declaration> &decls,
+ const QHash<QString,
+ HbCss::Declaration> &varDeclarations,
+ const HbDeviceProfile &profile)
+: declarations(decls), variableDeclarationsHash(varDeclarations), currentProfile(profile)
{
}
-ValueExtractor::ValueExtractor(const HbVector<Declaration> &varDecls, bool isVariable, const HbDeviceProfile &profile)
-: variableDeclarations(varDecls), adjustment(0), fontExtracted(false), currentProfile(profile)
+ValueExtractor::ValueExtractor(
+ const HbVector<Declaration> &varDecls,
+ bool isVariable,
+ const HbDeviceProfile &profile)
+: variableDeclarations(varDecls), currentProfile(profile)
{
Q_UNUSED(isVariable)
// Initialize to some profile.
@@ -453,8 +209,12 @@
}
}
-ValueExtractor::ValueExtractor(const QHash<QString, HbCss::Declaration> &varDecls, bool isVariable, const HbDeviceProfile &profile)
-: variableDeclarationsHash(varDecls), adjustment(0), fontExtracted(false), currentProfile(profile)
+ValueExtractor::ValueExtractor(
+ const QHash<QString,
+ HbCss::Declaration> &varDecls,
+ bool isVariable,
+ const HbDeviceProfile &profile)
+: variableDeclarationsHash(varDecls), currentProfile(profile)
{
Q_UNUSED(isVariable)
// Initialize to some profile.
@@ -463,12 +223,7 @@
}
}
-int ValueExtractor::lengthValue(const Value& v)
-{
- return qRound(asReal(v));
-}
-
-qreal ValueExtractor::asReal(const Value& v)
+qreal ValueExtractor::asReal(const Value& v, bool *ok)
{
QString s = v.variant.toString();
s.reserve(s.length());
@@ -479,18 +234,24 @@
extractExpressionValue(s, value);
return factor * value;
}
-
- return asReal(s, v.type);
+ return asReal(s, v.type, ok);
}
-qreal ValueExtractor::asReal(QString &s, Value::Type type)
+qreal ValueExtractor::asReal(QString &s, Value::Type type, bool *ok)
{
+ if (ok) {
+ *ok = true;
+ }
+
if (type == Value::Variable || type == Value::VariableNegative) {
qreal factor = (type == Value::Variable) ? 1.0 : -1.0;
HbVector<HbCss::Value> values;
- if (extractValue(s, values))
- return factor * asReal(values.first());
+ if (extractVariableValue(s, values))
+ return factor * asReal(values.first(), ok);
else
+ if (ok) {
+ *ok = false;
+ }
return 0;
}
@@ -508,9 +269,8 @@
s.chop(2);
}
- bool ok;
- qreal result = s.toDouble(&ok);
- if (!ok) {
+ qreal result = s.toDouble(ok);
+ if (ok && !(*ok)) {
return 0;
}
@@ -522,76 +282,37 @@
return result;
}
-bool ValueExtractor::asReal(QString &s, qreal &value)
+qreal ValueExtractor::asReal(const Declaration &decl, bool *ok)
{
- enum { None, Px, Un, Mm } unit = None;
- if (s.endsWith(QLatin1String("un"), Qt::CaseInsensitive)) {
- unit = Un;
- } else if (s.endsWith(QLatin1String("px"), Qt::CaseInsensitive)) {
- unit = Px;
- } else if (s.endsWith(QLatin1String("mm"), Qt::CaseInsensitive)) {
- unit = Mm;
+ if (decl.values.count() < 1) {
+ if (ok) {
+ *ok = false;
+ }
+ return 0;
}
-
- if (unit != None) {
- // Assuming all unit identifiers have two characters
- s.chop(2);
- }
-
- bool ok;
- value = s.toDouble(&ok);
- if (!ok) {
- return false;
- }
-
- if (unit == Un) {
- value = currentProfile.unitValue() * value;
- } else if (unit == Mm) {
- value = currentProfile.ppmValue() * value;
- } // else -> already in pixels
- return true;
+ return asReal(decl.values.first(), ok);
}
-qreal ValueExtractor::asReal(const Declaration &decl)
+bool ValueExtractor::asReals(const Declaration &decl, qreal *m)
{
- if (decl.values.count() < 1)
- return 0;
- return asReal(decl.values.first());
-}
-
-
-void ValueExtractor::asReals(const Declaration &decl, qreal *m)
-{
+ bool ok = true;
int i;
- for (i = 0; i < qMin(decl.values.count(), 4); i++)
- m[i] = asReal(decl.values[i]);
+ for (i = 0; i < qMin(decl.values.count(), 4); i++) {
+ m[i] = asReal(decl.values[i], &ok);
+ if (!ok) {
+ return false;
+ }
+ }
if (i == 0) m[0] = m[1] = m[2] = m[3] = 0;
else if (i == 1) m[3] = m[2] = m[1] = m[0];
else if (i == 2) m[2] = m[0], m[3] = m[1];
else if (i == 3) m[3] = m[1];
-}
-bool ValueExtractor::asBool(const Declaration &decl)
-{
- if (decl.values.size()) {
- bool result = (decl.values.at(0).variant.toString() == QString("true"));
- return result;
- }
- return false;
+ return true;
}
-QSizePolicy ValueExtractor::asSizePolicy(const Declaration &decl)
-{
- QSizePolicy pol;
- if (decl.values.count() > 0)
- pol.setHorizontalPolicy(asPolicy(decl.values.at(0)));
- if (decl.values.count() > 1)
- pol.setHorizontalPolicy(asPolicy(decl.values.at(1)));
- return pol;
-}
-
-QSizePolicy::Policy ValueExtractor::asPolicy(const Value& v)
+static QSizePolicy::Policy parseSizePolicy(const Value& v)
{
QSizePolicy::Policy pol(QSizePolicy::Preferred);
switch (v.variant.toInt())
@@ -608,101 +329,6 @@
return pol;
}
-int ValueExtractor::lengthValue(const Declaration &decl)
-{
- if (decl.values.count() < 1)
- return 0;
- return lengthValue(decl.values.first());
-}
-
-void ValueExtractor::lengthValues(const Declaration &decl, int *m)
-{
- int i;
- for (i = 0; i < qMin(decl.values.count(), 4); i++)
- m[i] = lengthValue(decl.values[i]);
-
- if (i == 0) m[0] = m[1] = m[2] = m[3] = 0;
- else if (i == 1) m[3] = m[2] = m[1] = m[0];
- else if (i == 2) m[2] = m[0], m[3] = m[1];
- else if (i == 3) m[3] = m[1];
-}
-
-bool ValueExtractor::extractGeometry(GeometryValues &geomValues)
-{
- GeometryValueFlags flags(0);
- extractFont();
- bool hit = false;
- for (int i = 0; i < declarations.count(); i++) {
- const Declaration &decl = declarations.at(i);
- switch (decl.propertyId) {
- case MinimumWidth: geomValues.mMinW = asReal(decl); flags|=ExtractedMinW; break;
- case MinimumHeight: geomValues.mMinH = asReal(decl); flags|=ExtractedMinH; break;
- case MaximumWidth: geomValues.mMaxW = asReal(decl); flags|=ExtractedMaxW; break;
- case MaximumHeight: geomValues.mMaxH = asReal(decl); flags|=ExtractedMaxH; break;
- case HbPreferredWidth: geomValues.mPrefW = asReal(decl); flags|=ExtractedPrefW; break;
- case HbPreferredHeight: geomValues.mPrefH = asReal(decl); flags|=ExtractedPrefH; break;
- case HbFixedWidth:
- geomValues.mPrefW = asReal(decl); flags|=ExtractedPrefW;
- geomValues.mSizePolicy.setHorizontalPolicy(QSizePolicy::Fixed); flags|=ExtractedPolHor;
- break;
- case HbFixedHeight:
- geomValues.mPrefH = asReal(decl); flags|=ExtractedPrefH;
- geomValues.mSizePolicy.setVerticalPolicy(QSizePolicy::Fixed); flags|=ExtractedPolVer;
- break;
- case HbSizePolicy:
- geomValues.mSizePolicy.setHorizontalPolicy(asPolicy(decl.values.at(0)));
- if (decl.values.count() > 1) {
- geomValues.mSizePolicy.setVerticalPolicy(asPolicy(decl.values.at(1)));
- } else {
- geomValues.mSizePolicy.setVerticalPolicy(asPolicy(decl.values.at(0)));
- }
- flags|=ExtractedPolHor;
- flags|=ExtractedPolVer;
- break;
- case HbSizePolicyHorizontal:
- geomValues.mSizePolicy.setHorizontalPolicy(asPolicy(decl.values.at(0)));
- flags|=ExtractedPolHor;
- break;
- case HbSizePolicyVertical:
- geomValues.mSizePolicy.setVerticalPolicy(asPolicy(decl.values.at(0)));
- flags|=ExtractedPolVer;
- break;
- case HbMinimumSize:
- geomValues.mMinW = asReal(decl.values.at(0));
- geomValues.mMinH = (decl.values.count() > 1) ? asReal(decl.values.at(1)) : geomValues.mMinW;
- flags|=ExtractedMinW;
- flags|=ExtractedMinH;
- break;
- case HbMaximumSize:
- geomValues.mMaxW = asReal(decl.values.at(0));
- geomValues.mMaxH = (decl.values.count() > 1) ? asReal(decl.values.at(1)) : geomValues.mMaxW;
- flags|=ExtractedMaxW;
- flags|=ExtractedMaxH;
- break;
- case HbPreferredSize:
- geomValues.mPrefW = asReal(decl.values.at(0));
- geomValues.mPrefH = (decl.values.count() > 1) ? asReal(decl.values.at(1)) : geomValues.mPrefW;
- flags|=ExtractedPrefW;
- flags|=ExtractedPrefH;
- break;
- case HbFixedSize:
- geomValues.mPrefW = asReal(decl.values.at(0));
- geomValues.mPrefH = (decl.values.count() > 1) ? asReal(decl.values.at(1)) : geomValues.mPrefW;
- geomValues.mSizePolicy.setHorizontalPolicy(QSizePolicy::Fixed);
- geomValues.mSizePolicy.setVerticalPolicy(QSizePolicy::Fixed);
- flags|=ExtractedPrefW;
- flags|=ExtractedPrefH;
- flags|=ExtractedPolHor;
- flags|=ExtractedPolVer;
- break;
- default: continue;
- }
- hit = true;
- }
- geomValues.mFlags = flags;
- return hit;
-}
-
static HbCss::LayoutDirection parseLayoutDirectionValue(const Value v)
{
HbCss::LayoutDirection retVal(HbCss::LayoutDirection_Parent); // Parent as default
@@ -724,213 +350,32 @@
return retVal;
}
-bool ValueExtractor::extractPosition(PositionValues &posValues)
+static Qt::AspectRatioMode parseAspectRatioMode(const Value& v)
{
- PositionValueFlags flags(0);
- extractFont();
- bool hit = false;
- for (int i = 0; i < declarations.count(); i++) {
- const Declaration &decl = declarations.at(i);
- switch (decl.propertyId) {
- case Left: posValues.mLeft = asReal(decl); flags|=ExtractedLeft; break;
- case Top: posValues.mTop = asReal(decl); flags|=ExtractedTop; break;
- case Right: posValues.mRight = asReal(decl); flags|=ExtractedRight; break;
- case Bottom: posValues.mBottom = asReal(decl); flags|=ExtractedBottom; break;
- case HbCenterHorizontal: posValues.mCenterH = asReal(decl); flags|=ExtractedCenterH; break;
- case HbCenterVertical: posValues.mCenterV = asReal(decl); flags|=ExtractedCenterV; break;
- case QtOrigin: posValues.mOrigin = decl.originValue(); flags|=ExtractedOrigin; break;
- case QtPosition: posValues.mPosition = decl.alignmentValue(); flags|=ExtractedAlign; break;
- case TextAlignment: posValues.mTextAlignment = decl.alignmentValue(); flags|=ExtractedTextAlign; break;
- case Position: posValues.mPositionMode = decl.positionValue(); flags|=ExtractedMode; break;
- case HbLayoutDirection:
- case Mirroring:
- posValues.mLayoutDirection = parseLayoutDirectionValue(decl.values.at(0));
- flags|=ExtractedLayoutDirection;
- break;
- case ZValue: posValues.mZ = asReal(decl); flags|=ExtractedZValue; break;
- case HbTextWrapMode: posValues.mTextWrapMode = decl.wrapModeValue(); flags|=ExtractedWrapMode; break;
- default: continue;
- }
- hit = true;
- }
- posValues.mFlags = flags;
- return hit;
-}
-
-bool ValueExtractor::extractTextValues( TextValues &textValues )
-{
- textValues.mFlags = 0;
- bool hit = false;
- for (int i = 0; i < declarations.count(); i++) {
- const Declaration &decl = declarations.at(i);
- switch (decl.propertyId) {
- case HbTextLineCountMin: textValues.mLineCountMin = decl.values.first().variant.toInt(); textValues.mFlags|=ExtractedLineCountMin; break;
- case HbTextLineCountMax: textValues.mLineCountMax = decl.values.first().variant.toInt(); textValues.mFlags|=ExtractedLineCountMax; break;
- default: continue;
- }
- hit = true;
+ Qt::AspectRatioMode mode = Qt::KeepAspectRatio;
+ switch (v.variant.toInt()) {
+ case Value_Ignore:
+ mode = Qt::IgnoreAspectRatio;
+ break;
+ case Value_KeepExpand:
+ mode = Qt::KeepAspectRatioByExpanding;
+ break;
+ default:
+ break;
}
- return hit;
-}
-
-bool ValueExtractor::extractBox(qreal *margins, qreal *paddings, qreal *spacing)
-{
- extractFont();
- bool hit = false;
- for (int i = 0; i < declarations.count(); i++) {
- const Declaration &decl = declarations.at(i);
- switch (decl.propertyId) {
- case PaddingLeft: paddings[LeftEdge] = asReal(decl); break;
- case PaddingRight: paddings[RightEdge] = asReal(decl); break;
- case PaddingTop: paddings[TopEdge] = asReal(decl); break;
- case PaddingBottom: paddings[BottomEdge] = asReal(decl); break;
- case Padding: asReals(decl, paddings); break;
-
- case MarginLeft: margins[LeftEdge] = asReal(decl); break;
- case MarginRight: margins[RightEdge] = asReal(decl); break;
- case MarginTop: margins[TopEdge] = asReal(decl); break;
- case MarginBottom: margins[BottomEdge] = asReal(decl); break;
- case Margin: asReals(decl, margins); break;
- case QtSpacing: if (spacing) *spacing = asReal(decl); break;
-
- default: continue;
- }
- hit = true;
- }
-
- return hit;
-}
-
-int ValueExtractor::extractStyleFeatures()
-{
- int features = StyleFeature_None;
- for (int i = 0; i < declarations.count(); i++) {
- const Declaration &decl = declarations.at(i);
- if (decl.propertyId == QtStyleFeatures)
- features = decl.styleFeaturesValue();
- }
- return features;
-}
-
-QSize ValueExtractor::sizeValue(const Declaration &decl)
-{
- int x[2] = { 0, 0 };
- if (decl.values.count() > 0)
- x[0] = lengthValue(decl.values.at(0));
- if (decl.values.count() > 1)
- x[1] = lengthValue(decl.values.at(1));
- else
- x[1] = x[0];
- return QSize(x[0], x[1]);
+ return mode;
}
-void ValueExtractor::sizeValues(const Declaration &decl, QSize *radii)
-{
- radii[0] = sizeValue(decl);
- for (int i = 1; i < 4; i++)
- radii[i] = radii[0];
-}
-
-bool ValueExtractor::extractBorder(qreal *borders, QBrush *colors, BorderStyle *styles,
- QSize *radii)
+static Qt::Alignment parseAlignment(const Declaration &decl)
{
- extractFont();
- bool hit = false;
- for (int i = 0; i < declarations.count(); i++) {
- const Declaration &decl = declarations.at(i);
- switch (decl.propertyId) {
- case BorderLeftWidth: borders[LeftEdge] = asReal(decl); break;
- case BorderRightWidth: borders[RightEdge] = asReal(decl); break;
- case BorderTopWidth: borders[TopEdge] = asReal(decl); break;
- case BorderBottomWidth: borders[BottomEdge] = asReal(decl); break;
- case BorderWidth: asReals(decl, borders); break;
+ if (decl.values.isEmpty() || decl.values.count() > 2)
+ return Qt::AlignLeft | Qt::AlignTop;
- case BorderLeftColor: colors[LeftEdge] = decl.brushValue(pal); break;
- case BorderRightColor: colors[RightEdge] = decl.brushValue(pal); break;
- case BorderTopColor: colors[TopEdge] = decl.brushValue(pal); break;
- case BorderBottomColor: colors[BottomEdge] = decl.brushValue(pal); break;
- case BorderColor: decl.brushValues(colors, pal); break;
-
- case BorderTopStyle: styles[TopEdge] = decl.styleValue(); break;
- case BorderBottomStyle: styles[BottomEdge] = decl.styleValue(); break;
- case BorderLeftStyle: styles[LeftEdge] = decl.styleValue(); break;
- case BorderRightStyle: styles[RightEdge] = decl.styleValue(); break;
- case BorderStyles: decl.styleValues(styles); break;
-
- case BorderTopLeftRadius: radii[0] = sizeValue(decl); break;
- case BorderTopRightRadius: radii[1] = sizeValue(decl); break;
- case BorderBottomLeftRadius: radii[2] = sizeValue(decl); break;
- case BorderBottomRightRadius: radii[3] = sizeValue(decl); break;
- case BorderRadius: sizeValues(decl, radii); break;
-
- case BorderLeft:
- borderValue(decl, &borders[LeftEdge], &styles[LeftEdge], &colors[LeftEdge]);
- break;
- case BorderTop:
- borderValue(decl, &borders[TopEdge], &styles[TopEdge], &colors[TopEdge]);
- break;
- case BorderRight:
- borderValue(decl, &borders[RightEdge], &styles[RightEdge], &colors[RightEdge]);
- break;
- case BorderBottom:
- borderValue(decl, &borders[BottomEdge], &styles[BottomEdge], &colors[BottomEdge]);
+ Qt::Alignment a[2] = { 0, 0 };
+ for (int i = 0; i < qMin(2, decl.values.count()); i++) {
+ if (decl.values.at(i).type != Value::KnownIdentifier)
break;
- case Border:
- borderValue(decl, &borders[LeftEdge], &styles[LeftEdge], &colors[LeftEdge]);
- borders[TopEdge] = borders[RightEdge] = borders[BottomEdge] = borders[LeftEdge];
- styles[TopEdge] = styles[RightEdge] = styles[BottomEdge] = styles[LeftEdge];
- colors[TopEdge] = colors[RightEdge] = colors[BottomEdge] = colors[LeftEdge];
- break;
-
- default: continue;
- }
- hit = true;
- }
-
- return hit;
-}
-
-bool ValueExtractor::extractOutline(qreal *borders, QBrush *colors, BorderStyle *styles,
- QSize *radii, qreal *offsets)
-{
- extractFont();
- bool hit = false;
- for (int i = 0; i < declarations.count(); i++) {
- const Declaration &decl = declarations.at(i);
- switch (decl.propertyId) {
- case OutlineWidth: asReals(decl, borders); break;
- case OutlineColor: decl.brushValues(colors, pal); break;
- case OutlineStyle: decl.styleValues(styles); break;
-
- case OutlineTopLeftRadius: radii[0] = sizeValue(decl); break;
- case OutlineTopRightRadius: radii[1] = sizeValue(decl); break;
- case OutlineBottomLeftRadius: radii[2] = sizeValue(decl); break;
- case OutlineBottomRightRadius: radii[3] = sizeValue(decl); break;
- case OutlineRadius: sizeValues(decl, radii); break;
- case OutlineOffset: asReals(decl, offsets); break;
-
- case Outline:
- borderValue(decl, &borders[LeftEdge], &styles[LeftEdge], &colors[LeftEdge]);
- borders[TopEdge] = borders[RightEdge] = borders[BottomEdge] = borders[LeftEdge];
- styles[TopEdge] = styles[RightEdge] = styles[BottomEdge] = styles[LeftEdge];
- colors[TopEdge] = colors[RightEdge] = colors[BottomEdge] = colors[LeftEdge];
- break;
-
- default: continue;
- }
- hit = true;
- }
-
- return hit;
-}
-#endif
-static Qt::Alignment parseAlignment(const Value *values, int count)
-{
- Qt::Alignment a[2] = { 0, 0 };
- for (int i = 0; i < qMin(2, count); i++) {
- if (values[i].type != Value::KnownIdentifier)
- break;
- switch (values[i].variant.toInt()) {
+ switch (decl.values.at(i).variant.toInt()) {
case Value_Left: a[i] = Qt::AlignLeft; break;
case Value_Right: a[i] = Qt::AlignRight; break;
case Value_Top: a[i] = Qt::AlignTop; break;
@@ -941,9 +386,11 @@
}
if (a[0] == Qt::AlignCenter && a[1] != 0 && a[1] != Qt::AlignCenter)
- a[0] = (a[1] == Qt::AlignLeft || a[1] == Qt::AlignRight) ? Qt::AlignVCenter : Qt::AlignHCenter;
+ a[0] = (a[1] == Qt::AlignLeft ||
+ a[1] == Qt::AlignRight) ? Qt::AlignVCenter : Qt::AlignHCenter;
if ((a[1] == 0 || a[1] == Qt::AlignCenter) && a[0] != Qt::AlignCenter)
- a[1] = (a[0] == Qt::AlignLeft || a[0] == Qt::AlignRight) ? Qt::AlignVCenter : Qt::AlignHCenter;
+ a[1] = (a[0] == Qt::AlignLeft ||
+ a[0] == Qt::AlignRight) ? Qt::AlignVCenter : Qt::AlignHCenter;
return a[0] | a[1];
}
@@ -961,7 +408,313 @@
return mode;
}
-static QColor parseColorValue(Value v, const QPalette &pal)
+static bool setFontSizeFromValue(Value value, QFont &font)
+{
+ if (value.type != Value::Length)
+ return false;
+
+ bool valid = false;
+ QString s = value.variant.toString();
+ if (s.endsWith(QLatin1String("pt"), Qt::CaseInsensitive)) {
+ s.chop(2);
+ value.variant = s;
+ if (value.variant.convert(HbVariant::Double)) {
+ font.setPointSizeF(value.variant.toDouble());
+ valid = true;
+ }
+ } else if (s.endsWith(QLatin1String("px"), Qt::CaseInsensitive)) {
+ s.chop(2);
+ value.variant = s;
+ if (value.variant.convert(HbVariant::Int)) {
+ font.setPixelSize(value.variant.toInt());
+ valid = true;
+ }
+ }
+ return valid;
+}
+
+static bool setFontStyleFromValue(const Value &value, QFont &font)
+{
+ if (value.type != Value::KnownIdentifier)
+ return false ;
+ switch (value.variant.toInt()) {
+ case Value_Normal: font.setStyle(QFont::StyleNormal); return true;
+ case Value_Italic: font.setStyle(QFont::StyleItalic); return true;
+ case Value_Oblique: font.setStyle(QFont::StyleOblique); return true;
+ default: break;
+ }
+ return false;
+}
+
+static bool setFontWeightFromValue(const Value &value, QFont &font)
+{
+ if (value.type == Value::KnownIdentifier) {
+ switch (value.variant.toInt()) {
+ case Value_Normal: font.setWeight(QFont::Normal); return true;
+ case Value_Bold: font.setWeight(QFont::Bold); return true;
+ default: break;
+ }
+ return false;
+ }
+ if (value.type != Value::Number)
+ return false;
+ font.setWeight(qMin(value.variant.toInt() / 8, 99));
+ return true;
+}
+
+static bool setFontFamilyFromValues(const Declaration &decl, QFont &font)
+{
+ QString family;
+ for (int i = 0; i < decl.values.count(); ++i) {
+ const Value &v = decl.values.at(i);
+ if (v.type == Value::TermOperatorComma)
+ break;
+ const QString str = v.variant.toString();
+ if (str.isEmpty())
+ break;
+ family += str;
+ family += QLatin1Char(' ');
+ }
+ family = family.simplified();
+ if (family.isEmpty())
+ return false;
+ font.setFamily(family);
+ return true;
+}
+
+static void setTextDecorationFromValues(const Declaration &decl, QFont &font)
+{
+ for (int i = 0; i < decl.values.count(); ++i) {
+ if (decl.values.at(i).type != Value::KnownIdentifier)
+ continue;
+ switch (decl.values.at(i).variant.toInt()) {
+ case Value_Underline: font.setUnderline(true); break;
+ case Value_Overline: font.setOverline(true); break;
+ case Value_LineThrough: font.setStrikeOut(true); break;
+ case Value_None:
+ font.setUnderline(false);
+ font.setOverline(false);
+ font.setStrikeOut(false);
+ break;
+ default: break;
+ }
+ }
+}
+
+static void parseShorthandFontProperty(const Declaration &decl, QFont &font)
+{
+ font.setStyle(QFont::StyleNormal);
+ font.setWeight(QFont::Normal);
+
+ int i = 0;
+ while (i < decl.values.count()) {
+ if (setFontStyleFromValue(decl.values.at(i), font)
+ || setFontWeightFromValue(decl.values.at(i), font))
+ ++i;
+ else
+ break;
+ }
+
+ if (i < decl.values.count()) {
+ setFontSizeFromValue(decl.values.at(i), font);
+ ++i;
+ }
+
+ if (i < decl.values.count()) {
+ QString fam = decl.values.at(i).variant.toString();
+ if (!fam.isEmpty())
+ font.setFamily(fam);
+ }
+}
+
+static void setFontVariantFromValue(const Value &value, HbFontSpec &fontSpec, QFont &font )
+{
+ // Sets font variants. Some set the fontspec and some the HbFontSpec
+ HbFontSpec::Role role( HbFontSpec::Undefined );
+ if (value.type == Value::KnownIdentifier) {
+ switch (value.variant.toInt()) {
+ case Value_Normal: font.setCapitalization(QFont::MixedCase); break;
+ case Value_SmallCaps: font.setCapitalization(QFont::SmallCaps); break;
+ case Value_Primary: role = HbFontSpec::Primary; break;
+ case Value_Secondary: role = HbFontSpec::Secondary; break;
+ case Value_Title: role = HbFontSpec::Title; break;
+ case Value_PrimarySmall: role = HbFontSpec::PrimarySmall; break;
+ case Value_Digital: role = HbFontSpec::Digital; break;
+ default: break;
+ }
+ }
+ if (role != HbFontSpec::Undefined) {
+ fontSpec.setRole( role );
+ }
+}
+
+static void setTextTransformFromValue(const Value &value, QFont &font)
+{
+ if (value.type == Value::KnownIdentifier) {
+ switch (value.variant.toInt()) {
+ case Value_None: font.setCapitalization(QFont::MixedCase); break;
+ case Value_Uppercase: font.setCapitalization(QFont::AllUppercase); break;
+ case Value_Lowercase: font.setCapitalization(QFont::AllLowercase); break;
+ default: break;
+ }
+ }
+}
+
+bool ValueExtractor::extractKnownProperties(KnownProperties &prop)
+{
+ KnownPropertyFlags flags(0);
+ bool hit = false;
+ bool tphSet = false;
+
+ // Initialize border prop to zero
+ prop.mBorderWidths[TopEdge] = 0.0;
+ prop.mBorderWidths[RightEdge] = 0.0;
+ prop.mBorderWidths[BottomEdge] = 0.0;
+ prop.mBorderWidths[LeftEdge] = 0.0;
+
+ // Initialize font prop
+ prop.mFont = QFont();
+ prop.mFontSpec = HbFontSpec();
+
+ for (int i = 0; i < declarations.count(); i++) {
+ const Declaration &decl = declarations.at(i);
+ switch (decl.propertyId) {
+ case Property_MinimumWidth: prop.mMinW = asReal(decl); flags|=ExtractedMinW; break;
+ case Property_MinimumHeight: prop.mMinH = asReal(decl); flags|=ExtractedMinH; break;
+ case Property_MaximumWidth: prop.mMaxW = asReal(decl); flags|=ExtractedMaxW; break;
+ case Property_MaximumHeight: prop.mMaxH = asReal(decl); flags|=ExtractedMaxH; break;
+ case Property_PreferredWidth: prop.mPrefW = asReal(decl); flags|=ExtractedPrefW; break;
+ case Property_PreferredHeight: prop.mPrefH = asReal(decl); flags|=ExtractedPrefH; break;
+ case Property_FixedWidth:
+ prop.mPrefW = asReal(decl); flags|=ExtractedPrefW;
+ prop.mSizePolicy.setHorizontalPolicy(QSizePolicy::Fixed); flags|=ExtractedPolHor;
+ break;
+ case Property_FixedHeight:
+ prop.mPrefH = asReal(decl); flags|=ExtractedPrefH;
+ prop.mSizePolicy.setVerticalPolicy(QSizePolicy::Fixed); flags|=ExtractedPolVer;
+ if (!tphSet) {
+ // legacy support. deprecated.
+ prop.mFontSpec.setTextHeight(asReal(decl));
+ }
+ break;
+ case Property_SizePolicy:
+ prop.mSizePolicy.setHorizontalPolicy(parseSizePolicy(decl.values.at(0)));
+ if (decl.values.count() > 1) {
+ prop.mSizePolicy.setVerticalPolicy(parseSizePolicy(decl.values.at(1)));
+ } else {
+ prop.mSizePolicy.setVerticalPolicy(prop.mSizePolicy.horizontalPolicy());
+ }
+ flags|=ExtractedPolHor;
+ flags|=ExtractedPolVer;
+ break;
+ case Property_SizePolicyHorizontal:
+ prop.mSizePolicy.setHorizontalPolicy(parseSizePolicy(decl.values.at(0)));
+ flags|=ExtractedPolHor;
+ break;
+ case Property_SizePolicyVertical:
+ prop.mSizePolicy.setVerticalPolicy(parseSizePolicy(decl.values.at(0)));
+ flags|=ExtractedPolVer;
+ break;
+ case Property_MinimumSize:
+ prop.mMinW = asReal(decl.values.at(0));
+ prop.mMinH = (decl.values.count() > 1) ? asReal(decl.values.at(1)) : prop.mMinW;
+ flags|=ExtractedMinW;
+ flags|=ExtractedMinH;
+ break;
+ case Property_MaximumSize:
+ prop.mMaxW = asReal(decl.values.at(0));
+ prop.mMaxH = (decl.values.count() > 1) ? asReal(decl.values.at(1)) : prop.mMaxW;
+ flags|=ExtractedMaxW;
+ flags|=ExtractedMaxH;
+ break;
+ case Property_PreferredSize:
+ prop.mPrefW = asReal(decl.values.at(0));
+ prop.mPrefH = (decl.values.count() > 1) ? asReal(decl.values.at(1)) : prop.mPrefW;
+ flags|=ExtractedPrefW;
+ flags|=ExtractedPrefH;
+ break;
+ case Property_FixedSize:
+ prop.mPrefW = asReal(decl.values.at(0));
+ prop.mPrefH = (decl.values.count() > 1) ? asReal(decl.values.at(1)) : prop.mPrefW;
+ prop.mSizePolicy.setHorizontalPolicy(QSizePolicy::Fixed);
+ prop.mSizePolicy.setVerticalPolicy(QSizePolicy::Fixed);
+ flags|=ExtractedPrefW;
+ flags|=ExtractedPrefH;
+ flags|=ExtractedPolHor;
+ flags|=ExtractedPolVer;
+ break;
+
+ case Property_Left: prop.mLeft = asReal(decl); flags|=ExtractedLeft; break;
+ case Property_Top: prop.mTop = asReal(decl); flags|=ExtractedTop; break;
+ case Property_Right: prop.mRight = asReal(decl); flags|=ExtractedRight; break;
+ case Property_Bottom: prop.mBottom = asReal(decl); flags|=ExtractedBottom; break;
+ case Property_CenterHorizontal:
+ prop.mCenterH = asReal(decl); flags|=ExtractedCenterH; break;
+ case Property_CenterVertical:
+ prop.mCenterV = asReal(decl); flags|=ExtractedCenterV; break;
+
+ case Property_LayoutDirection: // fall-through
+ case Property_Mirroring:
+ prop.mLayoutDir = parseLayoutDirectionValue(decl.values.at(0));
+ flags|=ExtractedLayoutDir;
+ break;
+
+ case Property_TextAlignment:
+ prop.mTextAlignment = parseAlignment(decl); flags|=ExtractedTextAlign; break;
+ case Property_TextLineCountMin:
+ prop.mMinLines = decl.values.first().variant.toInt(); flags|=ExtractedMinLines; break;
+ case Property_TextLineCountMax:
+ prop.mMaxLines = decl.values.first().variant.toInt(); flags|=ExtractedMaxLines; break;
+ case Property_TextWrapMode:
+ prop.mTextWrapMode = parseWrapMode(decl.values.at(0)); flags|=ExtractedWrapMode; break;
+ case Property_ZValue: prop.mZ =
+ asReal(decl); flags|=ExtractedZValue; break;
+
+ case Property_BorderWidthBottom:
+ prop.mBorderWidths[BottomEdge] = asReal(decl); flags|=ExtractedBorderWidths; break;
+ case Property_BorderWidthLeft:
+ prop.mBorderWidths[LeftEdge] = asReal(decl); flags|=ExtractedBorderWidths; break;
+ case Property_BorderWidthRight:
+ prop.mBorderWidths[RightEdge] = asReal(decl); flags|=ExtractedBorderWidths; break;
+ case Property_BorderWidthTop:
+ prop.mBorderWidths[TopEdge] = asReal(decl); flags|=ExtractedBorderWidths; break;
+ case Property_BorderWidth:
+ asReals(decl, prop.mBorderWidths); flags|=ExtractedBorderWidths; break;
+
+ case Property_AspectRatio:
+ prop.mAspectRatioMode = parseAspectRatioMode(decl.values.at(0));
+ flags|=ExtractedAspectRatioMode;
+ break;
+
+ case Property_FontSize: setFontSizeFromValue(decl.values.at(0), prop.mFont); break;
+ case Property_FontStyle: setFontStyleFromValue(decl.values.at(0), prop.mFont); break;
+ case Property_FontWeight: setFontWeightFromValue(decl.values.at(0), prop.mFont); break;
+ case Property_FontFamily: setFontFamilyFromValues(decl, prop.mFont); break;
+ case Property_TextDecoration: setTextDecorationFromValues(decl, prop.mFont); break;
+ case Property_Font: parseShorthandFontProperty(decl, prop.mFont); break;
+ case Property_FontVariant:
+ setFontVariantFromValue(decl.values.at(0), prop.mFontSpec, prop.mFont); break;
+ case Property_TextTransform:
+ setTextTransformFromValue(decl.values.at(0), prop.mFont); break;
+ case Property_TextHeight:
+ tphSet = true; prop.mFontSpec.setTextHeight(asReal(decl)); break;
+
+ default: continue;
+ }
+ hit = true;
+ }
+
+ if (prop.mFont != QFont()) {
+ flags |= ExtractedFont;
+ }
+ if (!prop.mFontSpec.isNull()) {
+ flags |= ExtractedFontSpec;
+ }
+
+ prop.mFlags = flags;
+ return hit;
+}
+static QColor parseColorValue(Value v)
{
if (v.type == Value::Identifier || v.type == Value::String || v.type == Value::Color)
return v.variant.toColor();
@@ -976,14 +729,6 @@
if (lst.count() != 2)
return QColor();
- if ((lst.at(0).compare(QLatin1String("palette"), Qt::CaseInsensitive)) == 0) {
- int role = findKnownValue(lst.at(1), values, NumKnownValues);
- if (role >= Value_FirstColorRole && role <= Value_LastColorRole)
- return pal.color((QPalette::ColorRole)(role-Value_FirstColorRole));
-
- return QColor();
- }
-
bool rgb = lst.at(0).startsWith(QLatin1String("rgb"));
Parser p(lst.at(1));
@@ -1012,419 +757,9 @@
: QColor::fromHsv(v1, v2, v3, alpha);
}
-static QBrush parseBrushValue(Value v, const QPalette &pal)
-{
- QColor c = parseColorValue(v, pal);
- if (c.isValid())
- return QBrush(c);
-
- if (v.type != Value::Function)
- return QBrush();
-
- QStringList lst = v.variant.toStringList();
- if (lst.count() != 2)
- return QBrush();
-
- QStringList gradFuncs;
- gradFuncs << QLatin1String("qlineargradient") << QLatin1String("qradialgradient") << QLatin1String("qconicalgradient") << QLatin1String("qgradient");
- int gradType = -1;
-
- if ((gradType = gradFuncs.indexOf(lst.at(0).toLower())) == -1)
- return QBrush();
-
- QHash<QString, qreal> vars;
- QVector<QGradientStop> stops;
-
- int spread = -1;
- QStringList spreads;
- spreads << QLatin1String("pad") << QLatin1String("reflect") << QLatin1String("repeat");
-
- Parser parser(lst.at(1));
- while (parser.hasNext()) {
- parser.skipSpace();
- if (!parser.test(IDENT))
- return QBrush();
- QString attr = parser.lexem();
- parser.skipSpace();
- if (!parser.test(COLON))
- return QBrush();
- parser.skipSpace();
- if (attr.compare(QLatin1String("stop"), Qt::CaseInsensitive) == 0) {
- Value stop, color;
- parser.next();
- if (!parser.parseTerm(&stop)) return QBrush();
- parser.skipSpace();
- parser.next();
- if (!parser.parseTerm(&color)) return QBrush();
- stops.append(QGradientStop(stop.variant.toDouble(), parseColorValue(color, pal)));
- } else {
- parser.next();
- Value value;
- parser.parseTerm(&value);
- if (attr.compare(QLatin1String("spread"), Qt::CaseInsensitive) == 0) {
- spread = spreads.indexOf(value.variant.toString());
- } else {
- vars[attr] = value.variant.toString().toDouble();
- }
- }
- parser.skipSpace();
- parser.test(COMMA);
- }
-
- if (gradType == 0) {
- QLinearGradient lg(vars.value(QLatin1String("x1")), vars.value(QLatin1String("y1")),
- vars.value(QLatin1String("x2")), vars.value(QLatin1String("y2")));
- lg.setCoordinateMode(QGradient::ObjectBoundingMode);
- lg.setStops(stops);
- if (spread != -1)
- lg.setSpread(QGradient::Spread(spread));
- return QBrush(lg);
- }
-
- if (gradType == 1) {
- QRadialGradient rg(vars.value(QLatin1String("cx")), vars.value(QLatin1String("cy")),
- vars.value(QLatin1String("radius")), vars.value(QLatin1String("fx")),
- vars.value(QLatin1String("fy")));
- rg.setCoordinateMode(QGradient::ObjectBoundingMode);
- rg.setStops(stops);
- if (spread != -1)
- rg.setSpread(QGradient::Spread(spread));
- return QBrush(rg);
- }
-
- if (gradType == 2) {
- QConicalGradient cg(vars.value(QLatin1String("cx")), vars.value(QLatin1String("cy")),
- vars.value(QLatin1String("angle")));
- cg.setCoordinateMode(QGradient::ObjectBoundingMode);
- cg.setStops(stops);
- if (spread != -1)
- cg.setSpread(QGradient::Spread(spread));
- return QBrush(cg);
- }
-
- return QBrush();
-}
-
-static BorderStyle parseStyleValue(Value v)
-{
- if (v.type == Value::KnownIdentifier) {
- switch (v.variant.toInt()) {
- case Value_None:
- return BorderStyle_None;
- case Value_Dotted:
- return BorderStyle_Dotted;
- case Value_Dashed:
- return BorderStyle_Dashed;
- case Value_Solid:
- return BorderStyle_Solid;
- case Value_Double:
- return BorderStyle_Double;
- case Value_DotDash:
- return BorderStyle_DotDash;
- case Value_DotDotDash:
- return BorderStyle_DotDotDash;
- case Value_Groove:
- return BorderStyle_Groove;
- case Value_Ridge:
- return BorderStyle_Ridge;
- case Value_Inset:
- return BorderStyle_Inset;
- case Value_Outset:
- return BorderStyle_Outset;
- case Value_Native:
- return BorderStyle_Native;
- default:
- break;
- }
- }
-
- return BorderStyle_Unknown;
-}
-#ifndef HB_BIN_CSS
-void ValueExtractor::borderValue(const Declaration &decl, qreal *width, HbCss::BorderStyle *style, QBrush *color)
-{
- *width = 0;
- *style = BorderStyle_None;
- *color = QColor();
-
- if (decl.values.isEmpty())
- return;
-
- int i = 0;
- if (decl.values.at(i).type == Value::Length || decl.values.at(i).type == Value::Number) {
- *width = asReal(decl.values.at(i));
- if (++i >= decl.values.count())
- return;
- }
-
- *style = parseStyleValue(decl.values.at(i));
- if (*style != BorderStyle_Unknown) {
- if (++i >= decl.values.count())
- return;
- } else {
- *style = BorderStyle_None;
- }
-
- *color = parseBrushValue(decl.values.at(i), pal);
-}
-
-static void parseShorthandBackgroundProperty(const HbVector<Value> &values, QBrush *brush, QString *image, Repeat *repeat, Qt::Alignment *alignment, const QPalette &pal)
-{
- *brush = QBrush();
- image->clear();
- *repeat = Repeat_XY;
- *alignment = Qt::AlignTop | Qt::AlignLeft;
-
- for (int i = 0; i < values.count(); ++i) {
- const Value v = values.at(i);
- if (v.type == Value::Uri) {
- *image = v.variant.toString();
- continue;
- } else if (v.type == Value::KnownIdentifier && v.variant.toInt() == Value_None) {
- image->clear();
- continue;
- } else if (v.type == Value::KnownIdentifier && v.variant.toInt() == Value_Transparent) {
- *brush = QBrush(Qt::transparent);
- }
-
- Repeat repeatAttempt = static_cast<Repeat>(findKnownValue(v.variant.toString(),
- repeats, NumKnownRepeats));
- if (repeatAttempt != Repeat_Unknown) {
- *repeat = repeatAttempt;
- continue;
- }
-
- if (v.type == Value::KnownIdentifier) {
- const int start = i;
- int count = 1;
- if (i < values.count() - 1
- && values.at(i + 1).type == Value::KnownIdentifier) {
- ++i;
- ++count;
- }
- Qt::Alignment a = parseAlignment(values.constData() + start, count);
- if (int(a) != 0) {
- *alignment = a;
- continue;
- }
- i -= count - 1;
- }
-
- *brush = parseBrushValue(v, pal);
- }
-}
-
-bool ValueExtractor::extractBackground(QBrush *brush, QString *image, Repeat *repeat,
- Qt::Alignment *alignment, Origin *origin, Attachment *attachment,
- Origin *clip)
-{
- bool hit = false;
- for (int i = 0; i < declarations.count(); ++i) {
- const Declaration &decl = declarations.at(i);
- if (decl.values.isEmpty())
- continue;
- const Value val = decl.values.first();
- switch (decl.propertyId) {
- case BackgroundColor:
- *brush = parseBrushValue(val, pal);
- break;
- case BackgroundImage:
- if (val.type == Value::Uri)
- *image = val.variant.toString();
- break;
- case BackgroundRepeat:
- *repeat = static_cast<Repeat>(findKnownValue(val.variant.toString(),
- repeats, NumKnownRepeats));
- break;
- case BackgroundPosition:
- *alignment = decl.alignmentValue();
- break;
- case BackgroundOrigin:
- *origin = decl.originValue();
- break;
- case BackgroundClip:
- *clip = decl.originValue();
- break;
- case Background:
- parseShorthandBackgroundProperty(decl.values, brush, image, repeat, alignment, pal);
- break;
- case BackgroundAttachment:
- *attachment = decl.attachmentValue();
- break;
- default: continue;
- }
- hit = true;
- }
- return hit;
-}
-
-static bool setFontSizeFromValue(Value value, QFont *font, int *fontSizeAdjustment)
-{
- if (value.type == Value::KnownIdentifier) {
- bool valid = true;
- switch (value.variant.toInt()) {
- case Value_Small: *fontSizeAdjustment = -1; break;
- case Value_Medium: *fontSizeAdjustment = 0; break;
- case Value_Large: *fontSizeAdjustment = 1; break;
- case Value_XLarge: *fontSizeAdjustment = 2; break;
- case Value_XXLarge: *fontSizeAdjustment = 3; break;
- default: valid = false; break;
- }
- return valid;
- }
- if (value.type != Value::Length)
- return false;
-
- bool valid = false;
- QString s = value.variant.toString();
- if (s.endsWith(QLatin1String("pt"), Qt::CaseInsensitive)) {
- s.chop(2);
- value.variant = s;
- if (value.variant.convert(HbVariant::Double)) {
- font->setPointSizeF(value.variant.toDouble());
- valid = true;
- }
- } else if (s.endsWith(QLatin1String("px"), Qt::CaseInsensitive)) {
- s.chop(2);
- value.variant = s;
- if (value.variant.convert(HbVariant::Int)) {
- font->setPixelSize(value.variant.toInt());
- valid = true;
- }
- }
- return valid;
-}
-
-static bool setFontStyleFromValue(const Value &value, QFont *font)
-{
- if (value.type != Value::KnownIdentifier)
- return false ;
- switch (value.variant.toInt()) {
- case Value_Normal: font->setStyle(QFont::StyleNormal); return true;
- case Value_Italic: font->setStyle(QFont::StyleItalic); return true;
- case Value_Oblique: font->setStyle(QFont::StyleOblique); return true;
- default: break;
- }
- return false;
-}
-
-static bool setFontWeightFromValue(const Value &value, QFont *font)
-{
- if (value.type == Value::KnownIdentifier) {
- switch (value.variant.toInt()) {
- case Value_Normal: font->setWeight(QFont::Normal); return true;
- case Value_Bold: font->setWeight(QFont::Bold); return true;
- default: break;
- }
- return false;
- }
- if (value.type != Value::Number)
- return false;
- font->setWeight(qMin(value.variant.toInt() / 8, 99));
- return true;
-}
-
-static bool setFontFamilyFromValues(const HbVector<Value> &values, QFont *font)
-{
- QString family;
- for (int i = 0; i < values.count(); ++i) {
- const Value &v = values.at(i);
- if (v.type == Value::TermOperatorComma)
- break;
- const QString str = v.variant.toString();
- if (str.isEmpty())
- break;
- family += str;
- family += QLatin1Char(' ');
- }
- family = family.simplified();
- if (family.isEmpty())
- return false;
- font->setFamily(family);
- return true;
-}
-
-static void setTextDecorationFromValues(const HbVector<Value> &values, QFont *font)
-{
- for (int i = 0; i < values.count(); ++i) {
- if (values.at(i).type != Value::KnownIdentifier)
- continue;
- switch (values.at(i).variant.toInt()) {
- case Value_Underline: font->setUnderline(true); break;
- case Value_Overline: font->setOverline(true); break;
- case Value_LineThrough: font->setStrikeOut(true); break;
- case Value_None:
- font->setUnderline(false);
- font->setOverline(false);
- font->setStrikeOut(false);
- break;
- default: break;
- }
- }
-}
-
-static void parseShorthandFontProperty(const HbVector<Value> &values, QFont *font, int *fontSizeAdjustment)
-{
- font->setStyle(QFont::StyleNormal);
- font->setWeight(QFont::Normal);
- *fontSizeAdjustment = 0;
-
- int i = 0;
- while (i < values.count()) {
- if (setFontStyleFromValue(values.at(i), font)
- || setFontWeightFromValue(values.at(i), font))
- ++i;
- else
- break;
- }
-
- if (i < values.count()) {
- setFontSizeFromValue(values.at(i), font, fontSizeAdjustment);
- ++i;
- }
-
- if (i < values.count()) {
- QString fam = values.at(i).variant.toString();
- if (!fam.isEmpty())
- font->setFamily(fam);
- }
-}
-
-static void setFontVariantFromValue(const Value &value, HbFontSpec *fontSpec, QFont *font )
-{
- // Sets font variants. Some set the fontspec and some the HbFontSpec
- HbFontSpec::Role role( HbFontSpec::Undefined );
- if (value.type == Value::KnownIdentifier) {
- switch (value.variant.toInt()) {
- case Value_Normal: font->setCapitalization(QFont::MixedCase); break;
- case Value_SmallCaps: font->setCapitalization(QFont::SmallCaps); break;
- case Value_Primary: role = HbFontSpec::Primary; break;
- case Value_Secondary: role = HbFontSpec::Secondary; break;
- case Value_Title: role = HbFontSpec::Title; break;
- case Value_PrimarySmall: role = HbFontSpec::PrimarySmall; break;
- case Value_Digital: role = HbFontSpec::Digital; break;
- default: break;
- }
- }
- if (role != HbFontSpec::Undefined) {
- fontSpec->setRole( role );
- }
-}
-
-static void setTextTransformFromValue(const Value &value, QFont *font)
-{
- if (value.type == Value::KnownIdentifier) {
- switch (value.variant.toInt()) {
- case Value_None: font->setCapitalization(QFont::MixedCase); break;
- case Value_Uppercase: font->setCapitalization(QFont::AllUppercase); break;
- case Value_Lowercase: font->setCapitalization(QFont::AllLowercase); break;
- default: break;
- }
- }
-}
-
-
-bool ValueExtractor::extractValue(const QString& variableName, HbVector<HbCss::Value>& values) const
+bool ValueExtractor::extractVariableValue(
+ const QString& variableName,
+ HbVector<HbCss::Value>& values) const
{
bool variableFound = false;
if ( !variableDeclarationsHash.isEmpty() ) {
@@ -1445,30 +780,31 @@
return variableFound;
}
-bool ValueExtractor::extractValue(const QString& variableName, qreal& value)
+bool ValueExtractor::extractVariableValue(const QString& variableName, qreal& value)
{
bool variableFound = false;
HbVector<HbCss::Value> values;
- if (extractValue(variableName, values)) {
+ if (extractVariableValue(variableName, values)) {
value = asReal(values.first());
variableFound = true;
}
return variableFound;
}
-bool ValueExtractor::extractValue( const QString& variableName, HbCss::Value &val ) const
+bool ValueExtractor::extractVariableValue( const QString& variableName, HbCss::Value &val ) const
{
HbVector<HbCss::Value> values;
- bool variableFound = extractValue( variableName, values );
+ bool variableFound = extractVariableValue( variableName, values );
//for variable cascading support
if ( variableFound ) {
val = values.first();
if ( val.type == Value::Variable ){
- variableFound = extractValue ( val.variant.toString (), val );
+ variableFound = extractVariableValue ( val.variant.toString (), val );
}
- }else {
- HbLayeredStyleLoader *styleLoader = HbLayeredStyleLoader::getStack(HbLayeredStyleLoader::Concern_Colors);
+ } else {
+ HbLayeredStyleLoader *styleLoader =
+ HbLayeredStyleLoader::getStack(HbLayeredStyleLoader::Concern_Colors);
if (styleLoader) {
variableFound = styleLoader->findInDefaultVariables(variableName, val);
}
@@ -1495,7 +831,7 @@
int precedenceLevel = 0;
bool parseVariable = false;
bool endMark = false;
- int operatorCount = 1; // there can only be 2 sequental operators if the latter one is unary '-'
+ int operatorCount = 1;//there can only be 2 sequental operators if the latter one is unary '-'
while (position < expression.size()) {
endMark = false;
if (expression.at(position) == SPACE) {
@@ -1531,12 +867,14 @@
if (valueString.startsWith("var(") && valueString.endsWith(")")) {
// remove var( and last )
QString variableString = valueString.mid(4, valueString.size()-5);
- if (!extractValue(variableString, val)) {
+ if (!extractVariableValue(variableString, val)) {
expressionValues.clear();
return false;
}
} else {
- if (!asReal(valueString, val)) {
+ bool real_ok = true;
+ val = asReal(valueString, Value::String, &real_ok);
+ if (!real_ok) {
expressionValues.clear();
return false;
}
@@ -1547,12 +885,14 @@
begin = -1;
if (expression.at(position) == MINUS) {
if (operatorCount == 1) {
- expressionValues.append(ExpressionValue(ExpressionValue::UnaryMinus,precedenceLevel+2,0));
+ expressionValues.append(
+ ExpressionValue(ExpressionValue::UnaryMinus,precedenceLevel+2,0));
} else if (operatorCount > 1) {
expressionValues.clear();
return false;
} else {
- expressionValues.append(ExpressionValue(ExpressionValue::Minus,precedenceLevel,0));
+ expressionValues.append(
+ ExpressionValue(ExpressionValue::Minus,precedenceLevel,0));
}
operatorCount++;
} else if (expression.at(position) == PLUS) {
@@ -1560,21 +900,24 @@
expressionValues.clear();
return false;
}
- expressionValues.append(ExpressionValue(ExpressionValue::Plus,precedenceLevel,0));
+ expressionValues.append(
+ ExpressionValue(ExpressionValue::Plus,precedenceLevel,0));
operatorCount++;
} else if (expression.at(position) == STAR) {
if (operatorCount > 0) {
expressionValues.clear();
return false;
}
- expressionValues.append(ExpressionValue(ExpressionValue::Star,precedenceLevel+1,0));
+ expressionValues.append(
+ ExpressionValue(ExpressionValue::Star,precedenceLevel+1,0));
operatorCount++;
} else if (expression.at(position) == SLASH) {
if (operatorCount > 0) {
expressionValues.clear();
return false;
}
- expressionValues.append(ExpressionValue(ExpressionValue::Slash,precedenceLevel+1,0));
+ expressionValues.append(
+ ExpressionValue(ExpressionValue::Slash,precedenceLevel+1,0));
operatorCount++;
}
position++;
@@ -1607,12 +950,14 @@
if (valueString.startsWith("var(") && valueString.endsWith(")")) {
// remove var( and last )
QString variableString = valueString.mid(4, valueString.size()-5);
- if (!extractValue(variableString, val)) {
+ if (!extractVariableValue(variableString, val)) {
expressionValues.clear();
return false;
}
} else {
- if (!asReal(valueString, val)) {
+ bool real_ok = true;
+ val = asReal(valueString, Value::String, &real_ok);
+ if (!real_ok) {
expressionValues.clear();
return false;
}
@@ -1673,7 +1018,8 @@
break;
}
if (expressionValues[calculateIndex].mToken == ExpressionValue::UnaryMinus) {
- expressionValues[calculateIndex+1].mValue = -expressionValues[calculateIndex+1].mValue;
+ expressionValues[calculateIndex+1].mValue =
+ -expressionValues[calculateIndex+1].mValue;
expressionValues.removeAt(calculateIndex);
} else {
expressionValues[calculateIndex-1].mValue = answer;
@@ -1689,14 +1035,14 @@
}
-bool ValueExtractor::extractParameters( const QList<QString> ¶ms, QList<QVariant> &values )
+bool ValueExtractor::extractCustomProperties( const QList<QString> &keys, QList<QVariant> &values )
{
- if ( params.count() != values.count() ) {
+ if ( keys.count() != values.count() ) {
return false;
}
for ( int i = 0; i < declarations.count(); i++ ) {
- for( int j = 0; j < params.count(); j++ ) {
- if (declarations[i].property == params[j] ) {
+ for( int j = 0; j < keys.count(); j++ ) {
+ if (declarations[i].property == keys[j] ) {
Value val = declarations[i].values.last();
switch (val.type) {
case Value::Length:
@@ -1723,114 +1069,19 @@
return true;
}
-bool ValueExtractor::extractFont(QFont *font, HbFontSpec *fontSpec, int *fontSizeAdjustment)
+bool ValueExtractor::extractLayout(QString &layoutName, QString §ionName)
{
- if (fontExtracted) {
- *font = f;
- *fontSizeAdjustment = adjustment;
- *fontSpec = fSpec;
- return fontExtracted == 1;
- }
-
- bool hit = false;
- bool tphSet = false;
- for (int i = 0; i < declarations.count(); ++i) {
- const Declaration &decl = declarations.at(i);
- if (decl.values.isEmpty())
- continue;
- const Value val = decl.values.first();
- switch (decl.propertyId) {
- case FontSize: setFontSizeFromValue(val, font, fontSizeAdjustment); break;
- case FontStyle: setFontStyleFromValue(val, font); break;
- case FontWeight: setFontWeightFromValue(val, font); break;
- case FontFamily: setFontFamilyFromValues(decl.values, font); break;
- case TextDecoration: setTextDecorationFromValues(decl.values, font); break;
- case Font: parseShorthandFontProperty(decl.values, font, fontSizeAdjustment); break;
- case FontVariant: setFontVariantFromValue(val, fontSpec, font); break;
- case TextTransform: setTextTransformFromValue(val, font); break;
- // Text-height alone is not enough to make 'hit' true.
- case HbFixedHeight: if (!tphSet) fontSpec->setTextHeight(asReal(decl)); continue;
- case HbTextHeight: tphSet = true; fontSpec->setTextHeight(asReal(decl)); continue;
- default: continue;
- }
- hit = true;
- }
-
- f = *font;
- fSpec = *fontSpec;
- adjustment = *fontSizeAdjustment;
- fontExtracted = hit ? 1 : 2;
- return hit;
-}
-
-bool ValueExtractor::extractPalette(QBrush *fg, QBrush *sfg, QBrush *sbg, QBrush *abg)
-{
+ QString tempSectionName;
bool hit = false;
for (int i = 0; i < declarations.count(); ++i) {
const Declaration &decl = declarations.at(i);
- switch (decl.propertyId) {
- case Color: *fg = decl.brushValue(pal); break;
- case QtSelectionForeground: *sfg = decl.brushValue(pal); break;
- case QtSelectionBackground: *sbg = decl.brushValue(pal); break;
- case QtAlternateBackground: *abg = decl.brushValue(pal); break;
- default: continue;
- }
- hit = true;
- }
- return hit;
-}
-
-void ValueExtractor::extractFont()
-{
- if (fontExtracted)
- return;
- int dummy = -255;
- // Values extracted into the object's own member variables.
- extractFont(&f, &fSpec, &dummy);
-}
-
-bool ValueExtractor::extractImage(QIcon *icon, Qt::Alignment *a, QSize *size)
-{
- bool hit = false;
- for (int i = 0; i < declarations.count(); ++i) {
- const Declaration &decl = declarations.at(i);
- switch (decl.propertyId) {
- case QtImage:
- *icon = decl.iconValue();
- if (decl.values.count() > 0 && decl.values.at(0).type == Value::Uri) {
- // try to pull just the size from the image...
- QImageReader imageReader(decl.values.at(0).variant.toString());
- if ((*size = imageReader.size()).isNull()) {
- // but we'll have to load the whole image if the
- // format doesn't support just reading the size
- *size = imageReader.read().size();
- }
- }
- break;
- case QtImageAlignment: *a = decl.alignmentValue(); break;
- default: continue;
- }
- hit = true;
- }
- return hit;
-}
-
-bool ValueExtractor::extractLayout(QString *layoutName, QString *sectionName)
-{
- QString tempSectionName;
- if ( !layoutName || !sectionName ) {
- return false;
- }
- bool hit = false;
- for (int i = 0; i < declarations.count(); ++i) {
- const Declaration &decl = declarations.at(i);
- if ( decl.propertyId == HbLayout ) {
+ if ( decl.propertyId == Property_Layout ) {
if( decl.values.count() == 1 ) {
- *layoutName = decl.values.at(0).variant.toString();
+ layoutName = decl.values.at(0).variant.toString();
hit = true;
}
}
- else if ( decl.propertyId == HbSection ) {
+ else if ( decl.propertyId == Property_Section ) {
if (decl.values.count() == 1 ) {
tempSectionName = decl.values.at(0).variant.toString();
// a section without a layout doesn't count as a hit
@@ -1838,55 +1089,28 @@
}
}
if(hit)
- *sectionName = tempSectionName;
+ sectionName = tempSectionName;
return hit;
}
-
-bool ValueExtractor::extractAspectRatioMode(Qt::AspectRatioMode *mode)
-{
- bool hit = false;
- for (int i = 0; i < declarations.count(); ++i) {
- const Declaration &decl = declarations.at(i);
- if ( decl.propertyId == HbAspectRatio && decl.values.count() == 1 ) {
- switch (decl.values.at(0).variant.toInt())
- {
- case Value_Ignore:
- *mode = Qt::IgnoreAspectRatio;
- break;
- case Value_Keep:
- *mode = Qt::KeepAspectRatio;
- break;
- case Value_KeepExpand:
- *mode = Qt::KeepAspectRatioByExpanding;
- break;
- default:
- continue;
- }
- hit = true;
- }
- }
- return hit;
-}
-
-bool ValueExtractor::extractColor( QColor *col ) const
+bool ValueExtractor::extractColor( QColor &color ) const
{
bool hit = false;
const int declarationsCount = declarations.count();
for ( int i = 0; i < declarationsCount; ++i ) {
const Declaration &decl = declarations.at(i);
switch(decl.propertyId) {
- case Color:
- if( decl.values.at(0).type == Value::Variable ) {
- HbCss::Value value;
- hit = extractValue( decl.values.at(0).variant.toString (), value );
- if (hit) {
- *col = value.variant.toColor();
- }
+ case Property_Color:
+ {
+ HbCss::Value value;
+ if ( decl.values.at(0).type == Value::Variable ) {
+ extractVariableValue( decl.values.at(0).variant.toString(), value );
+ } else {
+ value = decl.values.at(0);
}
- else {
- *col = decl.values.at(0).variant.toColor();
- hit = true;
+ color = parseColorValue(value);
+ hit = true;
+ break;
}
default:
break;
@@ -1896,277 +1120,6 @@
}
#endif
-QColor Declaration::colorValue(const QPalette &pal) const
-{
- if (values.count() != 1)
- return QColor();
-
- return parseColorValue(values.first(), pal);
-}
-
-QBrush Declaration::brushValue(const QPalette &pal) const
-{
- if (values.count() != 1)
- return QBrush();
-
- return parseBrushValue(values.first(), pal);
-}
-
-void Declaration::brushValues(QBrush *c, const QPalette &pal) const
-{
- int i;
- for (i = 0; i < qMin(values.count(), 4); i++)
- c[i] = parseBrushValue(values.at(i), pal);
- if (i == 0) c[0] = c[1] = c[2] = c[3] = QBrush();
- else if (i == 1) c[3] = c[2] = c[1] = c[0];
- else if (i == 2) c[2] = c[0], c[3] = c[1];
- else if (i == 3) c[3] = c[1];
-}
-
-bool Declaration::realValue(qreal *real, const char *unit) const
-{
- if (values.count() != 1)
- return false;
- const Value &v = values.first();
- if (unit && v.type != Value::Length)
- return false;
- QString s = v.variant.toString();
- if (unit) {
- if (!s.endsWith(QLatin1String(unit), Qt::CaseInsensitive))
- return false;
- s.chop(qstrlen(unit));
- }
- bool ok = false;
- qreal val = s.toDouble(&ok);
- if (ok)
- *real = val;
- return ok;
-}
-
-static bool intValueHelper(const Value &v, int *i, const char *unit)
-{
- if (unit && v.type != Value::Length)
- return false;
- QString s = v.variant.toString();
- if (unit) {
- if (!s.endsWith(QLatin1String(unit), Qt::CaseInsensitive))
- return false;
- s.chop(qstrlen(unit));
- }
- bool ok = false;
- int val = s.toInt(&ok);
- if (ok)
- *i = val;
- return ok;
-}
-
-bool Declaration::intValue(int *i, const char *unit) const
-{
- if (values.count() != 1)
- return false;
- return intValueHelper(values.first(), i, unit);
-}
-
-QSize Declaration::sizeValue() const
-{
- int x[2] = { 0, 0 };
- if (values.count() > 0)
- intValueHelper(values.at(0), &x[0], "px");
- if (values.count() > 1)
- intValueHelper(values.at(1), &x[1], "px");
- else
- x[1] = x[0];
- return QSize(x[0], x[1]);
-}
-
-QRect Declaration::rectValue() const
-{
- if (values.count() != 1)
- return QRect();
- const Value &v = values.first();
- if (v.type != Value::Function)
- return QRect();
- QStringList func = v.variant.toStringList();
- if (func.count() != 2 || func.first().compare(QLatin1String("rect")) != 0)
- return QRect();
- QStringList args = func[1].split(QLatin1String(" "), QString::SkipEmptyParts);
- if (args.count() != 4)
- return QRect();
- return QRect(args[0].toInt(), args[1].toInt(), args[2].toInt(), args[3].toInt());
-}
-
-void Declaration::colorValues(QColor *c, const QPalette &pal) const
-{
- int i;
- for (i = 0; i < qMin(values.count(), 4); i++)
- c[i] = parseColorValue(values.at(i), pal);
- if (i == 0) c[0] = c[1] = c[2] = c[3] = QColor();
- else if (i == 1) c[3] = c[2] = c[1] = c[0];
- else if (i == 2) c[2] = c[0], c[3] = c[1];
- else if (i == 3) c[3] = c[1];
-}
-
-BorderStyle Declaration::styleValue() const
-{
- if (values.count() != 1)
- return BorderStyle_None;
- return parseStyleValue(values.first());
-}
-
-void Declaration::styleValues(BorderStyle *s) const
-{
- int i;
- for (i = 0; i < qMin(values.count(), 4); i++)
- s[i] = parseStyleValue(values.at(i));
- if (i == 0) s[0] = s[1] = s[2] = s[3] = BorderStyle_None;
- else if (i == 1) s[3] = s[2] = s[1] = s[0];
- else if (i == 2) s[2] = s[0], s[3] = s[1];
- else if (i == 3) s[3] = s[1];
-}
-
-Repeat Declaration::repeatValue() const
-{
- if (values.count() != 1)
- return Repeat_Unknown;
- return static_cast<Repeat>(findKnownValue(values.first().variant.toString(),
- repeats, NumKnownRepeats));
-}
-
-Origin Declaration::originValue() const
-{
- if (values.count() != 1)
- return Origin_Unknown;
- return static_cast<Origin>(findKnownValue(values.first().variant.toString(),
- origins, NumKnownOrigins));
-}
-
-PositionMode Declaration::positionValue() const
-{
- if (values.count() != 1)
- return PositionMode_Unknown;
- return static_cast<PositionMode>(findKnownValue(values.first().variant.toString(),
- positions, NumKnownPositionModes));
-}
-
-Attachment Declaration::attachmentValue() const
-{
- if (values.count() != 1)
- return Attachment_Unknown;
- return static_cast<Attachment>(findKnownValue(values.first().variant.toString(),
- attachments, NumKnownAttachments));
-}
-
-int Declaration::styleFeaturesValue() const
-{
- int features = StyleFeature_None;
- for (int i = 0; i < values.count(); i++) {
- features |= static_cast<int>(findKnownValue(values.value(i).variant.toString(),
- styleFeatures, NumKnownStyleFeatures));
- }
- return features;
-}
-
-QString Declaration::uriValue() const
-{
- if (values.isEmpty() || values.first().type != Value::Uri)
- return QString();
- return values.first().variant.toString();
-}
-
-Qt::Alignment Declaration::alignmentValue() const
-{
- if (values.isEmpty() || values.count() > 2)
- return Qt::AlignLeft | Qt::AlignTop;
-
- return parseAlignment(values.constData(), values.count());
-}
-
-Hb::TextWrapping Declaration::wrapModeValue() const
-{
- if (values.isEmpty() || values.count() > 1)
- return Hb::TextNoWrap;
-
- return parseWrapMode(values.at(0));
-}
-
-void Declaration::borderImageValue(QString *image, int *cuts,
- TileMode *h, TileMode *v) const
-{
- *image = uriValue();
- for (int i = 0; i < 4; i++)
- cuts[i] = -1;
- *h = *v = TileMode_Stretch;
-
- if (values.count() < 2)
- return;
-
- if (values.at(1).type == Value::Number) { // cuts!
- int i;
- for (i = 0; i < qMin(values.count()-1, 4); i++) {
- const Value& v = values.at(i+1);
- if (v.type != Value::Number)
- break;
- cuts[i] = v.variant.toString().toInt();
- }
- if (i == 0) cuts[0] = cuts[1] = cuts[2] = cuts[3] = 0;
- else if (i == 1) cuts[3] = cuts[2] = cuts[1] = cuts[0];
- else if (i == 2) cuts[2] = cuts[0], cuts[3] = cuts[1];
- else if (i == 3) cuts[3] = cuts[1];
- }
-
- if (values.last().type == Value::Identifier) {
- *v = static_cast<TileMode>(findKnownValue(values.last().variant.toString(),
- tileModes, NumKnownTileModes));
- }
- if (values[values.count() - 2].type == Value::Identifier) {
- *h = static_cast<TileMode>
- (findKnownValue(values[values.count()-2].variant.toString(),
- tileModes, NumKnownTileModes));
- } else
- *h = *v;
-}
-
-QIcon Declaration::iconValue() const
-{
- QIcon icon;
- for (int i = 0; i < values.count();) {
- Value value = values.at(i++);
- if (value.type != Value::Uri)
- break;
- QString uri = value.variant.toString();
- QIcon::Mode mode = QIcon::Normal;
- QIcon::State state = QIcon::Off;
- for (int j = 0; j < 2; j++) {
- if (i != values.count() && values.at(i).type == Value::KnownIdentifier) {
- switch (values.at(i).variant.toInt()) {
- case Value_Disabled: mode = QIcon::Disabled; break;
- case Value_Active: mode = QIcon::Active; break;
- case Value_Selected: mode = QIcon::Selected; break;
- case Value_Normal: mode = QIcon::Normal; break;
- case Value_On: state = QIcon::On; break;
- case Value_Off: state = QIcon::Off; break;
- default: break;
- }
- ++i;
- } else {
- break;
- }
- }
-
- // QIcon is soo broken
- if (icon.isNull())
- icon = QIcon(uri);
- else
- icon.addPixmap(uri, mode, state);
-
- if (i == values.count())
- break;
-
- if (values.at(i).type == Value::TermOperatorComma)
- i++;
- }
- return icon;
-}
///////////////////////////////////////////////////////////////////////////////
// Selector
@@ -2236,7 +1189,8 @@
widgetSheets.clear();
}
-int StyleSelector::selectorMatches(const Selector &selector, NodePtr node, bool nameCheckNeeded) const
+int StyleSelector::selectorMatches(
+ const Selector &selector, NodePtr node, bool nameCheckNeeded) const
{
if (selector.basicSelectors.isEmpty()) {
return -1;
@@ -2290,7 +1244,8 @@
break;
}
firstLoop = false;
- } while (i >= 0 && (matchLevel >= 0 || sel.relationToNext == BasicSelector::MatchNextSelectorIfAncestor));
+ } while (i >= 0 && (matchLevel >= 0 ||
+ sel.relationToNext == BasicSelector::MatchNextSelectorIfAncestor));
return (matchLevel < 0) ? -1 : firstMatchLevel;
}
@@ -2313,7 +1268,8 @@
const uint CLASS_HASH = qHash(QString("class"));
-int StyleSelector::basicSelectorMatches(const BasicSelector &sel, NodePtr node, bool nameCheckNeeded) const
+int StyleSelector::basicSelectorMatches(
+ const BasicSelector &sel, NodePtr node, bool nameCheckNeeded) const
{
int matchLevel = 0;
HbString elementName(HbMemoryManager::HeapMemory);
@@ -2352,18 +1308,21 @@
return matchLevel;
}
-static inline bool qcss_selectorStyleRuleLessThan(const QPair<int, HbCss::StyleRule> &lhs, const QPair<int, HbCss::StyleRule> &rhs)
+static inline bool qcss_selectorStyleRuleLessThan(
+ const QPair<int, HbCss::StyleRule> &lhs, const QPair<int, HbCss::StyleRule> &rhs)
{
return lhs.first < rhs.first;
}
-static inline bool qcss_selectorDeclarationLessThan(const QPair<int, HbCss::Declaration> &lhs, const QPair<int, HbCss::Declaration> &rhs)
+static inline bool qcss_selectorDeclarationLessThan(
+ const QPair<int, HbCss::Declaration> &lhs, const QPair<int, HbCss::Declaration> &rhs)
{
return lhs.first < rhs.first;
}
-void StyleSelector::matchRules(NodePtr node, const HbVector<StyleRule> &rules, StyleSheetOrigin origin,
- int depth, QVector<WeightedRule> *weightedRules, bool nameCheckNeeded) const
+void StyleSelector::matchRules(
+ NodePtr node, const HbVector<StyleRule> &rules, StyleSheetOrigin origin,
+ int depth, QVector<WeightedRule> *weightedRules, bool nameCheckNeeded) const
{
for (int i = 0; i < rules.count(); ++i) {
const StyleRule &rule = rules.at(i);
@@ -2388,7 +1347,8 @@
// Returns style rules that are in ascending order of specificity
// Each of the StyleRule returned will contain exactly one Selector
-HbVector<StyleRule> StyleSelector::styleRulesForNode(NodePtr node, const Qt::Orientation orientation) const
+HbVector<StyleRule> StyleSelector::styleRulesForNode(
+ NodePtr node, const Qt::Orientation orientation) const
{
HbVector<StyleRule> rules;
if (styleSheets.isEmpty())
@@ -2406,7 +1366,8 @@
// Returns style rules and specificity values (unordered)
-QVector<WeightedRule> StyleSelector::weightedStyleRulesForNode(NodePtr node, const Qt::Orientation orientation) const
+QVector<WeightedRule> StyleSelector::weightedStyleRulesForNode(
+ NodePtr node, const Qt::Orientation orientation) const
{
initNode(node);
QVector<WeightedRule> weightedRules; // (spec, rule) that will be sorted below
@@ -2434,12 +1395,15 @@
if(styleSheet) {
WidgetStyleRules* widgetStack = styleSheet->widgetStack(classNameHash);
if (widgetStack) {
- matchRules(node, widgetStack->styleRules, styleSheet->origin, styleSheet->depth, &weightedRules, false);
+ matchRules(node, widgetStack->styleRules, styleSheet->origin,
+ styleSheet->depth, &weightedRules, false);
// Append orientation-specific rules
if (orientation == Qt::Vertical) {
- matchRules(node, widgetStack->portraitRules, styleSheet->origin, styleSheet->depth, &weightedRules, false);
+ matchRules(node, widgetStack->portraitRules, styleSheet->origin,
+ styleSheet->depth, &weightedRules, false);
}else if (orientation == Qt::Horizontal) {
- matchRules(node, widgetStack->landscapeRules, styleSheet->origin, styleSheet->depth, &weightedRules, false);
+ matchRules(node, widgetStack->landscapeRules, styleSheet->origin,
+ styleSheet->depth, &weightedRules, false);
}
}
if (firstLoop && !medium.isEmpty()) { // Media rules are only added to global widget stack
@@ -2448,8 +1412,8 @@
if (styleSheet->mediaRules.at(i).media.contains(
HbString(medium, HbMemoryManager::HeapMemory),
Qt::CaseInsensitive)) {
- matchRules(node, styleSheet->mediaRules.at(i).styleRules, styleSheet->origin,
- styleSheet->depth, &weightedRules);
+ matchRules(node, styleSheet->mediaRules.at(i).styleRules,
+ styleSheet->origin, styleSheet->depth, &weightedRules);
}
}
}// End medium.isEmpty loop
@@ -2498,8 +1462,10 @@
// Returns declarations and specificity values (unordered)
-QVector<WeightedDeclaration> StyleSelector::weightedDeclarationsForNode(NodePtr node, const Qt::Orientation orientation,
- const char *extraPseudo) const
+QVector<WeightedDeclaration> StyleSelector::weightedDeclarationsForNode(
+ NodePtr node,
+ const Qt::Orientation orientation,
+ const char *extraPseudo) const
{
QVector<WeightedDeclaration> decls;
QVector<WeightedRule> rules = weightedStyleRulesForNode(node, orientation);
@@ -2515,8 +1481,7 @@
quint64 pseudoClass = selector.pseudoClass();
bool pseudoClassIsValid =
- pseudoClass == PseudoClass_Enabled
- || pseudoClass == PseudoClass_Unspecified
+ pseudoClass == PseudoClass_Unspecified
|| pseudoClass == PseudoClass_Landscape
|| pseudoClass == PseudoClass_Portrait;
@@ -2535,14 +1500,17 @@
// for qtexthtmlparser which requires just the declarations with Enabled state
// and without pseudo elements
-HbVector<Declaration> StyleSelector::declarationsForNode(NodePtr node, const Qt::Orientation orientation,
+HbVector<Declaration> StyleSelector::declarationsForNode(
+ NodePtr node,
+ const Qt::Orientation orientation,
const char *extraPseudo) const
{
HbVector<Declaration> decls;
if (styleSheets.isEmpty())
return decls;
- QVector<WeightedDeclaration> weightedDecls = weightedDeclarationsForNode(node, orientation, extraPseudo);
+ QVector<WeightedDeclaration> weightedDecls =
+ weightedDeclarationsForNode(node, orientation, extraPseudo);
qStableSort(weightedDecls.begin(), weightedDecls.end(), qcss_selectorDeclarationLessThan);
@@ -2644,22 +1612,9 @@
return output;
}
-int HbQCss::QCssScanner_Generated::handleCommentStart()
-{
- while (pos < input.size() - 1) {
- if (input.at(pos) == QLatin1Char('*')
- && input.at(pos + 1) == QLatin1Char('/')) {
- pos += 2;
- break;
- }
- ++pos;
- }
- return S;
-}
-
void Scanner::scan(const QString &preprocessedInput, QVector<Symbol> *symbols)
{
- HbQCss::QCssScanner_Generated scanner(preprocessedInput);
+ HbCssScanner_Generated scanner(preprocessedInput);
Symbol sym;
int tok = scanner.lex();
while (tok != -1) {
@@ -2835,7 +1790,8 @@
if (((pseudo & HbCss::PseudoClass_Portrait) && ((negated & HbCss::PseudoClass_Portrait) == 0))
|| (negated & HbCss::PseudoClass_Landscape)) {
widgetStack->portraitRules.append(rule);
- } else if (((pseudo & HbCss::PseudoClass_Landscape) && ((negated & HbCss::PseudoClass_Landscape) == 0))
+ } else if (((pseudo & HbCss::PseudoClass_Landscape) &&
+ ((negated & HbCss::PseudoClass_Landscape) == 0))
|| (negated & HbCss::PseudoClass_Portrait)) {
widgetStack->landscapeRules.append(rule);
} else {
@@ -2979,7 +1935,8 @@
bool Parser::parseProperty(Declaration *decl)
{
decl->property = lexem();
- decl->propertyId = static_cast<Property>(findKnownValue(decl->property, properties, NumProperties));
+ decl->propertyId = static_cast<Property>(findKnownValue(
+ decl->property, properties, NumProperties));
skipSpace();
return true;
}
@@ -2987,7 +1944,6 @@
-//new function added for varibale support
bool Parser::parseVariableset(VariableRule *variableRule)
{
//no selector needs to be identified
@@ -3551,4 +2507,196 @@
return true;
}
+
+#ifdef CSS_PARSER_TRACES
+static const QString what(Value::Type t)
+{
+ QString returnString;
+ switch(t) {
+ case Value::Unknown:
+ returnString = QString("Unknown");
+ break;
+ case Value::Number:
+ returnString = QString("Number");
+ break;
+ case Value::Percentage:
+ returnString = QString("Percentage");
+ break;
+ case Value::Length:
+ returnString = QString("Length");
+ break;
+ case Value::String:
+ returnString = QString("String");
+ break;
+ case Value::Identifier:
+ returnString = QString("Identifier");
+ break;
+ case Value::KnownIdentifier:
+ returnString = QString("KnownIdentifier");
+ break;
+ case Value::Uri:
+ returnString = QString("Uri");
+ break;
+ case Value::Color:
+ returnString = QString("Color");
+ break;
+ case Value::Function:
+ returnString = QString("Function");
+ break;
+ case Value::TermOperatorSlash:
+ returnString = QString("TermOperatorSlash");
+ break;
+ case Value::TermOperatorComma:
+ returnString = QString("TermOperatorComma");
+ break;
+ case Value::Variable:
+ returnString = QString("Variable");
+ break;
+ default:
+ break;
+ }
+ return returnString;
+}
+
+void Value::print() const
+{
+ qDebug() <<"\t \t \t"<<"==============Value::Print():Begin==================";
+ qDebug() <<"\t \t \t"<< "Value::HbMemoryManager::MemoryType memoryType = " << memoryType;
+ qDebug() <<"\t \t \t"<< "Value::Type type = " << what(type);
+ qDebug() <<"\t \t \t"<< "Value::HbString original = " << original;
+ qDebug() <<"\t \t \t"<< "Value::HbVariant variant = " << variant.toString();
+ qDebug() <<"\t \t \t"<<"==============Value::Print():End====================";
+}
+
+void Declaration::print() const
+{
+ qDebug() <<"\t"<<"==============Declaration::Print():Begin==================";
+ qDebug() <<"\t"<<"Declaration::HbMemoryManager::MemoryType memoryType = " << memoryType;
+ qDebug() << "\t"<< "Declaration::HbString property = " << property;
+ qDebug() << "\t"<< "Declaration::Property propertyId = " << propertyId;
+ qDebug() << "\t"<< "Declaration::HbVector<Value> values = " ;
+ values.print();
+ qDebug() <<"\t"<<"==============Declaration::Print():End====================";
+}
+
+void Pseudo::print() const
+{
+ qDebug() <<"==============Pseudo::Print():Begin==================";
+ qDebug() << "Pseudo::HbMemoryManager::MemoryType memoryType = " << memoryType;
+ qDebug() << "Pseudo::HbString name= " << name;
+ qDebug() << "Pseudo::HbString function = " << function;
+ qDebug() <<"==============Pseudo::Print():End==================";
+}
+
+void AttributeSelector::print() const
+{
+ qDebug() <<"==============AttributeSelector::Print():Begin==================";
+ qDebug() << "AttributeSelector::HbMemoryManager::MemoryType memoryType = " << memoryType;
+ qDebug() << "AttributeSelector::HbString name= " << name;
+ qDebug() << "AttributeSelector::HbString value = " << value;
+ qDebug() <<"==============AttributeSelector::Print():End==================";
+}
+
+void BasicSelector::print() const
+{
+ qDebug() <<"\t \t"<<"==============BasicSelector::Print():Begin==================";
+ qDebug() <<"\t \t"<<"BasicSelector::HbMemoryManager::MemoryType memoryType = " << memoryType;
+ qDebug() <<"\t \t"<<"BasicSelector::HbString elementName= " << elementName;
+ //qDebug() <<"\t \t"<<"BasicSelector::QStringList ids = " << ids;
+ qDebug() <<"\t \t"<<"BasicSelector::PseudoVector pseudos = ";
+ pseudos.print();
+ qDebug() <<"\t \t"<< "BasicSelector::AttributeSelectorVector attributeSelectors = ";
+ attributeSelectors.print();
+ qDebug() <<"\t \t"<<"==============BasicSelector::Print():End====================";
+}
+
+void Selector::print() const
+{
+ qDebug() <<"\t "<<"==============Selector::Print():Begin==================";
+ qDebug() <<"\t "<<"Selector::HbMemoryManager::MemoryType memoryType = " << memoryType;
+ qDebug() <<"\t "<<"Selector::BasicSelectorVector basicSelectors= ";
+ basicSelectors.print();
+ qDebug() <<"\t "<<"==============Selector::Print():End==================";
+}
+
+void StyleRule::print() const
+{
+ qDebug() <<"==============StyleRule::Print():Begin==================";
+ qDebug() << "StyleRule::HbMemoryManager::MemoryType memoryType = " << memoryType;
+ qDebug() << "StyleRule::SelectorVector selectors = ";
+ selectors.print();
+ qDebug() << "StyleRule::DeclarationVector declarations = ";
+ declarations.print();
+ qDebug() <<"==============StyleRule::Print():End==================";
+}
+
+void VariableRule::print() const
+{
+ qDebug() <<"==============VariableRule::Print():Begin==================";
+ qDebug() << "VariableRule::HbMemoryManager::MemoryType memoryType = " << memoryType;
+ qDebug() << "VariableRule::DeclarationVector declarations = ";
+ declarations.print();
+ qDebug() <<"==============VariableRule::Print():End==================";
+}
+
+void MediaRule::print() const
+{
+ qDebug() <<"==============MediaRule::Print():Begin==================";
+ qDebug() << "MediaRule::HbMemoryManager::MemoryType memoryType = " << memoryType;
+ //qDebug() << "MediaRule::QStringList media = " << media;
+ qDebug() << "MediaRule::StyleRuleVector styleRules = ";
+ styleRules.print();
+ qDebug() <<"==============MediaRule::Print():End==================";
+}
+
+void PageRule::print() const
+{
+ qDebug() <<"==============PageRule::Print():Begin==================";
+ qDebug() << "PageRule::HbMemoryManager::MemoryType memoryType = " << memoryType;
+ qDebug() << "PageRule::HbString selector = " << selector;
+ qDebug() << "PageRule::DeclarationVector declarations = ";
+ declarations.print();
+ qDebug() <<"==============PageRule::Print():End==================";
+}
+
+void ImportRule::print() const
+{
+ qDebug() <<"==============ImportRule::Print():Begin==================";
+ qDebug() << "ImportRule::HbMemoryManager::MemoryType memoryType = " << memoryType;
+ qDebug() << "ImportRule::HbString href = " << href;
+ //qDebug() << "ImportRule::QStringList media = " << media;
+ qDebug() <<"==============ImportRule::Print():End==================";
+}
+
+void WidgetStyleRules::print() const
+{
+ qDebug() <<"==============WidgetStyleRules::Print():Begin==================";
+ qDebug() << "Generic rules:";
+ styleRules.print();
+ qDebug() << "Portrait rules:";
+ portraitRules.print();
+ qDebug() << "Landscape rules:";
+ landscapeRules.print();
+ qDebug() <<"==============WidgetStyleRules::Print():End==================";
+}
+
+void StyleSheet::print() const
+{
+ qDebug() <<"==============StyleSheet::Print():Begin==================";
+ qDebug() << "StyleSheet::HbMemoryManager::MemoryType memoryType = " << memoryType;
+ qDebug() << "StyleSheet::VariableRuleVector variableRules = ";
+ variableRules.print();
+ qDebug() << "StyleSheet::WidgetStyleRuleVector widgetRules = ";
+ widgetRules.print();
+ qDebug() << "StyleSheet::MediaRuleVector mediaRules = ";
+ mediaRules.print();
+ qDebug() << "StyleSheet::PageRulesVector pageRules = ";
+ pageRules.print();
+ qDebug() << "StyleSheet::ImportRuleVector importRules = ";
+ importRules.print();
+ qDebug() <<"==============StyleSheet::Print():End==================";
+}
+
+#endif // CSS_PARSER_TRACES
+
//QT_END_NAMESPACE
--- a/src/hbcore/cssparser/hbcssparser_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/cssparser/hbcssparser_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -32,7 +32,6 @@
#include <QPair>
#include <QSize>
#include <QFont>
-#include <QPalette>
#include <QIcon>
#include <QSizePolicy>
#include <QHash>
@@ -49,220 +48,85 @@
#include "hbvariant_p.h"
#include "hbstringvector_p.h"
-class HbFontSpec;
-
-//QT_BEGIN_NAMESPACE
-
namespace HbCss
{
enum Property {
- UnknownProperty,
- BackgroundColor,
- Color,
- Float,
- Font,
- FontFamily,
- FontSize,
- FontStyle,
- FontWeight,
- Margin,
- MarginBottom,
- MarginLeft,
- MarginRight,
- MarginTop,
- QtBlockIndent,
- QtListIndent,
- QtParagraphType,
- QtTableType,
- QtUserState,
- TextDecoration,
- TextIndent,
- TextUnderlineStyle,
- VerticalAlignment,
- Whitespace,
- QtSelectionForeground,
- QtSelectionBackground,
- Border,
- BorderLeft,
- BorderRight,
- BorderTop,
- BorderBottom,
- Padding,
- PaddingLeft,
- PaddingRight,
- PaddingTop,
- PaddingBottom,
- PageBreakBefore,
- PageBreakAfter,
- QtAlternateBackground,
- BorderLeftStyle,
- BorderRightStyle,
- BorderTopStyle,
- BorderBottomStyle,
- BorderStyles,
- BorderLeftColor,
- BorderRightColor,
- BorderTopColor,
- BorderBottomColor,
- BorderColor,
- BorderLeftWidth,
- BorderRightWidth,
- BorderTopWidth,
- BorderBottomWidth,
- BorderWidth,
- BorderTopLeftRadius,
- BorderTopRightRadius,
- BorderBottomLeftRadius,
- BorderBottomRightRadius,
- BorderRadius,
- Background,
- BackgroundOrigin,
- BackgroundClip,
- BackgroundRepeat,
- BackgroundPosition,
- BackgroundAttachment,
- BackgroundImage,
- BorderImage,
- QtSpacing,
- Width,
- Height,
- MinimumWidth,
- MinimumHeight,
- MaximumWidth,
- MaximumHeight,
- QtImage,
- Left,
- Right,
- Top,
- Bottom,
- QtOrigin,
- QtPosition,
- Position,
- QtStyleFeatures,
- QtBackgroundRole,
- ListStyleType,
- ListStyle,
- QtImageAlignment,
- TextAlignment,
- Outline,
- OutlineOffset,
- OutlineWidth,
- OutlineColor,
- OutlineStyle,
- OutlineRadius,
- OutlineTopLeftRadius,
- OutlineTopRightRadius,
- OutlineBottomLeftRadius,
- OutlineBottomRightRadius,
- FontVariant,
- TextTransform,
- HbSpacingHorizontal,
- HbSpacingVertical,
- HbColumnNarrowWidth,
- HbColumnWideWidth,
- HbIndent,
- HbSmallIconSize,
- HbLargeIconSize,
- HbTopMarginWeight,
- HbIconLeftAlignmentWeight,
- HbStretchable,
- HbLayout,
- HbAspectRatio,
- HbPreferredWidth,
- HbPreferredHeight,
- HbPreferredSize,
- HbFixedWidth,
- HbFixedHeight,
- HbFixedSize,
- HbMinimumSize,
- HbMaximumSize,
- HbSizePolicy,
- HbSizePolicyHorizontal,
- HbSizePolicyVertical,
- HbCenterHorizontal,
- HbCenterVertical,
- HbSection,
- HbTextLineCountMin,
- HbTextLineCountMax,
- HbTextHeight,
- HbTextWrapMode,
- Mirroring, // deprecated
- HbLayoutDirection,
- ZValue,
+ Property_Unknown,
+ Property_AspectRatio,
+ Property_BorderWidth,
+ Property_BorderWidthBottom,
+ Property_BorderWidthLeft,
+ Property_BorderWidthRight,
+ Property_BorderWidthTop,
+ Property_Bottom,
+ Property_CenterHorizontal,
+ Property_CenterVertical,
+ Property_Color,
+ Property_FixedHeight,
+ Property_FixedSize,
+ Property_FixedWidth,
+ Property_Font,
+ Property_FontFamily,
+ Property_FontSize,
+ Property_FontStyle,
+ Property_FontVariant,
+ Property_FontWeight,
+ Property_Height,
+ Property_Layout,
+ Property_LayoutDirection,
+ Property_Left,
+ Property_MaximumHeight,
+ Property_MaximumSize,
+ Property_MaximumWidth,
+ Property_MinimumHeight,
+ Property_MinimumSize,
+ Property_MinimumWidth,
+ Property_Mirroring, // deprecated
+ Property_PreferredHeight,
+ Property_PreferredSize,
+ Property_PreferredWidth,
+ Property_Right,
+ Property_Section,
+ Property_SizePolicy,
+ Property_SizePolicyHorizontal,
+ Property_SizePolicyVertical,
+ Property_Spacing,
+ Property_SpacingHorizontal,
+ Property_SpacingVertical,
+ Property_TextAlignment,
+ Property_TextDecoration,
+ Property_TextHeight,
+ Property_TextLineCountMax,
+ Property_TextLineCountMin,
+ Property_TextTransform,
+ Property_TextWrapMode,
+ Property_Top,
+ Property_Width,
+ Property_ZValue,
NumProperties
};
enum KnownValue {
UnknownValue,
Value_Normal,
- Value_Pre,
- Value_Small,
- Value_Medium,
- Value_Large,
- Value_XLarge,
- Value_XXLarge,
Value_Italic,
Value_Oblique,
Value_Bold,
Value_Underline,
Value_Overline,
Value_LineThrough,
- Value_Sub,
- Value_Super,
Value_Left,
Value_Right,
Value_Top,
Value_Bottom,
Value_Center,
- Value_Native,
- Value_Solid,
- Value_Dotted,
- Value_Dashed,
- Value_DotDash,
- Value_DotDotDash,
- Value_Double,
- Value_Groove,
- Value_Ridge,
- Value_Inset,
- Value_Outset,
- Value_Wave,
- Value_Middle,
- Value_Auto,
- Value_Always,
Value_None,
Value_Transparent,
- Value_Disc,
- Value_Circle,
- Value_Square,
- Value_Decimal,
- Value_LowerAlpha,
- Value_UpperAlpha,
Value_SmallCaps,
Value_Uppercase,
Value_Lowercase,
- /* keep these in same order as QPalette::ColorRole */
- Value_FirstColorRole,
- Value_WindowText = Value_FirstColorRole,
- Value_Button,
- Value_Light,
- Value_Midlight,
- Value_Dark,
- Value_Mid,
- Value_Text,
- Value_BrightText,
- Value_ButtonText,
- Value_Base,
- Value_Window,
- Value_Shadow,
- Value_Highlight,
- Value_HighlightedText,
- Value_Link,
- Value_LinkVisited,
- Value_AlternateBase,
- Value_LastColorRole = Value_AlternateBase,
-
Value_Disabled,
Value_Active,
Value_Selected,
@@ -299,23 +163,6 @@
NumKnownValues
};
-enum BorderStyle {
- BorderStyle_Unknown,
- BorderStyle_None,
- BorderStyle_Dotted,
- BorderStyle_Dashed,
- BorderStyle_Solid,
- BorderStyle_Double,
- BorderStyle_DotDash,
- BorderStyle_DotDotDash,
- BorderStyle_Groove,
- BorderStyle_Ridge,
- BorderStyle_Inset,
- BorderStyle_Outset,
- BorderStyle_Native,
- NumKnownBorderStyles
-};
-
enum Edge {
TopEdge,
RightEdge,
@@ -324,48 +171,6 @@
NumEdges
};
-enum Corner {
- TopLeftCorner,
- TopRightCorner,
- BottomLeftCorner,
- BottomRightCorner
-};
-
-enum TileMode {
- TileMode_Unknown,
- TileMode_Round,
- TileMode_Stretch,
- TileMode_Repeat,
- NumKnownTileModes
-};
-
-enum Repeat {
- Repeat_Unknown,
- Repeat_None,
- Repeat_X,
- Repeat_Y,
- Repeat_XY,
- NumKnownRepeats
-};
-
-enum Origin {
- Origin_Unknown,
- Origin_Padding,
- Origin_Border,
- Origin_Content,
- Origin_Margin,
- NumKnownOrigins
-};
-
-enum PositionMode {
- PositionMode_Unknown,
- PositionMode_Static,
- PositionMode_Relative,
- PositionMode_Absolute,
- PositionMode_Fixed,
- NumKnownPositionModes
-};
-
enum LayoutDirection {
LayoutDirection_LeftToRight,
LayoutDirection_RightToLeft,
@@ -373,21 +178,7 @@
NumKnownLayoutDirections
};
-enum Attachment {
- Attachment_Unknown,
- Attachment_Fixed,
- Attachment_Scroll,
- NumKnownAttachments
-};
-
-enum StyleFeature {
- StyleFeature_None = 0,
- StyleFeature_BackgroundColor = 1,
- StyleFeature_BackgroundGradient = 2,
- NumKnownStyleFeatures = 4
-};
-
-struct HB_CORE_PRIVATE_EXPORT Value
+struct HB_CORE_PRIVATE_EXPORT Value //krazy:exclude=multiclasses
{
enum Type {
Unknown,
@@ -415,69 +206,10 @@
variant(memType)
{ }
- //for debug only
#ifdef CSS_PARSER_TRACES
- const QString what(Type t) const
- {
- QString returnString;
- switch(t) {
- case Unknown:
- returnString = QString("Unknown");
- break;
- case Number:
- returnString = QString("Number");
- break;
- case Percentage:
- returnString = QString("Percentage");
- break;
- case Length:
- returnString = QString("Length");
- break;
- case String:
- returnString = QString("String");
- break;
- case Identifier:
- returnString = QString("Identifier");
- break;
- case KnownIdentifier:
- returnString = QString("KnownIdentifier");
- break;
- case Uri:
- returnString = QString("Uri");
- break;
- case Color:
- returnString = QString("Color");
- break;
- case Function:
- returnString = QString("Function");
- break;
- case TermOperatorSlash:
- returnString = QString("TermOperatorSlash");
- break;
- case TermOperatorComma:
- returnString = QString("TermOperatorComma");
- break;
- case Variable:
- returnString = QString("Variable");
- break;
- default:
- break;
- }
- return returnString;
- }
+ void print() const;
+#endif
- bool supportsPrinting() const {return true;}
-
- void print() const
- {
- qDebug() <<"\t \t \t"<<"==============Value::Print():Begin==================";
- qDebug() <<"\t \t \t"<< "Value::HbMemoryManager::MemoryType memoryType = " << memoryType;
- qDebug() <<"\t \t \t"<< "Value::Type type = " << what(type);
- qDebug() <<"\t \t \t"<< "Value::HbString original = " << original;
- qDebug() <<"\t \t \t"<< "Value::HbVariant variant = " << variant.toString();
- qDebug() <<"\t \t \t"<<"==============Value::Print():End====================";
- }
-#endif
// Data
HbMemoryManager::MemoryType memoryType;
Type type;
@@ -491,59 +223,22 @@
// 4. QVector<Declaration> - { prop1: value1; prop2: value2; }
// 5. Declaration - prop1: value1;
-struct HB_CORE_PRIVATE_EXPORT Declaration
+struct HB_CORE_PRIVATE_EXPORT Declaration //krazy:exclude=multiclasses
{
inline Declaration(HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory)
:memoryType(type),
property(type),
- propertyId(UnknownProperty),
+ propertyId(Property_Unknown),
values(type),
important(false)
{}
- inline bool isEmpty() const { return property.isEmpty() && propertyId == UnknownProperty; }
-
- // helper functions
- QColor colorValue(const QPalette & = QPalette()) const;
- void colorValues(QColor *c, const QPalette & = QPalette()) const;
- QBrush brushValue(const QPalette & = QPalette()) const;
- void brushValues(QBrush *c, const QPalette & = QPalette()) const;
-
- BorderStyle styleValue() const;
- void styleValues(BorderStyle *s) const;
-
- Origin originValue() const;
- Repeat repeatValue() const;
- Qt::Alignment alignmentValue() const;
- Hb::TextWrapping wrapModeValue() const;
- PositionMode positionValue() const;
- Attachment attachmentValue() const;
- int styleFeaturesValue() const;
-
- bool intValue(int *i, const char *unit = 0) const;
- bool realValue(qreal *r, const char *unit = 0) const;
-
- QSize sizeValue() const;
- QRect rectValue() const;
- QString uriValue() const;
- QIcon iconValue() const;
-
- void borderImageValue(QString *image, int *cuts, TileMode *h, TileMode *v) const;
+ inline bool isEmpty() const { return property.isEmpty() && propertyId == Property_Unknown; }
#ifdef CSS_PARSER_TRACES
- bool supportsPrinting() const {return true;}
+ void print() const;
+#endif
- void print() const
- {
- qDebug() <<"\t"<<"==============Declaration::Print():Begin==================";
- qDebug() <<"\t"<<"Declaration::HbMemoryManager::MemoryType memoryType = " << memoryType;
- qDebug() << "\t"<< "Declaration::HbString property = " << property;
- qDebug() << "\t"<< "Declaration::Property propertyId = " << propertyId;
- qDebug() << "\t"<< "Declaration::HbVector<Value> values = " ;
- values.print();
- qDebug() <<"\t"<<"==============Declaration::Print():End====================";
- }
-#endif
// Data
HbMemoryManager::MemoryType memoryType;
HbString property;
@@ -554,61 +249,17 @@
typedef QPair<int, Declaration> WeightedDeclaration;
-const quint64 PseudoClass_Unknown = Q_UINT64_C(0x0000000000000000);
-const quint64 PseudoClass_Enabled = Q_UINT64_C(0x0000000000000001);
-const quint64 PseudoClass_Disabled = Q_UINT64_C(0x0000000000000002);
-const quint64 PseudoClass_Pressed = Q_UINT64_C(0x0000000000000004);
-const quint64 PseudoClass_Focus = Q_UINT64_C(0x0000000000000008);
-const quint64 PseudoClass_Hover = Q_UINT64_C(0x0000000000000010);
-const quint64 PseudoClass_Checked = Q_UINT64_C(0x0000000000000020);
-const quint64 PseudoClass_Unchecked = Q_UINT64_C(0x0000000000000040);
-const quint64 PseudoClass_Indeterminate = Q_UINT64_C(0x0000000000000080);
-const quint64 PseudoClass_Unspecified = Q_UINT64_C(0x0000000000000100);
-const quint64 PseudoClass_Selected = Q_UINT64_C(0x0000000000000200);
-const quint64 PseudoClass_Horizontal = Q_UINT64_C(0x0000000000000400);
-const quint64 PseudoClass_Vertical = Q_UINT64_C(0x0000000000000800);
-const quint64 PseudoClass_Window = Q_UINT64_C(0x0000000000001000);
-const quint64 PseudoClass_Children = Q_UINT64_C(0x0000000000002000);
-const quint64 PseudoClass_Sibling = Q_UINT64_C(0x0000000000004000);
-const quint64 PseudoClass_Default = Q_UINT64_C(0x0000000000008000);
-const quint64 PseudoClass_First = Q_UINT64_C(0x0000000000010000);
-const quint64 PseudoClass_Last = Q_UINT64_C(0x0000000000020000);
-const quint64 PseudoClass_Middle = Q_UINT64_C(0x0000000000040000);
-const quint64 PseudoClass_OnlyOne = Q_UINT64_C(0x0000000000080000);
-const quint64 PseudoClass_PreviousSelected = Q_UINT64_C(0x0000000000100000);
-const quint64 PseudoClass_NextSelected = Q_UINT64_C(0x0000000000200000);
-const quint64 PseudoClass_Flat = Q_UINT64_C(0x0000000000400000);
-const quint64 PseudoClass_Left = Q_UINT64_C(0x0000000000800000);
-const quint64 PseudoClass_Right = Q_UINT64_C(0x0000000001000000);
-const quint64 PseudoClass_Top = Q_UINT64_C(0x0000000002000000);
-const quint64 PseudoClass_Bottom = Q_UINT64_C(0x0000000004000000);
-const quint64 PseudoClass_Exclusive = Q_UINT64_C(0x0000000008000000);
-const quint64 PseudoClass_NonExclusive = Q_UINT64_C(0x0000000010000000);
-const quint64 PseudoClass_Frameless = Q_UINT64_C(0x0000000020000000);
-const quint64 PseudoClass_ReadOnly = Q_UINT64_C(0x0000000040000000);
-const quint64 PseudoClass_Active = Q_UINT64_C(0x0000000080000000);
-const quint64 PseudoClass_Closable = Q_UINT64_C(0x0000000100000000);
-const quint64 PseudoClass_Movable = Q_UINT64_C(0x0000000200000000);
-const quint64 PseudoClass_Floatable = Q_UINT64_C(0x0000000400000000);
-const quint64 PseudoClass_Minimized = Q_UINT64_C(0x0000000800000000);
-const quint64 PseudoClass_Maximized = Q_UINT64_C(0x0000001000000000);
-const quint64 PseudoClass_On = Q_UINT64_C(0x0000002000000000);
-const quint64 PseudoClass_Off = Q_UINT64_C(0x0000004000000000);
-const quint64 PseudoClass_Editable = Q_UINT64_C(0x0000008000000000);
-const quint64 PseudoClass_Item = Q_UINT64_C(0x0000010000000000);
-const quint64 PseudoClass_Closed = Q_UINT64_C(0x0000020000000000);
-const quint64 PseudoClass_Open = Q_UINT64_C(0x0000040000000000);
-const quint64 PseudoClass_EditFocus = Q_UINT64_C(0x0000080000000000);
-const quint64 PseudoClass_Alternate = Q_UINT64_C(0x0000100000000000);
-const quint64 PseudoClass_Landscape = Q_UINT64_C(0x0000200000000000);
-const quint64 PseudoClass_Portrait = Q_UINT64_C(0x0000400000000000);
-const quint64 PseudoClass_LeftToRight = Q_UINT64_C(0x0000800000000000);
-const quint64 PseudoClass_RightToLeft = Q_UINT64_C(0x0001000000000000);
+const quint32 PseudoClass_Unknown = 0x00000000;
+const quint32 PseudoClass_Unspecified = 0x00000001;
+const quint32 PseudoClass_Landscape = 0x00000002;
+const quint32 PseudoClass_Portrait = 0x00000004;
+const quint32 PseudoClass_LeftToRight = 0x00000008;
+const quint32 PseudoClass_RightToLeft = 0x00000010;
// The Any specifier is never generated, but can be used as a wildcard in searches.
-const quint64 PseudoClass_Any = Q_UINT64_C(0x0002000000000000);
-const int NumPseudos = 50;
+const quint32 PseudoClass_Any = 0x00000020;
+const int NumPseudos = 7;
-struct HB_CORE_PRIVATE_EXPORT Pseudo
+struct HB_CORE_PRIVATE_EXPORT Pseudo //krazy:exclude=multiclasses
{
Pseudo(HbMemoryManager::MemoryType memType = HbMemoryManager::HeapMemory)
: memoryType(memType),
@@ -618,16 +269,9 @@
{ }
#ifdef CSS_PARSER_TRACES
- bool supportsPrinting() const {return true;}
- void print() const
- { qDebug() <<"==============Pseudo::Print():Begin==================";
- qDebug() << "Pseudo::HbMemoryManager::MemoryType memoryType = " << memoryType;
- qDebug() << "Pseudo::HbString name= " << name;
- qDebug() << "Pseudo::HbString function = " << function;
- qDebug() <<"==============Pseudo::Print():End==================";
-
- }
+ void print() const;
#endif
+
//Data
HbMemoryManager::MemoryType memoryType;
bool negated;
@@ -636,7 +280,7 @@
HbString function;
};
-struct HB_CORE_PRIVATE_EXPORT AttributeSelector
+struct HB_CORE_PRIVATE_EXPORT AttributeSelector //krazy:exclude=multiclasses
{
enum ValueMatchType {
NoMatch,
@@ -653,6 +297,10 @@
valueMatchCriterium(NoMatch),
negated(false)
{}
+#ifdef CSS_PARSER_TRACES
+ void print() const;
+#endif
+
HbMemoryManager::MemoryType memoryType;
HbString name;
uint nameHash;
@@ -660,21 +308,9 @@
ValueMatchType valueMatchCriterium;
bool negated;
-#ifdef CSS_PARSER_TRACES
- bool supportsPrinting() const {return true;}
-
- void print() const
- {
- qDebug() <<"==============AttributeSelector::Print():Begin==================";
- qDebug() << "AttributeSelector::HbMemoryManager::MemoryType memoryType = " << memoryType;
- qDebug() << "AttributeSelector::HbString name= " << name;
- qDebug() << "AttributeSelector::HbString value = " << value;
- qDebug() <<"==============AttributeSelector::Print():End==================";
- }
-#endif
};
-struct HB_CORE_PRIVATE_EXPORT BasicSelector
+struct HB_CORE_PRIVATE_EXPORT BasicSelector //krazy:exclude=multiclasses
{
inline BasicSelector(HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory)
: memoryType(type),
@@ -707,20 +343,9 @@
};
#ifdef CSS_PARSER_TRACES
- bool supportsPrinting() const {return true;}
- void print() const
- {
- qDebug() <<"\t \t"<<"==============BasicSelector::Print():Begin==================";
- qDebug() <<"\t \t"<<"BasicSelector::HbMemoryManager::MemoryType memoryType = " << memoryType;
- qDebug() <<"\t \t"<<"BasicSelector::HbString elementName= " << elementName;
-// qDebug() <<"\t \t"<<"BasicSelector::QStringList ids = " << ids;
- qDebug() <<"\t \t"<<"BasicSelector::PseudoVector pseudos = ";
- pseudos.print();
- qDebug() <<"\t \t"<< "BasicSelector::AttributeSelectorVector attributeSelectors = ";
- attributeSelectors.print();
- qDebug() <<"\t \t"<<"==============BasicSelector::Print():End====================";
- }
+ void print() const;
#endif
+
// Data
HbMemoryManager::MemoryType memoryType;
HbString elementName;
@@ -731,7 +356,7 @@
Relation relationToNext;
};
-struct HB_CORE_PRIVATE_EXPORT Selector
+struct HB_CORE_PRIVATE_EXPORT Selector //krazy:exclude=multiclasses
{
Selector()
: memoryType(HbMemoryManager::HeapMemory),
@@ -748,137 +373,99 @@
QString pseudoElement() const;
#ifdef CSS_PARSER_TRACES
- bool supportsPrinting() const {return true;}
+ void print() const;
+#endif
- void print() const
- {
- qDebug() <<"\t "<<"==============Selector::Print():Begin==================";
- qDebug() <<"\t "<<"Selector::HbMemoryManager::MemoryType memoryType = " << memoryType;
- qDebug() <<"\t "<<"Selector::BasicSelectorVector basicSelectors= ";
- basicSelectors.print();
- qDebug() <<"\t "<<"==============Selector::Print():End==================";
- }
-#endif
// Data
HbMemoryManager::MemoryType memoryType;
HbVector<BasicSelector> basicSelectors;
};
-enum PositionValueFlag {
- ExtractedLeft = 0x0001,
- ExtractedRight = 0x0002,
- ExtractedTop = 0x0004,
- ExtractedBottom = 0x0008,
- ExtractedOrigin = 0x0010,
- ExtractedAlign = 0x0020,
- ExtractedMode = 0x0040,
- ExtractedTextAlign = 0x0080,
- ExtractedCenterH = 0x0100,
- ExtractedCenterV = 0x0200,
- ExtractedLayoutDirection = 0x0400,
- ExtractedZValue = 0x0800,
- ExtractedWrapMode = 0x1000
-};
-Q_DECLARE_FLAGS(PositionValueFlags, PositionValueFlag)
+enum KnownPropertyFlag {
+
+ // Generic
+ ExtractedLeft = 0x00000001,
+ ExtractedRight = 0x00000002,
+ ExtractedTop = 0x00000004,
+ ExtractedBottom = 0x00000008,
+ ExtractedCenterH = 0x00000010,
+ ExtractedCenterV = 0x00000020,
+
+ ExtractedPrefW = 0x00000100,
+ ExtractedPrefH = 0x00000200,
+ ExtractedMinW = 0x00000400,
+ ExtractedMinH = 0x00000800,
+ ExtractedMaxW = 0x00001000,
+ ExtractedMaxH = 0x00002000,
+ ExtractedPolHor = 0x00004000,
+ ExtractedPolVer = 0x00008000,
-enum GeometryValueFlag {
- ExtractedPrefW = 0x0001,
- ExtractedPrefH = 0x0002,
- ExtractedMinW = 0x0004,
- ExtractedMinH = 0x0008,
- ExtractedMaxW = 0x0010,
- ExtractedMaxH = 0x0020,
- ExtractedPolHor = 0x0040,
- ExtractedPolVer = 0x0080
+ ExtractedLayoutDir = 0x00010000,
+ ExtractedZValue = 0x00020000,
+
+ // Text specific
+ ExtractedTextAlign = 0x00100000,
+ ExtractedWrapMode = 0x00200000,
+ ExtractedMinLines = 0x00400000,
+ ExtractedMaxLines = 0x00800000,
+ ExtractedFont = 0x01000000,
+ ExtractedFontSpec = 0x02000000,
+
+ // Icon specific
+ ExtractedAspectRatioMode = 0x10000000,
+
+ // Frame specific
+ ExtractedBorderWidths = 0x20000000
+
};
-Q_DECLARE_FLAGS(GeometryValueFlags, GeometryValueFlag)
+Q_DECLARE_FLAGS(KnownPropertyFlags, KnownPropertyFlag)
-enum TextValueFlag {
- ExtractedLineCountMin = 0x0001,
- ExtractedLineCountMax = 0x0002
-};
-Q_DECLARE_FLAGS(TextValueFlags, TextValueFlag)
-
-struct GeometryValues
+struct KnownProperties
{
+ qreal mLeft, mTop, mRight, mBottom, mCenterH, mCenterV, mZ;
qreal mPrefW, mPrefH, mMinW, mMinH, mMaxW, mMaxH;
QSizePolicy mSizePolicy;
- GeometryValueFlags mFlags;
-};
+
+ HbCss::LayoutDirection mLayoutDir;
+
+ Qt::Alignment mTextAlignment;
+ Hb::TextWrapping mTextWrapMode;
+ int mMinLines, mMaxLines;
-struct PositionValues
-{
- qreal mLeft, mTop, mRight, mBottom, mCenterH, mCenterV, mZ;
- Qt::Alignment mPosition;
- HbCss::Origin mOrigin;
- HbCss::PositionMode mPositionMode;
- Qt::Alignment mTextAlignment;
- HbCss::LayoutDirection mLayoutDirection;
- Hb::TextWrapping mTextWrapMode;
- PositionValueFlags mFlags;
+ QFont mFont;
+ HbFontSpec mFontSpec;
+
+ Qt::AspectRatioMode mAspectRatioMode;
+
+ qreal mBorderWidths[HbCss::NumEdges];
+
+ KnownPropertyFlags mFlags;
};
-struct TextValues
+struct HB_CORE_PRIVATE_EXPORT ValueExtractor //krazy:exclude=multiclasses
{
- int mLineCountMin;
- int mLineCountMax;
- TextValueFlags mFlags;
-};
-
-
-struct StyleRule;
-struct MediaRule;
-struct PageRule;
-struct ImportRule;
-struct VariableRule; //new added for variable support
-
-struct HB_CORE_PRIVATE_EXPORT ValueExtractor
-{
- ValueExtractor(const HbVector<Declaration> &declarations, const HbDeviceProfile &profile, const QPalette & = QPalette());
+ ValueExtractor(const HbVector<Declaration> &declarations, const HbDeviceProfile &profile);
ValueExtractor(const HbVector<Declaration> &declarations, const QHash<QString, HbCss::Declaration> &varDeclarations,
- const HbDeviceProfile &profile, const QPalette & = QPalette());
+ const HbDeviceProfile &profile);
ValueExtractor(const HbVector<Declaration> &varDeclarations, bool isVariable, const HbDeviceProfile &profile = HbDeviceProfile());
ValueExtractor(const QHash<QString, HbCss::Declaration> &varDecls, bool isVariable, const HbDeviceProfile &profile = HbDeviceProfile());
- bool extractFont(QFont *font, HbFontSpec *fontSpec, int *fontSizeAdjustment);
- bool extractValue(const QString& variableName, HbVector<HbCss::Value>& values) const;
- bool extractValue(const QString& variableName, qreal& value);
- bool extractValue( const QString &variableName, HbCss::Value &value ) const;
+ bool extractVariableValue(const QString &variableName, HbVector<HbCss::Value>& values) const;
+ bool extractVariableValue(const QString &variableName, qreal& value);
+ bool extractVariableValue(const QString &variableName, HbCss::Value &value) const;
bool extractExpressionValue(QString &expression, qreal &value);
- bool extractBackground(QBrush *, QString *, Repeat *, Qt::Alignment *, HbCss::Origin *, HbCss::Attachment *,
- HbCss::Origin *);
- bool extractGeometry(GeometryValues &geomValues);
- bool extractPosition(PositionValues &posValues);
- bool extractBox(qreal *margins, qreal *paddings, qreal *spacing = 0);
- bool extractBorder(qreal *borders, QBrush *colors, BorderStyle *Styles, QSize *radii);
- bool extractOutline(qreal *borders, QBrush *colors, BorderStyle *Styles, QSize *radii, qreal *offsets);
- bool extractPalette(QBrush *fg, QBrush *sfg, QBrush *sbg, QBrush *abg);
- int extractStyleFeatures();
- bool extractImage(QIcon *icon, Qt::Alignment *a, QSize *size);
- bool extractLayout(QString *layoutName, QString *sectionName);
- bool extractAspectRatioMode(Qt::AspectRatioMode *mode);
- bool extractParameters( const QList<QString> ¶ms, QList<QVariant> &values );
- bool extractColor( QColor *col ) const;
- bool extractTextValues( TextValues &textValues );
- bool asBool(const Declaration &decl);
- qreal asReal(const Declaration &decl);
-
- int lengthValue(const Declaration &decl);
+ bool extractKnownProperties(KnownProperties &prop);
+ bool extractCustomProperties(const QList<QString> &keys, QList<QVariant> &values);
+ bool extractLayout(QString &layoutName, QString §ionName);
+ bool extractColor(QColor &color) const;
private:
- void extractFont();
- void borderValue(const Declaration &decl, qreal *width, HbCss::BorderStyle *style, QBrush *color);
- int lengthValue(const Value& v);
- qreal asReal(const Value& v);
- qreal asReal(QString &s, Value::Type type);
- bool asReal(QString &s, qreal &value);
- void asReals(const Declaration &decl, qreal *m);
- QSizePolicy asSizePolicy(const Declaration &decl);
- QSizePolicy::Policy asPolicy(const Value& v);
- void lengthValues(const Declaration &decl, int *m);
- QSize sizeValue(const Declaration &decl);
- void sizeValues(const Declaration &decl, QSize *radii);
+
+ qreal asReal(const Declaration &decl, bool *ok = 0);
+ qreal asReal(const Value &v, bool *ok = 0);
+ qreal asReal(QString &s, Value::Type type, bool *ok = 0);
+ bool asReals(const Declaration &decl, qreal *m);
struct ExpressionValue
{
@@ -901,18 +488,13 @@
HbVector<Declaration> declarations;
HbVector<Declaration> variableDeclarations; //for variables
QHash<QString, HbCss::Declaration> variableDeclarationsHash;
- QFont f;
- HbFontSpec fSpec;
- int adjustment;
- int fontExtracted;
- QPalette pal;
HbDeviceProfile currentProfile;
QList<ExpressionValue> expressionValues; // for parsed expression string
};
struct StyleSheet;
-struct HB_CORE_PRIVATE_EXPORT StyleRule
+struct HB_CORE_PRIVATE_EXPORT StyleRule //krazy:exclude=multiclasses
{
StyleRule(HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory)
: memoryType(type),
@@ -924,19 +506,9 @@
{}
#ifdef CSS_PARSER_TRACES
- bool supportsPrinting() const {return true;}
+ void print() const;
+#endif
- void print() const
- {
- qDebug() <<"==============StyleRule::Print():Begin==================";
- qDebug() << "StyleRule::HbMemoryManager::MemoryType memoryType = " << memoryType;
- qDebug() << "StyleRule::SelectorVector selectors = ";
- selectors.print();
- qDebug() << "StyleRule::DeclarationVector declarations = ";
- declarations.print();
- qDebug() <<"==============StyleRule::Print():End==================";
- }
-#endif
// Data
HbMemoryManager::MemoryType memoryType;
HbVector<Selector> selectors;
@@ -948,7 +520,7 @@
typedef QPair<int, StyleRule> WeightedRule;
-struct HB_CORE_PRIVATE_EXPORT VariableRule
+struct HB_CORE_PRIVATE_EXPORT VariableRule //krazy:exclude=multiclasses
{
VariableRule(HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory)
: memoryType (type),
@@ -956,22 +528,15 @@
{}
#ifdef CSS_PARSER_TRACES
- bool supportsPrinting() const {return true;}
- void print() const
- {
- qDebug() <<"==============VariableRule::Print():Begin==================";
- qDebug() << "VariableRule::HbMemoryManager::MemoryType memoryType = " << memoryType;
- qDebug() << "VariableRule::DeclarationVector declarations = ";
- declarations.print();
- qDebug() <<"==============VariableRule::Print():End==================";
- }
+ void print() const;
#endif
+
// Data
HbMemoryManager::MemoryType memoryType;
HbVector<Declaration> declarations;
};
-struct HB_CORE_PRIVATE_EXPORT MediaRule
+struct HB_CORE_PRIVATE_EXPORT MediaRule //krazy:exclude=multiclasses
{
MediaRule(HbMemoryManager::MemoryType type=HbMemoryManager::HeapMemory)
: memoryType(type),
@@ -980,18 +545,9 @@
{}
#ifdef CSS_PARSER_TRACES
- bool supportsPrinting() const {return true;}
- void print() const
- {
- qDebug() <<"==============MediaRule::Print():Begin==================";
- qDebug() << "MediaRule::HbMemoryManager::MemoryType memoryType = " << memoryType;
-// qDebug() << "MediaRule::QStringList media = " << media;
- qDebug() << "MediaRule::StyleRuleVector styleRules = ";
- styleRules.print();
- qDebug() <<"==============MediaRule::Print():End==================";
-
- }
+ void print() const;
#endif
+
// data
HbMemoryManager::MemoryType memoryType;
//ToDo: Replace it with HbStringList if we have it in future
@@ -999,7 +555,7 @@
HbVector<StyleRule> styleRules;
};
-struct HB_CORE_PRIVATE_EXPORT PageRule
+struct HB_CORE_PRIVATE_EXPORT PageRule //krazy:exclude=multiclasses
{
PageRule(HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory)
: memoryType(type),
@@ -1008,25 +564,16 @@
{}
#ifdef CSS_PARSER_TRACES
- bool supportsPrinting() const {return true;}
+ void print() const;
+#endif
- void print() const
- {
- qDebug() <<"==============PageRule::Print():Begin==================";
- qDebug() << "PageRule::HbMemoryManager::MemoryType memoryType = " << memoryType;
- qDebug() << "PageRule::HbString selector = " << selector;
- qDebug() << "PageRule::DeclarationVector declarations = ";
- declarations.print();
- qDebug() <<"==============PageRule::Print():End==================";
- }
-#endif
// Data
HbMemoryManager::MemoryType memoryType;
HbString selector;
HbVector<Declaration> declarations;
};
-struct HB_CORE_PRIVATE_EXPORT ImportRule
+struct HB_CORE_PRIVATE_EXPORT ImportRule //krazy:exclude=multiclasses
{
ImportRule(HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory)
: memoryType(type),
@@ -1035,17 +582,9 @@
{}
#ifdef CSS_PARSER_TRACES
- bool supportsPrinting() const {return true;}
+ void print() const;
+#endif
- void print() const
- {
- qDebug() <<"==============ImportRule::Print():Begin==================";
- qDebug() << "ImportRule::HbMemoryManager::MemoryType memoryType = " << memoryType;
- qDebug() << "ImportRule::HbString href = " << href;
-// qDebug() << "ImportRule::QStringList media = " << media;
- qDebug() <<"==============ImportRule::Print():End==================";
- }
-#endif
// Data
HbMemoryManager::MemoryType memoryType;
HbString href;
@@ -1068,20 +607,9 @@
{
}
#ifdef CSS_PARSER_TRACES
- bool supportsPrinting() const {return true;}
+ void print() const;
+#endif
- void print() const
- {
- qDebug() <<"==============WidgetStyleRules::Print():Begin==================";
- qDebug() << "Generic rules:";
- styleRules.print();
- qDebug() << "Portrait rules:";
- portraitRules.print();
- qDebug() << "Landscape rules:";
- landscapeRules.print();
- qDebug() <<"==============WidgetStyleRules::Print():End==================";
- }
-#endif
// Data
uint classNameHash;
HbVector<StyleRule> styleRules;
@@ -1089,7 +617,7 @@
HbVector<StyleRule> landscapeRules;
};
-struct HB_AUTOTEST_EXPORT StyleSheet
+struct HB_AUTOTEST_EXPORT StyleSheet //krazy:exclude=multiclasses
{
StyleSheet(HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory)
: memoryType(type),
@@ -1129,24 +657,7 @@
}
#ifdef CSS_PARSER_TRACES
- bool supportsPrinting() const {return true;}
-
- void print() const
- {
- qDebug() <<"==============StyleSheet::Print():Begin==================";
- qDebug() << "StyleSheet::HbMemoryManager::MemoryType memoryType = " << memoryType;
- qDebug() << "StyleSheet::VariableRuleVector variableRules = ";
- variableRules.print();
- qDebug() << "StyleSheet::WidgetStyleRuleVector widgetRules = ";
- widgetRules.print();
- qDebug() << "StyleSheet::MediaRuleVector mediaRules = ";
- mediaRules.print();
- qDebug() << "StyleSheet::PageRulesVector pageRules = ";
- pageRules.print();
- qDebug() << "StyleSheet::ImportRuleVector importRules = ";
- importRules.print();
- qDebug() <<"==============StyleSheet::Print():End==================";
- }
+ void print() const;
#endif
// Utility functions
@@ -1182,7 +693,7 @@
#endif
};
-class HB_AUTOTEST_EXPORT StyleSelector
+class HB_AUTOTEST_EXPORT StyleSelector //krazy:exclude=multiclasses
{
public:
StyleSelector();
@@ -1273,7 +784,7 @@
OR
};
-struct HB_CORE_PRIVATE_EXPORT Symbol
+struct HB_CORE_PRIVATE_EXPORT Symbol //krazy:exclude=multiclasses
{
inline Symbol() : start(0), len(-1) {}
TokenType token;
@@ -1282,15 +793,14 @@
QString lexem() const;
};
-class /*Q_AUTOTEST_EXPORT*/ Scanner
+class Scanner
{
public:
static QString preprocess(const QString &input, bool *hasEscapeSequences = 0);
static void scan(const QString &preprocessedInput, QVector<Symbol> *symbols);
- static const char *tokenName(TokenType t);
};
-class HB_CORE_PRIVATE_EXPORT Parser
+class HB_CORE_PRIVATE_EXPORT Parser //krazy:exclude=multiclasses
{
public:
enum Error{
@@ -1390,6 +900,4 @@
} // namespace HbCss
-//QT_END_NAMESPACE
-
-#endif
+#endif // HBCSSPARSER_P_H
--- a/src/hbcore/cssparser/hbcssscanner_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/cssparser/hbcssscanner_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -23,14 +23,11 @@
**
****************************************************************************/
-// namespace added to avoid symbol conflicts with QT.
-namespace HbQCss {
-
// auto generated. DO NOT EDIT.
-class QCssScanner_Generated
+class HbCssScanner_Generated
{
public:
- QCssScanner_Generated(const QString &inp);
+ HbCssScanner_Generated(const QString &inp);
inline QChar next() {
return (pos < input.length()) ? input.at(pos++).toLower() : QChar();
@@ -44,7 +41,7 @@
int lexemLength;
};
-QCssScanner_Generated::QCssScanner_Generated(const QString &inp)
+HbCssScanner_Generated::HbCssScanner_Generated(const QString &inp)
{
input = inp;
pos = 0;
@@ -52,8 +49,20 @@
lexemLength = 0;
}
+int HbCssScanner_Generated::handleCommentStart()
+{
+ while (pos < input.size() - 1) {
+ if (input.at(pos) == QLatin1Char('*')
+ && input.at(pos + 1) == QLatin1Char('/')) {
+ pos += 2;
+ break;
+ }
+ ++pos;
+ }
+ return HbCss::S;
+}
-int QCssScanner_Generated::lex()
+int HbCssScanner_Generated::lex()
{
lexemStart = pos;
lexemLength = 0;
@@ -1130,6 +1139,3 @@
}
return token;
}
-
-} // namespace
-
--- a/src/hbcore/cssparser/hblayeredstyleloader_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/cssparser/hblayeredstyleloader_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -57,8 +57,8 @@
/*!
\proto
\class HbLayeredStyleLoader
- \brief allows discrete collections of stylesheet definitions to be layered using a priority system
- to enforce the sequence of stylesheet definitions
+ \brief allows discrete collections of stylesheet definitions to be layered using a priority
+ system to enforce the sequence of stylesheet definitions
HbLayeredStyleLoader allows stylesheet files to be loaded and unloaded into separate
layers, specified by a priority value. Any stylesheet definitions loaded will be then be
@@ -124,7 +124,8 @@
\param the priority of the layer to be used, selected from LayerPriority
\return the handle to be used to unload the corresponding stylesheet
*/
-int HbLayeredStyleLoader::load(const QString &fileName, LayerPriority priority, bool enableBinarySupport)
+int HbLayeredStyleLoader::load(
+ const QString &fileName, LayerPriority priority)
{
HB_START_TIME();
@@ -141,7 +142,8 @@
//if file doesn't exist no need to proceed further
if (fileExists) {
//if sharing is required based on Layer Priority, e.g. Core, Operator, Theme,
- //get the shared stylesheet from the theme client, which in turn fetches it from the server.
+ //get the shared stylesheet from the theme client, which in turn fetches it
+ // from the server.
if (sharingNeeded(priority)) {
#ifdef LAYEREDSTYLELOADER_DEBUG
@@ -160,24 +162,12 @@
//if sharing of stylesheet is not required, it means stylesheet is app specific
//so it won't be loaded from the server
styleSheet = HbMemoryUtils::create<HbCss::StyleSheet>(HbMemoryManager::HeapMemory);
- if (isBinaryFile(fileName)) {
- loadBinary (fileName, styleSheet);
- } else if (enableBinarySupport && loadBinary(getBinaryFileName(fileName), styleSheet)) {
- // if only binary support is enabled then only try to load the corresponding
- // binary file from the temp folder.
- // it will speed up the performance as we don't have to search whether file
- // exists or not.
- } else {
- HbCss::Parser parser;
- parser.init(fileName, true);
- if (parser.parse(styleSheet)) {
- if (enableBinarySupport) {
- saveBinary (getBinaryFileName(fileName), styleSheet);
- }
- } else {
- HbMemoryUtils::release<HbCss::StyleSheet>(styleSheet);
- styleSheet = 0;
- }
+
+ HbCss::Parser parser;
+ parser.init(fileName, true);
+ if (!parser.parse(styleSheet)) {
+ HbMemoryUtils::release<HbCss::StyleSheet>(styleSheet);
+ styleSheet = 0;
}
}
}
@@ -218,7 +208,8 @@
HbCss::Parser parser;
parser.init(contents, false);
- HbCss::StyleSheet* styleSheet = HbMemoryUtils::create<HbCss::StyleSheet>(HbMemoryManager::HeapMemory);
+ HbCss::StyleSheet* styleSheet =
+ HbMemoryUtils::create<HbCss::StyleSheet>(HbMemoryManager::HeapMemory);
if (parser.parse(styleSheet)) {
layer.styleSelector.addStyleSheet(styleSheet);
@@ -330,11 +321,13 @@
\note The effects will not be noticed until other related stylesheets are subsequently parsed.
- \note If this is not performed, the stylesheets will be automatically deleted on application shutdown.
+ \note If this is not performed, the stylesheets will be automatically deleted on application
+ shutdown.
\sa unload(int handle, int priority)
- \param handles handles that were returned from a call to load() or loadDir() with the same value for \a priority
+ \param handles handles that were returned from a call to load() or loadDir() with the same
+ value for \a priority
\param priority the priority of the layer from which to unload the specified stylesheets
*/
void HbLayeredStyleLoader::unload(const QVector<int> &handles, LayerPriority priority)
@@ -380,12 +373,14 @@
}
-static inline bool qcss_selectorStyleRuleLessThan(const QPair<int, HbCss::StyleRule> &lhs, const QPair<int, HbCss::StyleRule> &rhs)
+static inline bool qcss_selectorStyleRuleLessThan(
+ const QPair<int, HbCss::StyleRule> &lhs, const QPair<int, HbCss::StyleRule> &rhs)
{
return lhs.first < rhs.first;
}
-static inline bool qcss_selectorDeclarationLessThan(const QPair<int, HbCss::Declaration> &lhs, const QPair<int, HbCss::Declaration> &rhs)
+static inline bool qcss_selectorDeclarationLessThan(
+ const QPair<int, HbCss::Declaration> &lhs, const QPair<int, HbCss::Declaration> &rhs)
{
return lhs.first < rhs.first;
}
@@ -410,7 +405,8 @@
}
}
if (allStack) {
- QMap<LayerPriority, Layer>::const_iterator allIt = allStack->mStyleLayers.constFind(priority);
+ QMap<LayerPriority, Layer>::const_iterator allIt =
+ allStack->mStyleLayers.constFind(priority);
if (allIt != allStack->mStyleLayers.constEnd()) {
if (allIt->styleSelector.hasOrientationSpecificStyleRules(node)) {
return true;
@@ -428,8 +424,10 @@
\param extraPseudo a string corresponding to the subcontrol of the node
\return declarations
*/
-HbVector<HbCss::Declaration> HbLayeredStyleLoader::declarationsForNode(HbStyleSelector::NodePtr node,
- const Qt::Orientation orientation, const char *extraPseudo) const
+HbVector<HbCss::Declaration> HbLayeredStyleLoader::declarationsForNode(
+ HbStyleSelector::NodePtr node,
+ const Qt::Orientation orientation,
+ const char *extraPseudo) const
{
HbWidget* widget = (HbWidget*) node.ptr;
HbWidgetStyleLoader *loader = HbWidgetStyleLoader::instance();
@@ -443,12 +441,18 @@
LayerPriority priority = iter.next();
QMap<LayerPriority, Layer>::const_iterator it = mStyleLayers.constFind(priority);
if (it != mStyleLayers.constEnd()) {
- weightedDeclsList.append(it->styleSelector.weightedDeclarationsForNode(node, orientation, extraPseudo));
+ weightedDeclsList.append(
+ it->styleSelector.weightedDeclarationsForNode(node, orientation, extraPseudo));
}
if (allStack) {
- QMap<LayerPriority, Layer>::const_iterator allIt = allStack->mStyleLayers.constFind(priority);
+ QMap<LayerPriority, Layer>::const_iterator allIt =
+ allStack->mStyleLayers.constFind(priority);
if (allIt != allStack->mStyleLayers.constEnd()) {
- weightedDeclsList.append(allIt->styleSelector.weightedDeclarationsForNode(node, orientation, extraPseudo));
+ weightedDeclsList.append(
+ allIt->styleSelector.weightedDeclarationsForNode(
+ node,
+ orientation,
+ extraPseudo));
}
}
}
@@ -491,12 +495,15 @@
LayerPriority priority = iter.next();
QMap<LayerPriority, Layer>::const_iterator it = mStyleLayers.constFind(priority);
if (it != mStyleLayers.constEnd()) {
- weightedRulesList.append(it->styleSelector.weightedStyleRulesForNode(node, orientation));
+ weightedRulesList.append(
+ it->styleSelector.weightedStyleRulesForNode(node, orientation));
}
if (allStack) {
- QMap<LayerPriority, Layer>::const_iterator allIt = allStack->mStyleLayers.constFind(priority);
+ QMap<LayerPriority, Layer>::const_iterator allIt =
+ allStack->mStyleLayers.constFind(priority);
if (allIt != allStack->mStyleLayers.constEnd()) {
- weightedRulesList.append(allIt->styleSelector.weightedStyleRulesForNode(node, orientation));
+ weightedRulesList.append(
+ allIt->styleSelector.weightedStyleRulesForNode(node, orientation));
}
}
}
@@ -544,14 +551,16 @@
} else {
// These variables are from Core Priority
// insert it into hash to be used during look up, this happens only once
- // next time onwards instead of comparing each value from list, it's looked from this hash only.
+ // next time onwards instead of comparing each value from list, it's looked from
+ // this hash only.
if (!mDefaultVariables.count()) {
it->styleSelector.variableRuleSets(&mDefaultVariables);
}
}
}
if (allStack) {
- QMap<LayerPriority, Layer>::const_iterator allIt = allStack->mStyleLayers.constFind(priority);
+ QMap<LayerPriority, Layer>::const_iterator allIt =
+ allStack->mStyleLayers.constFind(priority);
if (allIt != allStack->mStyleLayers.constEnd()) {
allIt->styleSelector.variableRuleSets(variables);
}
@@ -564,7 +573,9 @@
\return True if it finds in default colorgroup.css, false otherwise
*/
-bool HbLayeredStyleLoader::findInDefaultVariables(const QString& variableName, HbCss::Value &val) const
+bool HbLayeredStyleLoader::findInDefaultVariables(
+ const QString& variableName,
+ HbCss::Value &val) const
{
bool found = false;
if (mDefaultVariables.contains(variableName)) {
@@ -604,360 +615,3 @@
}
}
}
-
-
-/*!
- Saves the contents of a stylesheet into a binary file.
- \note if the filepath and filename does not exists, it will be created first.
-
- \param fileName, file in which the binary data will be stored.
- \param defaultSs, stylesheet which needs to be stored as binary format.
-*/
-bool HbLayeredStyleLoader::saveBinary(const QString& fileName,
- HbCss::StyleSheet *defaultSs)
-{
- QFile file(fileName);
- QDir dir;
- bool success = false;
- int index = fileName.lastIndexOf ("/");
- QString dirPath = fileName.left(index);
-
- if (!dir.exists(dirPath)) {
- success =dir.mkpath(dirPath);
-
- }
- if (file.open(QFile::WriteOnly)) {
-
- // Create writable datastream
- QDataStream stream(&file);
-
- //write the number of variables rules
-
- int var_count =0;
- var_count = defaultSs->variableRules.count();
- stream << defaultSs->variableRules.count();
-
- if (var_count != 0) {
- //call the savedeclaration for variable rules
- for (int varRuleCount=0;varRuleCount <var_count;varRuleCount++) {
- HbVector<HbCss::Declaration> decl = defaultSs->variableRules.at(varRuleCount).declarations;
- saveDeclarations(stream,&decl);
- }
- }
-
- int widgetstack_count = defaultSs->widgetRules.count();
- stream << widgetstack_count;
- foreach (const HbCss::WidgetStyleRules &rules, defaultSs->widgetRules) {
- stream << rules.classNameHash;
- saveStyleRules(stream, &rules.styleRules);
- saveStyleRules(stream, &rules.portraitRules);
- saveStyleRules(stream, &rules.landscapeRules);
- }// Widget stack loop end
-
- file.close();
- success = true;
- }
-
- if (!success) {
- qWarning() << "Failed to save binary stylesheet file:" << fileName;
- }
-
- return success;
-}
-
-/*!
- Load the contents of a binary file into stylesheet.
-
- \param fileName, file from which the binary data will be read
- \param defaultSs, stylesheet which will be loaded.
-*/
-bool HbLayeredStyleLoader::loadBinary(const QString& fileName, HbCss::StyleSheet *sheet)
-{
- QTime timer;
- timer.start();
-#ifdef HB_CSS_INSPECTOR
- sheet->fileName = fileName;
- mCurrentSheet = sheet;
-#endif
- QFile file(fileName);
- if (file.open (QFile::ReadOnly)) {
-
- //create a qbytearray and dump the file content in it.
- QByteArray arr = file.readAll();
- QDataStream stream(arr);
-
- //getting the variable rules count
- int var_count;
- stream >> var_count;
-
- if (var_count!=0) {
- for (int varRuleCount=0; varRuleCount<var_count; varRuleCount++) {
- //create a variable rule that will be populated and appended to style sheet
- HbCss::VariableRule var_rule;
- HbVector<HbCss::Declaration> declarations = loadDeclarations(stream);
- var_rule.declarations = declarations;
- //storing the variable rules in stylesheet
- sheet->variableRules.append(var_rule);
- }
- }
-
- int widgetstacks_count;
- stream >> widgetstacks_count;
- for (int stack = 0; stack < widgetstacks_count; stack++) {
- // Create the widget stack if necessary
- uint classNameHash;
- stream >> classNameHash;
-
- HbCss::WidgetStyleRules rules(classNameHash, sheet->memoryType);
- HbCss::WidgetStyleRules* addedStack = sheet->addWidgetStack(rules);
-
- loadStyleRules(stream, addedStack->styleRules);
- loadStyleRules(stream, addedStack->portraitRules);
- loadStyleRules(stream, addedStack->landscapeRules);
- } // widget stacks loop end
- file.close();
-#ifdef LAYEREDSTYLELOADER_DEBUG
- qDebug() << "time elapsed_loadbinary_function: %d ms" << timer.elapsed();
-#endif
- return true;
-
- }
-#ifdef LAYEREDSTYLELOADER_DEBUG
- qWarning() << "Failed to load binary file:" << fileName;
-#endif
- return false;
-
-}
-
-/*!
- saveStyleRules to a datastream.
-
- \param stream, data stream which will be populated by the style rules
- \param decls, vector of style rules which needs to be serialized into datastream.
-*/
-void HbLayeredStyleLoader::saveStyleRules(QDataStream &stream, const HbVector<HbCss::StyleRule> *rules)
-{
- //writing the number of style rules
- int styleRuleCount = rules->count();
- stream << styleRuleCount;
-
- //iterating through each style rule and writing the content
- int counter=0;
- for (counter=0; counter <styleRuleCount;counter ++) {
- //style rules have selector as well as declarations.declarations code needs to be made
- //common for variable rule as well as style rules.it needs to be moved to common function.
-
- //writing the number of selectors
- int num_selectors = rules->at(counter).selectors.count();
- stream << num_selectors;
- for (int numSel =0; numSel< num_selectors; numSel++) {
- //writing the number of basic selectors
- int num_basicselector = rules->at(counter).selectors.at(numSel).basicSelectors.count();
- stream << num_basicselector;
- for (int numBasicSel =0; numBasicSel < num_basicselector; numBasicSel++) {
- //writing the basic selector vector contents
- stream << rules->at(counter).selectors.at(numSel).basicSelectors.at(numBasicSel).elementName;
- //writing the number of attributeselectors (to check if any present)
- int num_attribueselectors = rules->at(counter).selectors.at(numSel).basicSelectors.at(numBasicSel).attributeSelectors.count();
- stream << num_attribueselectors;
- if (num_attribueselectors != 0) {
- for (int numAttSel=0;numAttSel< num_attribueselectors; numAttSel++) {
- HbCss::AttributeSelector asel = rules->at(counter).selectors.at(numSel).basicSelectors.at(numBasicSel).attributeSelectors.at(numAttSel);
- stream << asel.name;
- stream << asel.value;
- stream << asel.valueMatchCriterium;
- }
- }
- }
- }
- //writing the declarations
-
- HbVector<HbCss::Declaration> stylerule_decl = rules->at(counter).declarations;
- //call the savedeclaration
- saveDeclarations(stream, &stylerule_decl);
- }//style rule loop end
-}
-
-/*!
- loadStyleRules from a datastream.
-
- \param stream, data stream from which the style rules will be read.
- \return HbVector of style rules
-*/
-void HbLayeredStyleLoader::loadStyleRules(QDataStream &stream, HbVector<HbCss::StyleRule> &rules)
-{
- //populating the style rules (selectors + declarations)
- int num_stylerules;
- stream >> num_stylerules;
-
- //iterating for each style rule and populating the selectors and declarations
- for (int counter =0; counter < num_stylerules; counter++) {
- HbCss::StyleRule style_rule;
- //getting the number of selector
- int num_selector;
- stream >> num_selector;
- for (int numSel=0; numSel <num_selector; numSel++) {
- HbCss::Selector sel;
- //getting the number of basic selector
- int num_basicSelector;
- stream >> num_basicSelector;
- for (int numBsel=0; numBsel <num_basicSelector; numBsel++) {
- HbCss::BasicSelector bsel;
- stream >> bsel.elementName;//elementname;
- //getting the number of attributeselectors
- int num_attributeselectors;
- stream >> num_attributeselectors;
- if (num_attributeselectors != 0) { //has some content
- for (int numAttSel =0;numAttSel < num_attributeselectors; numAttSel++) {
- HbCss::AttributeSelector asel;
- stream >> asel.name;
- stream >> asel.value;
- int valueMatchCriterium;
- stream >> valueMatchCriterium;
- asel.valueMatchCriterium =(HbCss::AttributeSelector::ValueMatchType)valueMatchCriterium;
- bsel.attributeSelectors.append(asel);
- }
- }
- sel.basicSelectors.append (bsel);
- }
- style_rule.selectors.append (sel);
- }
-
- //populating the declarations
- HbVector<HbCss::Declaration> declarations = loadDeclarations(stream);
- style_rule.declarations= declarations;
-#ifdef HB_CSS_INSPECTOR
- style_rule.owningStyleSheet = mCurrentSheet;
-#endif
- rules.append(style_rule);
- }// style rule loop end
-}
-
-/*!
- saveDeclarations to a datastream.
-
- \param stream, data stream which will be populated by the declarations
- \param decls, vector of declarations which needs to be serialized into datastream.
-*/
-void HbLayeredStyleLoader::saveDeclarations(QDataStream & stream,
- HbVector<HbCss::Declaration>* decls)
-{
- // number of declarations in variable rules
- int decl_count = decls->count();
- stream << decl_count;
-
- //looping through the declarations and storing the property and values for each declaration.
-
- int i=0;
- for (i=0; i<decl_count;i++) {
-
- HbCss::Declaration declaration = decls->at(i);
- //writing the property and property id
- stream << declaration.property;
- stream << declaration.propertyId;
- //writing the value count
- stream << declaration.values.count();
-
- //writing the values
- int j=0;
- for (j=0; j<declaration.values.count(); j++) {
- stream << declaration.values.at(j).variant.toString();
- stream << declaration.values.at(j).type;
- }
-
- //writing the important flag
- stream << declaration.important;
-
- }
-
-}
-
-/*!
- loadDeclarations from a datastream.
-
- \param stream, data stream from which the declarations will be read.
- \return HbVector of declarations
-*/
-HbVector<HbCss::Declaration> HbLayeredStyleLoader::loadDeclarations(QDataStream & stream)
-{
- HbVector<HbCss::Declaration> declarations;
- //getting the number of declarations
- int decl_count;
- stream >> decl_count;
-
- // read all declarations
- for (int i=0; i<decl_count; i++) {
- //construct one declaration and populate it
- HbCss::Declaration decl;
- stream >> decl.property;
- int propertyid =0;
- stream >> propertyid;
- decl.propertyId = (HbCss::Property)propertyid;
-
- //get the values count and iterate to get the multiple values
- int val_count;
- stream >> val_count;
- int j=0;
- for (j=0; j<val_count;j++) {
- HbCss::Value val;
- QString value;
- stream >> value;
- val.variant = value;
- int type;
- stream >> type;
- val.type = (HbCss::Value::Type) type;
- decl.values.append(val);
-
- }
- stream >> decl.important;
- declarations.append (decl);
- }
-
- return declarations;
-}
-
-/*!
- Checks whether a given file is binary or not.
-
- \note The version check will be added later.
-
- \param fileName, CssFile for which the binary check needs to be done
- \return true if the file is binary.
-*/
-bool HbLayeredStyleLoader::isBinaryFile(const QString& fileName)
-{
- QString extension = fileName.right(3);
- if (extension== "bin") {
- return true;
- }
- return false;
-}
-
-/*!
- Returns a binary file name corresponding to provided filename.binary file can be used
- for writing and reading the stylesheet content.
-
- \note The Timestamp comparision mechanism will be added later
-
- \param fileName, CssFile for which the binaryfilename is required
- \return BinaryFileName including the complete file syytem path.
-*/
-QString HbLayeredStyleLoader::getBinaryFileName(const QString &fileName)
-{
- static const QString tempPath = QDir::tempPath();
- QString binaryFileName = tempPath + "/";
- int hbindex ;
- hbindex = fileName.indexOf("hb", 0, Qt::CaseInsensitive);
- QString pathToAppend;
- if (hbindex == -1) {
- int nameIndex = fileName.lastIndexOf("/");
- pathToAppend = fileName.right(fileName.length()-nameIndex-1);
- } else {
- pathToAppend = fileName.right(fileName.length()-hbindex);
- }
- binaryFileName.append(pathToAppend);
- // append our binary extension
- binaryFileName.append(".bin");
-
- return binaryFileName;
-}
--- a/src/hbcore/cssparser/hblayeredstyleloader_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/cssparser/hblayeredstyleloader_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -65,7 +65,7 @@
return (layerPriority >= Priority_AppTheme && layerPriority <= Priority_Application )? false : true;
}
- int load(const QString &fileName, LayerPriority priority, bool enableBinarySupport =false);
+ int load(const QString &fileName, LayerPriority priority);
int load(QIODevice *device, LayerPriority priority);
QVector<int> loadAll(const QStringList &files, LayerPriority priority);
QVector<int> loadDir(const QString &dirPath, QDir::SortFlags sort, LayerPriority priority);
@@ -88,16 +88,6 @@
protected:
void updateLayersListIfRequired(LayerPriority priority);
QList<LayerPriority> mUsedLayers;
-
-private:
- bool loadBinary(const QString& fileName,HbCss::StyleSheet *styleSheet);
- bool saveBinary(const QString& fileName,HbCss::StyleSheet *styleSheet);
- void saveDeclarations(QDataStream & stream,HbVector<HbCss::Declaration>* decls );
- HbVector<HbCss::Declaration> loadDeclarations(QDataStream & stream );
- void saveStyleRules(QDataStream &stream, const HbVector<HbCss::StyleRule> *rules);
- void loadStyleRules(QDataStream &stream, HbVector<HbCss::StyleRule> &rules);
- bool isBinaryFile(const QString& fileName);
- QString getBinaryFileName(const QString& fileName);
private:
PriorityLayerMap mStyleLayers;
--- a/src/hbcore/cssparser/hbstyleselector_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/cssparser/hbstyleselector_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -113,7 +113,8 @@
aVal.mEmptyValue = icon.isNull();
#endif
}
- const QMetaProperty metaProperty = metaObject->property(metaObject->indexOfProperty(attr.name.toLatin1()));
+ const QMetaProperty metaProperty =
+ metaObject->property(metaObject->indexOfProperty(attr.name.toLatin1()));
if (metaProperty.isEnumType()) {
aVal.mValue2 = metaProperty.enumerator().valueToKey(value.toInt());
}
@@ -123,7 +124,8 @@
bool match(false);
if (attr.valueMatchCriterium == HbCss::AttributeSelector::MatchContains) {
- QStringList lst = aVal.mValue1.split(QLatin1Char(' ')) + aVal.mValue2.split(QLatin1Char(' '));
+ QStringList lst = aVal.mValue1.split(QLatin1Char(' ')) +
+ aVal.mValue2.split(QLatin1Char(' '));
match = lst.contains(attr.value);
} else if (attr.valueMatchCriterium == HbCss::AttributeSelector::MatchEqual) {
match = (aVal.mValue1 == attr.value || aVal.mValue2 == attr.value);
--- a/src/hbcore/cssparser/hbwidgetstyleloader_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/cssparser/hbwidgetstyleloader_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -57,8 +57,8 @@
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.
+ 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
@@ -194,7 +194,8 @@
\return whether the addition was successful
*/
/*
-bool HbWidgetStyleLoader::addFileSet(const QString &pathPattern, const HbLayeredStyleLoader::Concern concern,
+bool HbWidgetStyleLoader::addFileSet(const QString &pathPattern,
+ const HbLayeredStyleLoader::Concern concern,
const HbLayeredStyleLoader::LayerPriority priority)
{
return doAddFileSet(pathPattern, FileSetType_Pattern, concern, priority);
@@ -341,7 +342,8 @@
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 requests.
+ Failed attempts to load a file will also be cached to avoid repeated filesystem access
+ requests.
\param widget, Widget to load CSS for
*/
@@ -443,12 +445,15 @@
\sa addFileSet
- \param widget, Widget to load layout for. If successful, the widget's layout variable will be modified.
+ \param widget, Widget to load layout for. If successful, the widget's layout variable will be
+ modified.
\param layoutName, The layout name (previously extracted from CSS) to look for
- \param sectionName, The section name (previously extracted from CSS) to look for, if not defined then use the first section found
+ \param sectionName, The section name (previously extracted from CSS) to look for, if not
+ defined then use the first section found
*/
#ifndef HB_BIN_CSS
-bool HbWidgetStyleLoader::loadWidgetML(HbWidget *widget, const QString &layoutName, const QString §ionName)
+bool HbWidgetStyleLoader::loadWidgetML(
+ HbWidget *widget, const QString &layoutName, const QString §ionName)
{
if(!widget){
return false;
@@ -459,7 +464,8 @@
qDebug() << "Looking for layout" << layoutName << "in section" << sectionName;
#endif
- // Iterate backwards to ensure filesets override correctly (eg landscape delta overrides portrait)
+ // Iterate backwards to ensure filesets override correctly (eg landscape delta overrides
+ // portrait)
int c = mFileSets.count();
while(c-- && !loaded){
if ( !(mFileSets.at(c).type == FileSetType_Pattern ||
--- a/src/hbcore/cssparser/hbwidgetstyleloader_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/cssparser/hbwidgetstyleloader_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -53,7 +53,8 @@
void loadCss(const HbWidget *widget);
- bool loadWidgetML(HbWidget *widget, const QString &layoutName, const QString §ion = QString());
+ bool loadWidgetML(
+ HbWidget *widget, const QString &layoutName, const QString §ion = QString());
private:
--- a/src/hbcore/decorators/hbstatusbar.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/decorators/hbstatusbar.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -28,6 +28,7 @@
#include <hbtextitem.h>
#include <hbmainwindow.h>
#include <hbview.h>
+#include <hbextendedlocale.h>
#include "hbstatusbar_p.h"
#include "hbstatusbar_p_p.h"
@@ -38,6 +39,8 @@
#if defined(Q_OS_SYMBIAN)
#include "hbindicatorsym_p.h"
+#include <bacntf.h> // CEnvironmentChangeNotifier
+#include <coemain.h> // EActivePriorityLogonA
#else
#include "hbindicatorwin32_p.h"
#endif // defined(Q_OS_SYMBIAN)
@@ -62,12 +65,30 @@
mPreviousProperties(0),
mIndicatorPrivate(0)
{
+#if defined(Q_OS_SYMBIAN)
+ // Register for system environment changes
+ TCallBack envCallback(EnvChangeCallback, this);
+
+ mEnvChangeNotifier =
+ CEnvironmentChangeNotifier::NewL(EActivePriorityLogonA, envCallback);
+
+ mEnvChangeNotifier->Start();
+#endif
}
HbStatusBarPrivate::~HbStatusBarPrivate()
{
mIndicatorPrivate->stopListen();
delete mIndicatorPrivate;
+
+#if defined(Q_OS_SYMBIAN)
+ // Stop environment change notifications
+ if (mEnvChangeNotifier)
+ {
+ mEnvChangeNotifier->Cancel();
+ delete mEnvChangeNotifier;
+ }
+#endif
}
void HbStatusBarPrivate::delayedConstruction()
@@ -138,10 +159,10 @@
void HbStatusBarPrivate::updateTime()
{
Q_Q(HbStatusBar);
- // use QLocale to find out whether there is am/pm info
- QString timeFormat(QLocale().timeFormat(QLocale::ShortFormat));
- if(timeFormat.contains("ap", Qt::CaseInsensitive)) {
+ QString timeFormat;
+ // set the time format accordingly
+ if (HbExtendedLocale().timeStyle() == HbExtendedLocale::Time12) {
timeFormat.clear();
timeFormat.insert(0, "hh:mm ap");
} else {
@@ -157,6 +178,25 @@
q->updatePrimitives();
}
+#if defined(Q_OS_SYMBIAN)
+TInt HbStatusBarPrivate::EnvChangeCallback(TAny *aObject)
+{
+ // Return value for functions used as TCallBack objects should be EFalse
+ // unless the function is intended to be called again from a timer.
+ return static_cast<HbStatusBarPrivate*>(aObject)->DoEnvChange();
+}
+
+TInt HbStatusBarPrivate::DoEnvChange()
+{
+ const TInt changes(mEnvChangeNotifier->Change());
+ if ((changes & EChangesLocale) || (changes & EChangesSystemTime))
+ {
+ updateTime();
+ }
+ return EFalse ;
+}
+#endif
+
/*
Constructor, the statusbar.
The \a parent is an optional parameter.
--- a/src/hbcore/decorators/hbstatusbar_p_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/decorators/hbstatusbar_p_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -33,6 +33,9 @@
class HbBatteryIndicator;
class HbIndicatorGroup;
class HbIndicatorPrivate;
+#if defined(Q_OS_SYMBIAN)
+class CEnvironmentChangeNotifier; // Receive system event notifications
+#endif
class HbStatusBarPrivate : public HbWidgetPrivate
{
@@ -45,7 +48,12 @@
void delayedConstruction();
void init();
void updateTime();
-
+
+#if defined(Q_OS_SYMBIAN)
+ static TInt EnvChangeCallback(TAny *aObject);
+ TInt DoEnvChange();
+#endif
+
int mClockTimerId;
QString mTimeText;
QGraphicsItem *mTimeTextItem;
@@ -59,6 +67,11 @@
int mPreviousProperties;
HbIndicatorPrivate *mIndicatorPrivate;
+
+#if defined(Q_OS_SYMBIAN)
+ // Notifications about locale and time changes
+ CEnvironmentChangeNotifier *mEnvChangeNotifier;
+#endif
};
--- a/src/hbcore/decorators/hbtitlebar.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/decorators/hbtitlebar.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -412,7 +412,9 @@
if (mainWindow() && mainWindow()->currentView()) {
int viewFlags = mainWindow()->currentView()->viewFlags();
if (viewFlags & HbView::ViewTitleBarMinimizable) {
- d->mTitleBarHandle->setVisible(true);
+ if (d->mTitleBarHandle) {
+ d->mTitleBarHandle->setVisible(true);
+ }
d->mIndicatorButton->showHandleIndication(true);
} else {
d->mIndicatorButton->showHandleIndication(false);
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -48,7 +48,7 @@
#include "hbindicatorwin32_p.h"
#endif // Q_OS_SYMBIAN
-const char* indicatorMenu = "com.nokia.hb.indicatormenu/1.0";
+const char* indicatorMenu = "com.nokia.hb.indicatormenu/1.0";
//local symbian helper functions
#if defined(Q_OS_SYMBIAN)
@@ -84,17 +84,17 @@
{
if (event->type() == QEvent::QEvent::GraphicsSceneResize) {
HbPopup *popup = qobject_cast<HbPopup*>(obj);
- if (popup) {
+ 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
-
+
/*!
\internal
Constructor.
@@ -123,7 +123,7 @@
this, SLOT(indicatorRemoved(const IndicatorClientInfo)));
connect(mIndicatorPluginManager, SIGNAL( indicatorUpdated(const IndicatorClientInfo) ),
this, SLOT(indicatorUpdated(const IndicatorClientInfo)));
- connect(mIndicatorPluginManager, SIGNAL(indicatorUserActivated(QVariantMap)),
+ connect(mIndicatorPluginManager, 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.
@@ -162,7 +162,7 @@
void HbDeviceDialogManagerPrivate::init()
{
TRACE_ENTRY
- // Performance optimization for indicator menu.
+ // Performance optimization for indicator menu.
bool recycled(true);
int error(0);
@@ -206,6 +206,7 @@
int id = 0;
HbDeviceDialogPlugin::DeviceDialogInfo info;
+ memset(&info, 0, sizeof(info));
HbPopup *popup = 0;
HbDeviceDialogInterface *deviceDialogIf = createDeviceDialog(
parameters, info, popup);
@@ -220,6 +221,10 @@
HbDeviceDialogsContainer::Dialog &dialog = mDialogs.add(deviceDialogIf, info);
dialog.setVariable(HbDeviceDialogsContainer::Dialog::ClientTag, parameters.mClientTag);
+ if (info.flags & HbDeviceDialogPlugin::SingleInstance) {
+ // Only single instance of the dialog should be shown, save dialog type for later comparison
+ dialog.setVariable(HbDeviceDialogsContainer::Dialog::DialogType, parameters.mType);
+ }
id = dialog.id();
if (info.group == HbDeviceDialogPlugin::DeviceNotificationDialogGroup) {
@@ -456,7 +461,7 @@
newDialogs |= current->flags();
#if defined(Q_OS_SYMBIAN)
popup->installSceneEventFilter(&mMousePressCatcher);
- popup->installEventFilter(&mRegionUpdateFilter);
+ popup->installEventFilter(&mRegionUpdateFilter);
#endif //Q_OS_SYMBIAN
}
} else { // generic dialog
@@ -483,7 +488,7 @@
if (newDialogs & lightsMask) {
refreshDisplayLightsTime();
}
-
+
const HbDeviceDialogsContainer::Dialog &nonNotificationDialog =
mDialogs.next(start, showing, notificationGroup|showing);
bool dialogsShowing = showingNotification || nonNotificationDialog.isValid();
@@ -500,7 +505,7 @@
HbDeviceDialogsContainer::Dialog::NotificationGroup);
const HbDeviceDialogsContainer::Dialog::Flags showing(
HbDeviceDialogsContainer::Dialog::Showing);
-
+
const HbDeviceDialogsContainer::Dialog start;
bool showingNotification = mDialogs.next(start, notificationGroup|showing,
notificationGroup|showing).isValid();
@@ -560,6 +565,16 @@
addSecurityCredentials(parameters, credentials);
if (!plugin.accessAllowed(parameters.mType, parameters.mData, credentials)) {
parameters.mError = HbDeviceDialogAccessDeniedError;
+ mPluginManager.unloadPlugin(parameters.mType);
+ return 0;
+ }
+ }
+
+ // If dialog is single instance, launch it only if it's not shown already
+ if (deviceDialogInfo.flags & HbDeviceDialogPlugin::SingleInstance) {
+ if (isShowing(parameters.mType)) {
+ parameters.mError = HbDeviceDialogAlreadyExists;
+ mPluginManager.unloadPlugin(parameters.mType);
return 0;
}
}
@@ -570,9 +585,11 @@
HbDeviceDialogInterface *deviceDialogIf =
mPluginManager.createWidget(parameters.mType, parameters.mData, recycled,
parameters.mError);
+
// Decrease plugin reference count increased by loadPlugin() above. Unload takes place when
// device dialog widget is deleted.
mPluginManager.unloadPlugin(parameters.mType);
+
if (!deviceDialogIf){
parameters.mError = checkpluginerror(parameters.mError);
return deviceDialogIf;
@@ -922,19 +939,21 @@
// Loop over dialogs having their client (session) closed and increase their housekeeping counters
HbDeviceDialogsContainer::Dialog *current = &mDialogs.next(start, noClient, noClient);
+ const HbDeviceDialogsContainer::Dialog::Variable noClientCount =
+ HbDeviceDialogsContainer::Dialog::NoClientHousekeeping;
while(current->isValid() && (current->flags() & showing)) {
- current->setVariable(HbDeviceDialogsContainer::Dialog::NoClientHousekeeping,
- current->variable(HbDeviceDialogsContainer::Dialog::NoClientHousekeeping) + 1);
+ current->setVariable(noClientCount, current->intVariable(noClientCount) + 1);
// Find next one
current = &mDialogs.next(*current, noClient, noClient);
}
// Loop over dialogs that have been closed and increase their housekeeping counters
current = &mDialogs.next(start, closeCalled, closeCalled);
+ const HbDeviceDialogsContainer::Dialog::Variable closedCount =
+ HbDeviceDialogsContainer::Dialog::CloseHousekeeping;
while(current->isValid()) {
- current->setVariable(HbDeviceDialogsContainer::Dialog::CloseHousekeeping,
- current->variable(HbDeviceDialogsContainer::Dialog::CloseHousekeeping) + 1);
- current->setVariable(HbDeviceDialogsContainer::Dialog::NoClientHousekeeping, 0);
+ current->setVariable(closedCount, current->intVariable(closedCount) + 1);
+ current->setVariable(noClientCount, 0);
// Find next one
current = &mDialogs.next(*current, closeCalled, closeCalled);
}
@@ -942,9 +961,9 @@
// Close dialogs without a client that have passed time limit
for(;;) {
HbDeviceDialogsContainer::Dialog &dialog = mDialogs.next(start,
- HbDeviceDialogsContainer::Dialog::NoClientHousekeeping, MaxSessionlessDialogLife);
+ noClientCount, MaxSessionlessDialogLife);
if (dialog.isValid()) {
- dialog.setVariable(HbDeviceDialogsContainer::Dialog::NoClientHousekeeping, 0);
+ dialog.setVariable(noClientCount, 0);
closeDeviceDialog(dialog.id(), false);
} else {
break;
@@ -954,7 +973,7 @@
// Delete closed dialogs that haven't given deviceDialogClosed() signal within a time limit
for(;;) {
HbDeviceDialogsContainer::Dialog &dialog = mDialogs.next(start,
- HbDeviceDialogsContainer::Dialog::CloseHousekeeping, MaxDialogClosingPeriod);
+ closedCount, MaxDialogClosingPeriod);
if (dialog.isValid()) {
deleteDeviceDialog(dialog.id());
} else {
@@ -967,6 +986,29 @@
mDialogs.next(start, noClient, noClient).isValid();
}
+// Check if dialog with a type is showing (not closed yet)
+bool HbDeviceDialogManagerPrivate::isShowing(const QString &type)
+{
+ const HbDeviceDialogsContainer::Dialog start;
+
+ const HbDeviceDialogsContainer::Dialog::Flags closeCalled(
+ HbDeviceDialogsContainer::Dialog::CloseCalled);
+ const HbDeviceDialogsContainer::Dialog::Flags showing(
+ HbDeviceDialogsContainer::Dialog::Showing);
+
+ const HbDeviceDialogsContainer::Dialog::Variable dialogType =
+ HbDeviceDialogsContainer::Dialog::DialogType;
+ HbDeviceDialogsContainer::Dialog *current = &mDialogs.next(start, dialogType, type);
+ while(current->isValid()){
+ if ((current->flags() & (closeCalled|showing)) == showing) {
+ return true;
+ }
+ // Find next one
+ current = &mDialogs.next(*current, dialogType, type);
+ }
+ return false;
+}
+
// Handle timer event
void HbDeviceDialogManagerPrivate::timerEvent(QTimerEvent *event)
{
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -156,6 +156,7 @@
void startHousekeeperTimer()
{if (mHousekeeperTimerId == 0) mHousekeeperTimerId = startTimer(HousekeeperTimerPeriod);}
bool doHousekeeping();
+ bool isShowing(const QString &type);
void timerEvent(QTimerEvent *event);
void markNoClient(quintptr clientTag);
void setupWindowRegion();
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogpluginmanager.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogpluginmanager.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -466,14 +466,14 @@
// Generate plugin file name filter
QString HbDeviceDialogPluginManager::pluginFileNameFilter()
{
-#if defined(Q_OS_LINUX)
- return QString("*.so");
+#if defined(Q_OS_SYMBIAN)
+ return QString("*.qtplugin");
#elif defined(Q_OS_MAC)
return QString("*.dylib");
#elif defined(Q_OS_WIN32)
return QString("*.dll");
#else
- return QString("*.qtplugin");
+ return QString("*.so");
#endif
}
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogscontainer.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogscontainer.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -38,9 +38,6 @@
mId = InvalidId;
mPtr = 0;
mFlags = NoFlags;
- for(int i = 0; i < NumVariables; i++) {
- mVariables[i] = 0;
- }
mIndex = InvalidIndex;
#ifndef QT_NO_DEBUG
mContainer = 0;
@@ -188,7 +185,7 @@
// Get next dialog with matching variable value
HbDeviceDialogsContainer::Dialog &HbDeviceDialogsContainer::next(
- const Dialog &from, Dialog::Variable variable, quintptr value)
+ const Dialog &from, Dialog::Variable variable, const QVariant &value)
{
// With invalid from start from beginning, otherwise start from next
int i = from.isValid() ? from.mIndex + 1 : 0;
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogscontainer_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogscontainer_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -29,6 +29,7 @@
#include <QtGlobal>
#include <QObject>
#include <QList>
+#include <QVariant>
#include <hbdevicedialogplugin.h>
class HbDeviceDialogPluginManager;
@@ -59,6 +60,7 @@
ClientTag,
CloseHousekeeping,
NoClientHousekeeping,
+ DialogType,
NumVariables
};
enum {
@@ -77,8 +79,10 @@
Flags flags() const {Q_ASSERT(verify()); return mFlags;}
void setFlags(Flags flags){Q_ASSERT(verify()); mFlags |= flags;}
void resetFlags(Flags flags){Q_ASSERT(verify()); mFlags &= ~flags;}
- quintptr variable(Variable selector) const {return mVariables[selector];}
- void setVariable(Variable selector, quintptr value){mVariables[selector] = value;}
+ qulonglong intVariable(Variable selector) const {return mVariables[selector].toULongLong();}
+ 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);}
bool operator ==(const Dialog &other) const;
private:
bool verify() const;
@@ -86,15 +90,15 @@
int mId;
HbDeviceDialogInterface *mPtr;
Flags mFlags;
- quintptr mVariables[NumVariables];
+ QVariant mVariables[NumVariables];
int mIndex;
#ifndef QT_NO_DEBUG
HbDeviceDialogsContainer *mContainer; // used by verify()
#endif // QT_NO_DEBUG
friend class HbDeviceDialogsContainer;
};
+
public:
-
HbDeviceDialogsContainer(HbDeviceDialogPluginManager &pluginManager);
virtual ~HbDeviceDialogsContainer();
@@ -104,8 +108,12 @@
Dialog &find(const QObject *widget);
void remove(Dialog &dialog);
Dialog &next(const Dialog &from, Dialog::Flags flags, Dialog::Flags mask);
- Dialog &next(const Dialog &from, Dialog::Variable variable, quintptr value);
- bool isEmpty() const;
+ Dialog &next(const Dialog &from, Dialog::Variable variable, quintptr value)
+ {return next(from, variable, QVariant(static_cast<qulonglong>(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;
private:
HbDeviceDialogPluginManager &mPluginManager;
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbpluginnamecache.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbpluginnamecache.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -258,11 +258,11 @@
TRACE(dirPath)
if (!dirPath.isEmpty()) {
#ifdef MONITOR_INSTALLATION_DIRS
-#if defined(Q_OS_LINUX) || defined(Q_OS_MAC)
+#if defined(Q_OS_LINUX) && !defined(Q_OS_SYMBIAN)
const Qt::CaseSensitivity cs = Qt::CaseSensitive;
#else
const Qt::CaseSensitivity cs = Qt::CaseInsensitive;
-#endif // Q_OS_LINUX || Q_OS_MAC
+#endif // defined(Q_OS_LINUX) && !defined(Q_OS_SYMBIAN)
if (mWatcher.directories().contains(dirPath, cs)) {
mWatcher.removePath(dirPath);
#else // MONITOR_INSTALLATION_DIRS
@@ -349,11 +349,11 @@
QMutexLocker(&mThread->lock());
QHash<QString, QString>::iterator i = mCache.begin();
while (i != mCache.end()) {
-#if defined(Q_OS_LINUX) || defined(Q_OS_MAC)
+#if defined(Q_OS_LINUX) && !defined(Q_OS_SYMBIAN)
const Qt::CaseSensitivity cs = Qt::CaseSensitive;
#else
const Qt::CaseSensitivity cs = Qt::CaseInsensitive;
-#endif // Q_OS_LINUX || Q_OS_MAC
+#endif // defined(Q_OS_LINUX) && !defined(Q_OS_SYMBIAN)
if (i.value().startsWith(filePath, cs)) {
i = mCache.erase(i);
} else {
@@ -365,14 +365,14 @@
// Generate filter for plugin file names
QString HbPluginNameCache::pluginFileNameFilter()
{
-#if defined(Q_OS_LINUX)
- return QString("*.so");
+#if defined(Q_OS_SYMBIAN)
+ return QString("*.qtplugin");
#elif defined(Q_OS_MAC)
return QString("*.dylib");
#elif defined(Q_OS_WIN32)
return QString("*.dll");
#else
- return QString("*.qtplugin");
+ return QString("*.so");
#endif
}
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbsysteminfosym_p_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbsysteminfosym_p_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -168,6 +168,10 @@
void HbSystemInfoPrivate::DoCancel()
{
+ if (mListening) {
+ mInfoProperty.Cancel();
+ mListening = false;
+ }
}
void HbSystemInfoPrivate::RunL()
@@ -228,11 +232,7 @@
void HbSystemInfoPrivate::lostForeground()
{
- if (mListening) {
- mInfoProperty.Cancel();
- Cancel();
- mListening = false;
- }
+ Cancel();
}
void HbSystemInfoPrivate::gainedForeground()
--- a/src/hbcore/devicedialogbase/hbdevicedialog.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialog.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -268,6 +268,12 @@
*/
/*!
+ \var HbDeviceDialog::DeviceDialogError HbDeviceDialog::InstanceExistsError
+ A device dialog widget is a single instance and already exists (has been launched).
+ See HbDeviceDialogPlugin::SingleInstance.
+*/
+
+/*!
\var HbDeviceDialog::DeviceDialogFlags HbDeviceDialog::NoFlags
No flags specified.
*/
--- a/src/hbcore/devicedialogbase/hbdevicedialog.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialog.h Fri Jun 11 13:58:22 2010 +0300
@@ -47,7 +47,8 @@
PluginErrors = 0x10000000,
ErrorTypeMask = 0xf0000000,
CancelledError = 0x0fffffff,
- SystemCancelledError = 0x0ffffffe
+ SystemCancelledError = 0x0ffffffe,
+ InstanceExistsError = 0x0ffffffd
};
enum DeviceDialogFlag{
--- a/src/hbcore/devicedialogbase/hbdevicedialogconnecthelper.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialogconnecthelper.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -68,7 +68,7 @@
void HbDeviceDialogConnectHelperPrivate::DoCancel()
{
TRequestStatus *rs = &iStatus;
- User::RequestComplete(rs, KErrNone);
+ User::RequestComplete(rs, KErrCancel);
}
--- a/src/hbcore/devicedialogbase/hbdevicedialogerrors_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialogerrors_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -41,7 +41,9 @@
const int HbDeviceDialogConnectError = HbDeviceDialog::FrameworkErrors + 5;
// Plugin denies client access of a plugin
const int HbDeviceDialogAccessDeniedError = HbDeviceDialog::FrameworkErrors + 6;
-//unknown indicator error
-const int HbDeviceDialogUnknownIndicatorError = HbDeviceDialog::FrameworkErrors + 7;
+// Dialog is single instance and already showing
+const int HbDeviceDialogAlreadyExists = HbDeviceDialog::FrameworkErrors + 7;
+// Unknown indicator error
+const int HbDeviceDialogUnknownIndicatorError = HbDeviceDialog::FrameworkErrors + 8;
#endif // HBDEVICEDIALOGERRORS_P_H
--- a/src/hbcore/devicedialogbase/hbdevicedialogplugin.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialogplugin.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -263,7 +263,12 @@
If the flag is set, device dialog service calls accessAllowed() before creating or
attaching to a device dialog widget.
*/
-
+/*!
+ \var HbDeviceDialogPlugin::DeviceDialogFlag HbDeviceDialogPlugin::SingleInstance
+ If the flag is set, only one instance of the device dialog widget is allowed at
+ one time. Attempt to launch the widget while one exists results in an error to be
+ returned to the client.
+*/
/*!
--- a/src/hbcore/devicedialogbase/hbdevicedialogplugin.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialogplugin.h Fri Jun 11 13:58:22 2010 +0300
@@ -70,7 +70,8 @@
enum DeviceDialogFlag{
NoDeviceDialogFlags = 0x00,
SharedDeviceDialog = 0x01,
- SecurityCheck = 0x02
+ SecurityCheck = 0x02,
+ SingleInstance = 0x04
};
Q_DECLARE_FLAGS(DeviceDialogFlags, DeviceDialogFlag)
--- a/src/hbcore/devicedialogbase/hbdevicedialogsym_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialogsym_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -100,7 +100,7 @@
TRACE_ENTRY
if (!iBuffer) {
- iBuffer = HBufC8::NewL(64);
+ TRAP_IGNORE(iBuffer = HBufC8::NewL(64));
if (iBuffer) {
iDataPtr.Set(iBuffer->Des());
} else {
@@ -422,10 +422,13 @@
// Any Symbian error, close session handle. It will be reopened on next show()
if (errorCode < KErrNone) {
mHbSession.Close();
- }
- // All Symbian errors are connected to HbDeviceDialogConnectError
- if (errorCode < KErrNone) {
+ // All Symbian errors are converted to HbDeviceDialogConnectError
errorCode = HbDeviceDialogConnectError;
+ } else {
+ // Convert from internal to public error code
+ if (errorCode == HbDeviceDialogAlreadyExists) {
+ errorCode = HbDeviceDialog::InstanceExistsError;
+ }
}
}
return errorCode;
--- a/src/hbcore/devicedialogbase/hbdevicedialogsymbian.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialogsymbian.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -79,6 +79,11 @@
\var TDeviceDialogError::DeviceDialogError HbDeviceDialog::ESystemCancelledError
Operation was cancelled by device dialog framework.
*/
+/*!
+ \var TDeviceDialogError::DeviceDialogError HbDeviceDialog::EInstanceExistsError
+ A single instance device dialog widget exists already (has been launched).
+ See HbDeviceDialogPlugin::SingleInstance.
+*/
/*!
\fn void MHbDeviceDialogObserver::DataReceived(CHbSymbianVariantMap& aData)
@@ -111,21 +116,22 @@
class CHbDeviceDialogSymbianPrivate : public CActive
{
public:
- CHbDeviceDialogSymbianPrivate();
+ CHbDeviceDialogSymbianPrivate(TInt aFlags);
~CHbDeviceDialogSymbianPrivate();
- TInt Show( const QByteArray& aArray );
- TInt Update( const QByteArray& aArray );
+ TInt Initialize();
+ TInt Show(const QByteArray& aArray);
+ TInt Update(const QByteArray& aArray);
void CancelDialog();
TInt Error() const;
- void SetObserver( MHbDeviceDialogObserver* aObserver );
+ void SetObserver(MHbDeviceDialogObserver* aObserver);
// CActive
void RunL();
void DoCancel();
- TInt RunError( TInt aError );
+ TInt RunError(TInt aError);
void Start();
- TInt SymToDeviceDialogError( TInt errorCode );
+ TInt SymToDeviceDialogError(TInt errorCode);
void SetError(TInt aError);
bool CallDialogClosedObserver(TInt aCompletionCode);
bool CallDataReceivedObserver(CHbSymbianVariantMap& aData);
@@ -145,28 +151,18 @@
bool *iDeleted;
};
-CHbDeviceDialogSymbianPrivate::CHbDeviceDialogSymbianPrivate():
-CActive( EPriorityStandard ),
-iFlags(0),
-iLastError(0),
-iDeviceDialogId(0),
-iBuffer(NULL),
-iDataPtr(NULL, 0, 0),
-iRequesting(EFalse),
-iObserver(NULL)
+CHbDeviceDialogSymbianPrivate::CHbDeviceDialogSymbianPrivate(TInt aFlags):
+CActive(EPriorityStandard),
+iFlags(aFlags),
+iDataPtr(NULL, 0, 0)
{
- if (!iBuffer) {
- iBuffer = HBufC8::NewL(64);
- if (iBuffer) {
- iDataPtr.Set(iBuffer->Des());
- }
- }
+ CActiveScheduler::Add(this);
}
CHbDeviceDialogSymbianPrivate::~CHbDeviceDialogSymbianPrivate()
{
// Inform the server to finish the dialog session and not to cancel it
- if(!iObserver) {
+ if (!iObserver) {
iHbSession.SendSyncRequest(EHbSrvClientClosing);
}
@@ -185,14 +181,33 @@
}
}
-TInt CHbDeviceDialogSymbianPrivate::Show(const QByteArray& aArray )
+TInt CHbDeviceDialogSymbianPrivate::Initialize()
+{
+ if (!iBuffer) {
+ TRAP_IGNORE(iBuffer = HBufC8::NewL(64));
+ if (iBuffer) {
+ iDataPtr.Set(iBuffer->Des());
+ } else {
+ return KErrNoMemory;
+ }
+ }
+ return iHbSession.Connect();
+}
+
+TInt CHbDeviceDialogSymbianPrivate::Show(const QByteArray& aArray)
{
TInt error = iLastError = KErrNone;
+ error = SymToDeviceDialogError(Initialize());
+ if (error != HbDeviceDialogNoError){
+ SetError(error);
+ return error;
+ }
+
TPtrC8 ptr( reinterpret_cast<const TUint8*>(aArray.data()), aArray.size() );
// Synchronous call to server to show dialog.
- error = iHbSession.SendSyncRequest( EHbSrvShowDeviceDialog, ptr, &iDeviceDialogId );
- //error = SymToDeviceDialogError(error);
+ error = iHbSession.SendSyncRequest(EHbSrvShowDeviceDialog, ptr, &iDeviceDialogId);
+ error = SymToDeviceDialogError(error);
if (error == KErrNone) {
// Start listening for server updates. Device dialog update and closing is
@@ -219,14 +234,14 @@
TPtrC8 ptr( reinterpret_cast<const TUint8*>(aArray.data()), aArray.size() );
error = iHbSession.SendSyncRequest( EHbSrvUpdateDeviceDialog, ptr );
- //error = SymToDeviceDialogError(error);
+ error = SymToDeviceDialogError(error);
if (error != KErrNone) {
SetError(error);
}
}
else {
- SetError(KErrBadHandle);
- error = KErrBadHandle;
+ error = SymToDeviceDialogError(KErrBadHandle);
+ SetError(error);
}
return error;
}
@@ -240,12 +255,12 @@
void CHbDeviceDialogSymbianPrivate::CancelDialog()
{
iLastError = KErrNone;
- int error = KErrNotFound;
+ int error = SymToDeviceDialogError(KErrNotFound);
if (iRequesting) {
// Ignore other than server errors.
error = iHbSession.SendSyncRequest(EHbSrvCancelDeviceDialog, iDeviceDialogId());
- // error = SymToDeviceDialogError(error);
+ error = SymToDeviceDialogError(error);
}
if (error != KErrNone) {
SetError(error);
@@ -273,14 +288,14 @@
void CHbDeviceDialogSymbianPrivate::RunL()
{
TInt completionCode = iStatus.Int();
- //int errorCode = SymToDeviceDialogError(completionCode);
+ int errorCode = SymToDeviceDialogError(completionCode);
if (completionCode < KErrNone) {
// Any Symbian error, stop requesting, sycnhoronous requests are stopped
// in the end of the RunL
iRequesting = EFalse;
- SetError(completionCode);
- if (CallDialogClosedObserver(completionCode)) {
+ SetError(errorCode);
+ if (CallDialogClosedObserver(errorCode)) {
return; // observed deleted this object, do not touch it
}
}
@@ -299,13 +314,13 @@
iBuffer = HBufC8::NewL(updateInfo.iInfo.iDataInfo.iDataSize);
iDataPtr.Set(iBuffer->Des());
completionCode = iHbSession.SendSyncRequest(EHbSrvUpdateData, iDataPtr);
- //errorCode = SymToDeviceDialogError(completionCode);
+ errorCode = SymToDeviceDialogError(completionCode);
// data request failed
if (completionCode < KErrNone) {
iRequesting = EFalse;
- SetError(completionCode);
- if (CallDialogClosedObserver(completionCode)) {
+ SetError(errorCode);
+ if (CallDialogClosedObserver(errorCode)) {
return; // observed deleted this object, do not touch it
}
}
@@ -340,10 +355,10 @@
case EHbDeviceDialogUpdateClosed:
// Signal possible cancelled error
if (completionCode != KErrNone) {
- SetError(completionCode);
+ SetError(errorCode);
}
iRequesting = EFalse;
- if (CallDialogClosedObserver(completionCode)) {
+ if (CallDialogClosedObserver(errorCode)) {
return; // observed deleted this object, do not touch it
}
break;
@@ -373,9 +388,9 @@
\internal
RunError from CActive.
*/
-TInt CHbDeviceDialogSymbianPrivate::RunError( TInt /*aError*/ )
+TInt CHbDeviceDialogSymbianPrivate::RunError(TInt /*aError*/)
{
- SetError( KErrGeneral );
+ SetError(SymToDeviceDialogError(KErrGeneral));
return KErrNone;
}
@@ -395,16 +410,12 @@
}
// Convert symbian error code into HbDeviceDialog error code
-int CHbDeviceDialogSymbianPrivate::SymToDeviceDialogError( TInt errorCode )
+int CHbDeviceDialogSymbianPrivate::SymToDeviceDialogError(TInt errorCode)
{
if (errorCode != HbDeviceDialogNoError) {
- // Any Symbian error, close session handle. It will be reopened on next show()
- if (errorCode < KErrNone) {
- iHbSession.Close();
- }
- // All Symbian errors are connected to HbDeviceDialogConnectError
- if (errorCode < KErrNone) {
- errorCode = HbDeviceDialogConnectError;
+ // Convert from internal to public error code
+ if (errorCode == HbDeviceDialogAlreadyExists) {
+ errorCode = CHbDeviceDialogSymbian::EInstanceExistsError;
}
}
return errorCode;
@@ -442,24 +453,23 @@
}
/*!
- Constructs CHbDeviceDialogSymbian object. \a f contains construct flags. Device
- dialog service will clean all dialogs launched when the instance is deleted.
+ Constructs CHbDeviceDialogSymbian object. \a f contains construct flags.
*/
-
-EXPORT_C CHbDeviceDialogSymbian* CHbDeviceDialogSymbian::NewL( TInt aFlags )
+EXPORT_C CHbDeviceDialogSymbian* CHbDeviceDialogSymbian::NewL(TInt aFlags)
{
- CHbDeviceDialogSymbian* deviceDialog = new (ELeave) CHbDeviceDialogSymbian(aFlags);
- int error = KErrNone;
- if(deviceDialog->d) {
- error = deviceDialog->d->iHbSession.Connect();
+ CHbDeviceDialogSymbian* self = new (ELeave) CHbDeviceDialogSymbian;
+ CleanupStack::PushL(self);
+ self->d = new (ELeave) CHbDeviceDialogSymbianPrivate(aFlags);
+
+ if (aFlags & EImmediateResourceReservation) {
+ User::LeaveIfError(self->d->Initialize());
}
- if(error != KErrNone) {
- CleanupStack::PushL(deviceDialog);
- User::Leave(error);
- delete deviceDialog;
- deviceDialog = 0;
- }
- return deviceDialog;
+ CleanupStack::Pop(); // self
+ return self;
+}
+
+CHbDeviceDialogSymbian::CHbDeviceDialogSymbian()
+{
}
EXPORT_C CHbDeviceDialogSymbian::~CHbDeviceDialogSymbian()
@@ -556,13 +566,3 @@
{
d->SetObserver(aObserver);
}
-
-CHbDeviceDialogSymbian::CHbDeviceDialogSymbian(TInt aFlags) : d(NULL)
-{
- d = new CHbDeviceDialogSymbianPrivate;
- d->iFlags = aFlags;
- CActiveScheduler::Add(d);
-
- // Is needed to implement?
- //if (mDeviceDialogFlags & HbDeviceDialog::ImmediateResourceReservationFlag)
-}
--- a/src/hbcore/devicedialogbase/hbdevicedialogsymbian.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialogsymbian.h Fri Jun 11 13:58:22 2010 +0300
@@ -51,11 +51,13 @@
EPluginErrors = 0x10000000,
EErrorTypeMask = 0xf0000000,
ECancelledError = 0x0fffffff,
- ESystemCancelledError = 0x0ffffffe
+ ESystemCancelledError = 0x0ffffffe,
+ EInstanceExistsError = 0x0ffffffd
};
enum TDeviceDialogFlag{
- ENoDeviceDialogFlags = 0x0
+ ENoDeviceDialogFlags = 0x0,
+ EImmediateResourceReservation = 0x1
};
IMPORT_C static CHbDeviceDialogSymbian* NewL(TInt aFlags = ENoDeviceDialogFlags);
@@ -73,13 +75,10 @@
IMPORT_C void SetObserver(MHbDeviceDialogObserver* aObserver);
private:
-
- CHbDeviceDialogSymbian(TInt aFlags = ENoDeviceDialogFlags);
-
- void ConstructL(TInt aFlags = ENoDeviceDialogFlags);
+ CHbDeviceDialogSymbian();
CHbDeviceDialogSymbianPrivate* d;
- };
+};
#endif // defined(__SYMBIAN32__) || defined(SYMBIAN) || defined(HB_DOXYGEN)
--- a/src/hbcore/devicedialogbase/hbdevicedialogwin32_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialogwin32_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -190,6 +190,10 @@
// Set error
void HbDeviceDialogPrivate::setError(int error)
{
+ // Convert from internal to public error code
+ if (error == HbDeviceDialogAlreadyExists) {
+ error = HbDeviceDialog::InstanceExistsError;
+ }
mLastError = error;
emit q_func()->error(error);
}
--- a/src/hbcore/devicedialogbase/hbindicatorsym_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbindicatorsym_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -60,7 +60,10 @@
}
void DoCancel()
{
- // No Cancel() available for RSessionBase::Connect()
+ // No Cancel() available for RSessionBase::Connect()
+ // Nevertheless we must do something to prevent deadlocking.
+ TRequestStatus *rs = &iStatus;
+ User::RequestComplete(rs, KErrCancel);
}
private:
HbIndicatorPrivate *iIndicator;
@@ -327,6 +330,8 @@
void HbIndicatorPrivate::DoCancel()
{
TRACE_ENTRY
+ TRequestStatus *rs = &iStatus;
+ User::RequestComplete(rs, KErrCancel);
TRACE_EXIT
}
--- a/src/hbcore/effects/hbeffect.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffect.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -74,7 +74,7 @@
if (!result) {
result = key1.mEffectEvent.compare(key2.mEffectEvent);
}
- return result<0;
+ return result < 0;
}
static void fixEffectGroupOrder(QList<HbEffectGroup *> *groupList)
@@ -95,7 +95,7 @@
}
}
- if (last - movedCount > 0 ) {
+ if (last - movedCount > 0) {
for (int i = last - movedCount; i >= 0; --i) {
HbEffectGroup *group = groupList->at(i);
// If the group has a scale effect, move it second last before groups that had translate effects
@@ -124,7 +124,7 @@
}
HbEffectPrivate::~HbEffectPrivate()
-{
+{
privateDestroyed = true;
mDisabledItems.clear();
}
@@ -135,61 +135,60 @@
if (!mViewChangeConnected) {
mViewChangeConnected = true;
QList<HbMainWindow *> windowList = hbInstance->allMainWindows();
- foreach (const HbMainWindow *window, windowList) {
- connect(window, SIGNAL(currentViewChanged(HbView*)), SLOT(handleViewChanged(HbView*)));
+ foreach(const HbMainWindow * window, windowList) {
+ connect(window, SIGNAL(currentViewChanged(HbView *)), SLOT(handleViewChanged(HbView *)));
}
// Need a notification when a mainwindow is added in the future.
- connect(HbInstancePrivate::d_ptr(), SIGNAL(windowAdded(HbMainWindow*)), SLOT(handleWindowAdded(HbMainWindow*)));
+ connect(HbInstancePrivate::d_ptr(), SIGNAL(windowAdded(HbMainWindow *)), SLOT(handleWindowAdded(HbMainWindow *)));
}
}
void HbEffectPrivate::handleWindowAdded(HbMainWindow *window)
{
- connect(window, SIGNAL(currentViewChanged(HbView*)), SLOT(handleViewChanged(HbView*)));
+ connect(window, SIGNAL(currentViewChanged(HbView *)), SLOT(handleViewChanged(HbView *)));
}
void HbEffectPrivate::handleViewChanged(HbView *view)
{
- // Observers may be notified during cancellations which may result in starting a new
+ // Observers may be notified during cancellations which may result in starting a new
// effect during which groups may be deleted and removed from
// mEventEffectList. Therefore we cannot directly iterate on mEventEffectList.
QList<HbEffectGroup *> groupsToBeHandled;
- foreach (HbEffectGroup *group, d.mEventEffectList) {
+ foreach(HbEffectGroup * group, d.mEventEffectList) {
groupsToBeHandled.append(group);
}
- foreach (HbEffectGroup *group, groupsToBeHandled) {
- // Check if the real list still contains the group. If not then it may have been
- // deleted and removed meanwhile so do nothing.
- if (d.mEventEffectList.values().contains(group)) {
- if (group->isRunning()) {
- // Looping effect
- if (group->isLooping()) {
- if (group->view() == view) {
- group->resume(); // Effect's view activated, resume effect
- } else {
- group->pause(); // Effect's view deactivated, pause effect
- }
- } else { // Non-looping effect
- if (group->view() != view) { // Effect's view deactivated, cancel the effect
- group->cancelAll(true);
-
- // remove group from eventEffectsList
- QMap<EffectMapKey, HbEffectGroup *>::iterator e = d.mEventEffectList.begin();
- while (e != d.mEventEffectList.end()) {
- if (e.value() == group) { // found, erase from event effect list
- d.mEventEffectList.erase(e);
- delete group; // once removed from list, delete group
- e = d.mEventEffectList.end();
- }
- else
- e++; // try next one
- }
+ foreach(HbEffectGroup * group, groupsToBeHandled) {
+ // Check if the real list still contains the group. If not then it may have been
+ // deleted and removed meanwhile so do nothing.
+ if (d.mEventEffectList.values().contains(group)) {
+ if (group->isRunning()) {
+ // Looping effect
+ if (group->isLooping()) {
+ if (group->view() == view) {
+ group->resume(); // Effect's view activated, resume effect
+ } else {
+ group->pause(); // Effect's view deactivated, pause effect
+ }
+ } else { // Non-looping effect
+ if (group->view() != view) { // Effect's view deactivated, cancel the effect
+ group->cancelAll(true);
+ // remove group from eventEffectsList
+ QMap<EffectMapKey, HbEffectGroup *>::iterator e = d.mEventEffectList.begin();
+ while (e != d.mEventEffectList.end()) {
+ if (e.value() == group) { // found, erase from event effect list
+ d.mEventEffectList.erase(e);
+ delete group; // once removed from list, delete group
+ e = d.mEventEffectList.end();
+ } else {
+ e++; // try next one
+ }
+ }
+ }
}
}
}
- }
-}
+ }
}
@@ -208,7 +207,7 @@
// Need information of receiver destroyed because this class gets
// the notifications asynchronously so it must not invoke the
// receiver if it has been destroyed meanwhile.
- connect(mReceiver, SIGNAL(destroyed()), this, SLOT(receiverDestroyed()));
+ connect(mReceiver, SIGNAL(destroyed()), this, SLOT(receiverDestroyed()));
}
void HbAnimatedItemGroup::finished(const HbEffect::EffectStatus &status)
@@ -345,8 +344,7 @@
#else
// This API cannot be used to add HB library's effect definitions.
// There is internal API in class HbEffectInternal for that.
- if (itemType.startsWith(HB_EFFECT_ITEM_PREFIX))
- {
+ if (itemType.startsWith(HB_EFFECT_ITEM_PREFIX)) {
return false;
}
return HbEffectInternal::add(itemType, filePath, effectEvent);
@@ -383,9 +381,10 @@
Q_UNUSED(effectEvent);
return false;
#else
- foreach (const QString &type, itemType) {
- if (type.startsWith(HB_EFFECT_ITEM_PREFIX))
+ foreach(const QString & type, itemType) {
+ if (type.startsWith(HB_EFFECT_ITEM_PREFIX)) {
return false;
+ }
}
return HbEffectInternal::add(itemType, filePath, effectEvent);
#endif // HB_EFFECT_API_OFF
@@ -467,8 +466,7 @@
#else
// This API cannot be used to remove HB library's effect definitions.
// There is internal API in class HbEffectInternal for that.
- if (itemType.startsWith(HB_EFFECT_ITEM_PREFIX))
- {
+ if (itemType.startsWith(HB_EFFECT_ITEM_PREFIX)) {
return false;
}
HbEffectInternal::remove(itemType, filePath, effectEvent);
@@ -522,7 +520,7 @@
#endif //HB_EFFECT_API_OFF
}
-/*! \brief This function is used to start an effect on a graphics item.
+/*! \brief This function is used to start an effect on a graphics item.
The effect definition is taken from the FXML file registered for the graphics
item with matching itemType and effectEvent.
@@ -570,17 +568,17 @@
Example to get notification of effect completion.
\code
- // Create a public slot in a the widget class if you want to get effect-finished
- // notification. In normal scenario, the widget itself can be receiver. But it is possible
+ // Create a public slot in a the widget class if you want to get effect-finished
+ // notification. In normal scenario, the widget itself can be receiver. But it is possible
// to use any QObject as receiver.
class MyHbWidget : public HbWidget
{
Q_OBJECT
public slots:
void effectFinished(const HbEffect::EffectStatus &status);
- // Other stuffs
+ // Other stuffs
};
-
+
void MyObserver::effectFinished(const HbEffect::EffectStatus &status)
{
// Effect is finished. Do something.
@@ -591,19 +589,19 @@
{
// myFunction related other stuff
// calling startefect
- HbEffect::start(myGraphicsItem,
+ HbEffect::start(myGraphicsItem,
"myItemType",
"myEvent",
this,
"effectFinished");
-
+
// myFunction related other stuff
}
\endcode
\sa cancel()
*/
-bool HbEffect::start(QGraphicsItem *item,
- const QString &itemType,
+bool HbEffect::start(QGraphicsItem *item,
+ const QString &itemType,
const QString &effectEvent,
QObject *receiver,
const char *member,
@@ -656,7 +654,7 @@
The function returns \c false if some invalid parameter is passed, or if the
effect was disabled using disable().
*/
-bool HbEffect::start(QGraphicsItem *item,
+bool HbEffect::start(QGraphicsItem *item,
const QString &effectEvent,
QObject *receiver,
const char *member,
@@ -673,7 +671,7 @@
return false;
#else
return HbEffect::start(
- item, HB_EFFECT_INTERNAL_ITEM, effectEvent, receiver, member, userData, extRect);
+ item, HB_EFFECT_INTERNAL_ITEM, effectEvent, receiver, member, userData, extRect);
#endif //HB_EFFECT_API_OFF
}
@@ -719,8 +717,8 @@
effect was disabled using disable().
*/
bool HbEffect::start(
- const QList<QGraphicsItem *> &items,
- const QString &itemType,
+ const QList<QGraphicsItem *> &items,
+ const QString &itemType,
const QString &effectEvent,
QObject *receiver,
const char *member,
@@ -728,7 +726,7 @@
{
#ifdef HB_EFFECT_API_OFF
Q_UNUSED(items);
- Q_UNUSED(itemType);
+ Q_UNUSED(itemType);
Q_UNUSED(effectEvent);
Q_UNUSED(receiver);
Q_UNUSED(member);
@@ -759,7 +757,7 @@
groupMember = "finished";
}
- foreach (QGraphicsItem *item, items) {
+ foreach(QGraphicsItem * item, items) {
if (HbEffect::start(item, itemType, effectEvent, groupReceiver, groupMember, userData)) {
// If at least one item succeeded to start, set return value to true
ret = true;
@@ -791,8 +789,8 @@
// Return true if the given item is running any effect
if (effectEvent.isEmpty()) {
for (QMap<EffectMapKey, HbEffectGroup *>::const_iterator e = d.mEventEffectList.constBegin();
- e != d.mEventEffectList.constEnd();
- ++e ) {
+ e != d.mEventEffectList.constEnd();
+ ++e) {
HbEffectGroup *group = *e;
if (group->registrationItem() == item && group->isRunning()) {
ret = true;
@@ -803,10 +801,10 @@
// effectEvent was specified, check if effect matching that is running
EffectMapKey key(item, effectEvent);
QMap<EffectMapKey, HbEffectGroup *>::const_iterator e = d.mEventEffectList.find(key);
-
+
// Effect found in the list?
- if(e != d.mEventEffectList.constEnd()) {
- HbEffectGroup* group = *e;
+ if (e != d.mEventEffectList.constEnd()) {
+ HbEffectGroup *group = *e;
ret = group->isRunning();
}
}
@@ -858,7 +856,7 @@
Q_UNUSED(sendCallback);
Q_UNUSED(itemIsValid);
return false;
-#else
+#else
if (privateDestroyed) {
return false;
}
@@ -869,9 +867,10 @@
// Stop all the effects running on item at that point of time.
// (iterator way had some problem and caused crash so using foreach)
QList<HbEffectGroup *> groupsToBeCanceled;
- foreach (const EffectMapKey &key, d.mEventEffectList.keys()) {
+ QList<EffectMapKey> keys = d.mEventEffectList.keys();
+ foreach(const EffectMapKey & key, keys) {
if (key.mItem == item) {
- HbEffectGroup* group = d.mEventEffectList.take(key);
+ HbEffectGroup *group = d.mEventEffectList.take(key);
groupsToBeCanceled.append(group);
}
}
@@ -883,7 +882,7 @@
fixEffectGroupOrder(&groupsToBeCanceled);
bool first = true;
- foreach (HbEffectGroup *group, groupsToBeCanceled) {
+ foreach(HbEffectGroup * group, groupsToBeCanceled) {
// If clearEffect is false then it is important to pass a default transform
// first so the matrix multiplication in cancelAll ends up correct.
group->cancelAll(sendCallback, itemIsValid, clearEffect, first || !itemIsValid ? QTransform() : item->transform());
@@ -897,7 +896,7 @@
return ret;
} else {
EffectMapKey key(item, effectEvent);
- HbEffectGroup* group = d.mEventEffectList.take(key);
+ HbEffectGroup *group = d.mEventEffectList.take(key);
if (group) {
group->cancelAll(sendCallback, itemIsValid, clearEffect);
delete group;
@@ -915,7 +914,7 @@
The function takes following parameters:
\param item pointer to QGraphicsItem for which the effect will be enabled.
-
+
\sa disable()
*/
void HbEffect::enable(QGraphicsItem *item)
@@ -930,19 +929,19 @@
/*! This function can be used to disable an effect for a graphicsitem. This is
useful in cases where you have a component which usually shows an effect but
you want to skip the effect for your object.
-
+
You can enable the effect using enable(), and you should always call enable()
once you do not need the object to be disabled, at latest when you're deleting
your animated graphicsitem. This should be done to clean up the list of
disabled items. Note that if the animated item is an HbWidget, then the
enable() call happens automatically at the HbWidget destructor.
-
+
Unlike remove()-methods, this won't touch the effect definition at all. The
effect is just skipped when trying to start the effect. Note also that
start()-method returns false if the effect is disabled.
\param item pointer to QGraphicsItem for which the effect will be disabled
-
+
\sa enable()
\sa start()
*/
@@ -960,11 +959,11 @@
/*!
\internal
*/
-HbGVWrapperItem::HbGVWrapperItem():mMainWindow(0)
+HbGVWrapperItem::HbGVWrapperItem(): mMainWindow(0)
{
}
-void HbGVWrapperItem::setMainWindow(HbMainWindow& mainWindow)
+void HbGVWrapperItem::setMainWindow(HbMainWindow &mainWindow)
{
mMainWindow = &mainWindow;
}
@@ -978,12 +977,12 @@
{
QRectF bRect;
// viewportitem is used as a boundingrect since viewport item gets resized when changing orientation
- if( mMainWindow ) {
+ if (mMainWindow) {
bRect = mMainWindow->layoutRect();
}
return bRect;
}
-void HbGVWrapperItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+void HbGVWrapperItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
{
Q_UNUSED(painter);
Q_UNUSED(option);
@@ -1007,10 +1006,9 @@
// Mark all effects using the given item type dirty,
// so that they get re-created when the effect is shown next time
for (QMap<EffectMapKey, HbEffectGroup *>::iterator e = d.mEventEffectList.begin();
- e != d.mEventEffectList.end();
- ++e ) {
+ e != d.mEventEffectList.end();
+ ++e) {
HbEffectGroup *group = *e;
-
if (group->itemType() == itemType) {
group->setDirty(true);
}
@@ -1075,10 +1073,9 @@
// Mark all effects using the given item type dirty,
// so that they get re-created when the effect is shown next time
for (QMap<EffectMapKey, HbEffectGroup *>::iterator e = d.mEventEffectList.begin();
- e != d.mEventEffectList.end();
- ++e ) {
+ e != d.mEventEffectList.end();
+ ++e) {
HbEffectGroup *group = *e;
-
if (group->registrationItem() == item) {
group->setDirty(true);
}
@@ -1134,12 +1131,13 @@
#else
// FXML
// If extension is not given then try both with and without .fxml
- if (!filePath.endsWith(".fxml")) {
- d.mController.removeFXML(itemType, filePath + ".fxml", effectEvent);
+ if (!filePath.endsWith(QLatin1String(".fxml"))) {
+ d.mController.removeFXML(itemType, filePath + QLatin1String(".fxml"), effectEvent);
}
d.mController.removeFXML(itemType, filePath, effectEvent);
// Clean up mEventEffectList.
- foreach (const EffectMapKey &key, d.mEventEffectList.keys()) {
+ QList<EffectMapKey> keys = d.mEventEffectList.keys();
+ foreach(const EffectMapKey & key, keys) {
if (key.mEffectEvent == effectEvent) {
HbEffectGroup *group = d.mEventEffectList.value(key);
group->setDirty(true); // so the next start() will try to recreate the effect instead of re-using it
@@ -1160,12 +1158,13 @@
#else
// FXML
// If extension is not given then try both with and without .fxml
- if (!filePath.endsWith(".fxml")) {
- d.mController.removeFXML(item, filePath + ".fxml", effectEvent);
+ if (!filePath.endsWith(QLatin1String(".fxml"))) {
+ d.mController.removeFXML(item, filePath + QLatin1String(".fxml"), effectEvent);
}
d.mController.removeFXML(item, filePath, effectEvent);
// Clean up mEventEffectList.
- foreach (const EffectMapKey &key, d.mEventEffectList.keys()) {
+ QList<EffectMapKey> keys = d.mEventEffectList.keys();
+ foreach(const EffectMapKey & key, keys) {
if (key.mItem == item && key.mEffectEvent == effectEvent) {
HbEffectGroup *group = d.mEventEffectList.value(key);
group->setDirty(true);
@@ -1186,7 +1185,8 @@
d.mDisabledItems.removeOne(item); // clean the disabled list as well
d.mController.removeFXML(item);
// Clean up mEventEffectList.
- foreach (const EffectMapKey &key, d.mEventEffectList.keys()) {
+ QList<EffectMapKey> keys = d.mEventEffectList.keys();
+ foreach(const EffectMapKey & key, keys) {
if (key.mItem == item) {
HbEffectGroup *group = d.mEventEffectList.value(key);
group->setDirty(true);
@@ -1204,22 +1204,21 @@
// data.
//parsedDataList.clear();
QList<HbEffectInfo> newDataList;
- for (int i=0; i < parsedDataList.count(); i++) {
+ for (int i = 0; i < parsedDataList.count(); i++) {
if (parsedDataList[i].fromTheme()) {
newDataList.append(parsedDataList[i]);
parsedDataList.removeAt(i);
i--;
}
}
- for (int i=0; i < newDataList.count(); i++) {
- HbEffectInfo effectData = newDataList.at(i);
+ for (int i = 0; i < newDataList.count(); i++) {
+ HbEffectInfo effectData = newDataList.at(i);
bool ret = false;
QString relativename = QFileInfo(effectData.xmlFileFullPath()).baseName();
if (effectData.item() != 0) {
ret = d.mController.addFXML(effectData.item(), relativename,
effectData.effectEvent(), true);
- }
- else if (!effectData.componentType().isEmpty()) {
+ } else if (!effectData.componentType().isEmpty()) {
ret = d.mController.addFXML(effectData.componentType(), relativename,
effectData.effectEvent(), true);
}
@@ -1227,8 +1226,8 @@
// Mark all effects using the given item type dirty,
// so that they get re-created when the effect is shown next time
for (QMap<EffectMapKey, HbEffectGroup *>::iterator e = d.mEventEffectList.begin();
- e != d.mEventEffectList.end();
- ++e ) {
+ e != d.mEventEffectList.end();
+ ++e) {
HbEffectGroup *group = *e;
if (group->registrationItem() == effectData.item()) {
group->setDirty(true);
@@ -1244,16 +1243,16 @@
This is used for example when changing orientation; all but the orientation change effects
are cancelled.
*/
-void HbEffectInternal::cancelAll(const QList<QGraphicsItem*> *exceptionList, bool ignoreLooping)
+void HbEffectInternal::cancelAll(const QList<QGraphicsItem *> *exceptionList, bool ignoreLooping)
{
// Observers may be notified during cancelations which may result in starting a new
// effect during which groups may be deleted and removed from
// mEventEffectList. Therefore we cannot directly iterate on mEventEffectList.
QList<HbEffectGroup *> groupsToBeCanceled;
- foreach (HbEffectGroup *group, d.mEventEffectList) {
+ foreach(HbEffectGroup * group, d.mEventEffectList) {
groupsToBeCanceled.append(group);
}
- foreach (HbEffectGroup *group, groupsToBeCanceled) {
+ foreach(HbEffectGroup * group, groupsToBeCanceled) {
// Check if the real list still contains the group. If not then it may have been
// deleted and removed meanwhile so do nothing.
if (d.mEventEffectList.values().contains(group)) {
@@ -1276,10 +1275,10 @@
void HbEffectInternal::safeCancelAll(bool clear)
{
QList<HbEffectGroup *> groupsToBeCanceled;
- foreach (HbEffectGroup *group, d.mEventEffectList) {
+ foreach(HbEffectGroup * group, d.mEventEffectList) {
groupsToBeCanceled.append(group);
}
- foreach (HbEffectGroup *group, groupsToBeCanceled) {
+ foreach(HbEffectGroup * group, groupsToBeCanceled) {
if (d.mEventEffectList.values().contains(group)) {
group->cancelAll(false, false, clear);
}
@@ -1297,13 +1296,21 @@
*/
void HbEffectInternal::stopEffects()
{
- // Pause looping effects and stop others
- foreach (HbEffectGroup *group, d.mEventEffectList) {
- if (group->isRunning()) {
- if (group->isLooping()) {
- group->pause();
- } else {
- group->cancelAll(true);
+ // Pause looping effects and stop others. As usual, we cannot just
+ // simply iterate through the list as cancelAll() may change the
+ // elements in mEventEffectList.
+ QList<HbEffectGroup *> groupsToBeChecked;
+ foreach(HbEffectGroup * group, d.mEventEffectList) {
+ groupsToBeChecked.append(group);
+ }
+ foreach(HbEffectGroup * group, groupsToBeChecked) {
+ if (d.mEventEffectList.values().contains(group)) {
+ if (group->isRunning()) {
+ if (group->isLooping()) {
+ group->pause();
+ } else {
+ group->cancelAll(true);
+ }
}
}
}
@@ -1321,7 +1328,7 @@
void HbEffectInternal::resumeEffects()
{
// Resume any looping effects that were paused with stopEffects call.
- foreach (HbEffectGroup *group, d.mEventEffectList) {
+ foreach(HbEffectGroup * group, d.mEventEffectList) {
if (group->isRunning() && group->isLooping()) {
group->resume();
}
@@ -1373,7 +1380,7 @@
bool HbEffectInternal::start(QGraphicsItem *registrationItem,
QGraphicsItem *targetItem,
EffectFlags flags,
- const QString &itemType,
+ const QString &itemType,
const QString &effectEvent,
QObject *receiver,
const char *member,
@@ -1462,13 +1469,13 @@
QMap<EffectMapKey, HbEffectGroup *>::iterator e = d.mEventEffectList.find(key);
// Same effect found in the list?
- if(e != d.mEventEffectList.end()) {
+ if (e != d.mEventEffectList.end()) {
HbEffectGroup *group = e.value();
if (!group->dirty()) {
// if the effect group is not dirty, restart it. Cancel possible earlier
// effect first so that end position gets correct.
group->cancelAll(true);
-
+
// Update with given notification parameters
updateGroup(group, receiver, member, userData, extRect, flags);
--- a/src/hbcore/effects/hbeffect.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffect.h Fri Jun 11 13:58:22 2010 +0300
@@ -48,27 +48,27 @@
QVariant userData;
};
- static bool start(QGraphicsItem *item,
- const QString &itemType,
- const QString &effectEvent,
- QObject *receiver = 0,
- const char *member = 0,
- const QVariant &userData = QVariant(),
- const QRectF &extRect = QRectF());
+ static bool start(QGraphicsItem *item,
+ const QString &itemType,
+ const QString &effectEvent,
+ QObject *receiver = 0,
+ const char *member = 0,
+ const QVariant &userData = QVariant(),
+ const QRectF &extRect = QRectF());
- static bool start(QGraphicsItem *item,
- const QString &effectEvent,
- QObject *receiver = 0,
- const char *member = 0,
- const QVariant &userData = QVariant(),
- const QRectF &extRect = QRectF());
+ static bool start(QGraphicsItem *item,
+ const QString &effectEvent,
+ QObject *receiver = 0,
+ const char *member = 0,
+ const QVariant &userData = QVariant(),
+ const QRectF &extRect = QRectF());
- static bool start(const QList<QGraphicsItem *> &items,
- const QString &itemType,
- const QString &effectEvent,
- QObject *receiver = 0,
- const char *member = 0,
- const QVariant &userData = QVariant());
+ static bool start(const QList<QGraphicsItem *> &items,
+ const QString &itemType,
+ const QString &effectEvent,
+ QObject *receiver = 0,
+ const char *member = 0,
+ const QVariant &userData = QVariant());
static bool effectRunning(QGraphicsItem *item, const QString &effectEvent = QString());
@@ -84,7 +84,7 @@
static bool add(QGraphicsItem *item, const QString &filePath, const QString &effectEvent = QString());
static bool add(QGraphicsItem *item, const QStringList &filePath, const QStringList &effectEvent = QStringList());
-
+
static bool remove(const QString &itemType, const QString &filePath, const QString &effectEvent = QString());
static bool remove(QGraphicsItem *item, const QString &filePath, const QString &effectEvent = QString());
static bool remove(QGraphicsItem *item);
@@ -96,6 +96,6 @@
HbEffect();
};
-Q_DECLARE_METATYPE( HbEffect::EffectStatus )
+Q_DECLARE_METATYPE(HbEffect::EffectStatus)
#endif // HBEFFECT_H
--- a/src/hbcore/effects/hbeffect_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffect_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -85,7 +85,7 @@
QMap<EffectMapKey, HbEffectGroup *> mEventEffectList;
bool mEnabled;
- QList<QGraphicsItem*> mDisabledItems;
+ QList<QGraphicsItem *> mDisabledItems;
bool mViewChangeConnected;
bool mEffectsEnabled;
};
--- a/src/hbcore/effects/hbeffectanimation.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectanimation.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -23,8 +23,8 @@
**
****************************************************************************/
-#include <hbglobal.h>
#include "hbeffectanimation_p.h"
+#include "hbglobal.h"
#include "hbeffectgroup_p.h"
#include "hbeffectdef_p.h"
#include "hbeffectfxmldata_p.h"
@@ -85,7 +85,7 @@
if (current > mLoopEnd) {
int newCurrentTime = mLoopStart + current - mLoopEnd;
-
+
// If the calculated new current time is again beyond the loop end,
// change it to the loop end to avoid infinite recursion.
if (newCurrentTime > mLoopEnd) {
@@ -109,13 +109,13 @@
if (looping()) {
int current = currentTime();
int newCurrentTime = mLoopStart + current - mLoopEnd;
-
+
// If the calculated new current time is again beyond the loop end,
// change it to the loop end to avoid infinite recursion.
if (newCurrentTime > mLoopEnd) {
newCurrentTime = mLoopEnd;
}
-
+
// Temporarily prevent the animation from reacting to update request,
// because start() causes update with time=0 and the loop might start from a later point of time.
mInactive = true;
--- a/src/hbcore/effects/hbeffectanimation_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectanimation_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -49,7 +49,9 @@
private:
void updateCurrentValue(const QVariant &value);
- inline bool looping() const { return mLoopEnd > 0; }
+ inline bool looping() const {
+ return mLoopEnd > 0;
+ }
private slots:
void handleFinished();
--- a/src/hbcore/effects/hbeffectbc.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectbc.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -25,7 +25,7 @@
#include <hbglobal.h>
#ifdef HB_FILTER_EFFECTS
-#include "hbeffectbc_p.h"
+#include "hbeffectbc_p.h" //krazy:exclude=includes
#include "hbeffectgroup_p.h"
#include "hbeffectdef_p.h"
#include "hbvgchainedeffect_p.h"
@@ -42,11 +42,11 @@
const HbEffectFxmlFilterData &data,
QGraphicsItem *item,
HbEffectGroup *group) :
- HbEffectFilter(0, item, group),
- mAnimationO(0),
- mAnimationB(0),
- mAnimationC(0),
- mVgBc(0)
+ HbEffectFilter(0, item, group),
+ mAnimationO(0),
+ mAnimationB(0),
+ mAnimationC(0),
+ mVgBc(0)
{
// Default values of if something is not passed in FXML
qreal opacity_start = 1;
@@ -59,14 +59,12 @@
QList<HbEffectFxmlParamData> params = data.paramData();
// Handle FXML parameters
- Q_FOREACH(const HbEffectFxmlParamData ¶m, params) {
+ Q_FOREACH(const HbEffectFxmlParamData & param, params) {
if (param.name() == FXML_KEYWORD_BRIGHTNESS_CONTRAST_OPACITY) {
mAnimationO = createAnimation(param, opacity_start, opacity_end, group);
- }
- else if (param.name() == FXML_KEYWORD_BRIGHTNESS_CONTRAST_BRIGHTNESS) {
+ } else if (param.name() == FXML_KEYWORD_BRIGHTNESS_CONTRAST_BRIGHTNESS) {
mAnimationB = createAnimation(param, brightness_start, brightness_end, group);
- }
- else if (param.name() == FXML_KEYWORD_BRIGHTNESS_CONTRAST_CONTRAST) {
+ } else if (param.name() == FXML_KEYWORD_BRIGHTNESS_CONTRAST_CONTRAST) {
mAnimationC = createAnimation(param, contrast_start, contrast_end, group);
}
}
@@ -75,10 +73,10 @@
if (mEffectDefined) {
// Add effect to the filter effect chain in the effect group
HbVgChainedEffect *chain = HbEffectAbstract::group()->vgEffect();
-
+
mVgBc = new HbVgBcEffect();
mVgBc->setCaching(true);
-
+
chain->add(mVgBc);
// Set initial values for the effect
--- a/src/hbcore/effects/hbeffectblur.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectblur.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -25,7 +25,7 @@
#include <hbglobal.h>
#ifdef HB_FILTER_EFFECTS
-#include "hbeffectblur_p.h"
+#include "hbeffectblur_p.h" //krazy:exclude=includes
#include "hbeffectgroup_p.h"
#include "hbeffectdef_p.h"
#include "hbvgchainedeffect_p.h"
@@ -43,12 +43,12 @@
const HbEffectFxmlFilterData &data,
QGraphicsItem *item,
HbEffectGroup *group) :
- HbEffectFilter(0, item, group),
- mAnimationO(0),
- mAnimationX(0),
- mAnimationY(0),
- mVgBlur(0),
- mType(Blur)
+ HbEffectFilter(0, item, group),
+ mAnimationO(0),
+ mAnimationX(0),
+ mAnimationY(0),
+ mVgBlur(0),
+ mType(Blur)
{
// If it is a glow filter, change effect type
if (data.type() == HB_EFFECT_NAME_GLOW) {
@@ -66,14 +66,12 @@
QList<HbEffectFxmlParamData> params = data.paramData();
// Handle FXML parameters
- Q_FOREACH(const HbEffectFxmlParamData ¶m, params) {
+ Q_FOREACH(const HbEffectFxmlParamData & param, params) {
if (param.name() == FXML_KEYWORD_BLUR_OPACITY) {
mAnimationO = createAnimation(param, opacity_start, opacity_end, group);
- }
- else if (param.name() == FXML_KEYWORD_BLUR_ORIGIN_X) {
+ } else if (param.name() == FXML_KEYWORD_BLUR_ORIGIN_X) {
mAnimationX = createAnimation(param, blur_x_start, blur_x_end, group);
- }
- else if (param.name() == FXML_KEYWORD_BLUR_ORIGIN_Y) {
+ } else if (param.name() == FXML_KEYWORD_BLUR_ORIGIN_Y) {
mAnimationY = createAnimation(param, blur_y_start, blur_y_end, group);
}
}
@@ -87,11 +85,10 @@
if (mEffectDefined) {
// Add blur effect to the filter effect chain in the effect group
HbVgChainedEffect *chain = HbEffectAbstract::group()->vgEffect();
-
+
if (mType == Blur) {
mVgBlur = new HbVgBlurEffect();
- }
- else {
+ } else {
mVgBlur = new HbVgGlowEffect();
}
mVgBlur->setCaching(true);
--- a/src/hbcore/effects/hbeffectblur_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectblur_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -48,8 +48,7 @@
class HB_AUTOTEST_EXPORT HbEffectBlur : public HbEffectFilter
{
public:
- enum Type
- {
+ enum Type {
Blur = 0x01,
Glow = 0x02
};
--- a/src/hbcore/effects/hbeffectcolorize.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectcolorize.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -25,7 +25,7 @@
#include <hbglobal.h>
#ifdef HB_FILTER_EFFECTS
-#include "hbeffectcolorize_p.h"
+#include "hbeffectcolorize_p.h" //krazy:exclude=includes
#include "hbeffectgroup_p.h"
#include "hbeffectdef_p.h"
#include "hbvgchainedeffect_p.h"
@@ -42,10 +42,10 @@
const HbEffectFxmlFilterData &data,
QGraphicsItem *item,
HbEffectGroup *group) :
- HbEffectFilter(0, item, group),
- mAnimationO(0),
- mAnimationC(0),
- mVgColorize(0)
+ HbEffectFilter(0, item, group),
+ mAnimationO(0),
+ mAnimationC(0),
+ mVgColorize(0)
{
// Default values of if something is not passed in FXML
qreal opacity_start = 1;
@@ -57,11 +57,10 @@
QList<HbEffectFxmlParamData> params = data.paramData();
// Handle FXML parameters
- Q_FOREACH(const HbEffectFxmlParamData ¶m, params) {
+ Q_FOREACH(const HbEffectFxmlParamData & param, params) {
if (param.name() == FXML_KEYWORD_COLORIZE_OPACITY) {
mAnimationO = createAnimation(param, opacity_start, opacity_end, group);
- }
- else if (param.name() == FXML_KEYWORD_COLORIZE_COLOR) {
+ } else if (param.name() == FXML_KEYWORD_COLORIZE_COLOR) {
mAnimationC = createAnimation(param, color_start, color_end, group);
}
}
@@ -70,7 +69,7 @@
if (mEffectDefined) {
// Add blur effect to the filter effect chain in the effect group
HbVgChainedEffect *chain = HbEffectAbstract::group()->vgEffect();
-
+
mVgColorize = new HbVgColorizeEffect();
mVgColorize->setCaching(true);
chain->add(mVgColorize);
@@ -98,7 +97,7 @@
mVgColorize->setOpacity(qVariantValue<qreal>(mAnimationO->currentValue()));
}
if (mAnimationC) {
- mVgColorize->setColor(qVariantValue<QColor>(mAnimationC->currentValue()));
+ mVgColorize->setColor(qVariantValue<QColor>(mAnimationC->currentValue()));
}
}
}
--- a/src/hbcore/effects/hbeffectcontroller.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectcontroller.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -40,10 +40,10 @@
/*
\class HbEffectController hbeffectcontroller.h
- \brief HbEffectController is used to read and store effects data.
+ \brief HbEffectController is used to read and store effects data.
*/
-/*
+/*
Constructs a HbEffectController.
*/
HbEffectController::HbEffectController()
@@ -53,7 +53,7 @@
{
}
-/*
+/*
Destructor.
*/
HbEffectController::~HbEffectController()
@@ -65,7 +65,7 @@
const QString &componentType,
QGraphicsItem *component,
const QString &effectEvent,
- bool shared ) const
+ bool shared) const
{
Q_UNUSED(shared); // not yet needed since we have a list of added items in local process
int componentTypeMatchIndex = -1;
@@ -75,15 +75,14 @@
const HbEffectInfo &info = mEffectEntries.at(i);
// If found a definition matching the graphics item, return that.
if (info.item() // not null
- && info.item() == component // matches the component
- && info.inUse() // the effect is in use (not removed)
- && info.effectEvent() == effectEvent) // matches the event
- {
+ && info.item() == component // matches the component
+ && info.inUse() // the effect is in use (not removed)
+ && info.effectEvent() == effectEvent) { // matches the event
// sharing support - if it's shared get the FxML data from server and return the object
// with parsed FxML data
- if( info.shared() ) {
+ if (info.shared()) {
HbEffectFxmlData *dataFromSrv = HbThemeClient::global()->getSharedEffect(info.mDefFileFullPath);
- if(dataFromSrv) {
+ if (dataFromSrv) {
return *dataFromSrv;
}
} else {
@@ -100,10 +99,10 @@
}
if (componentTypeMatchIndex >= 0) {
const HbEffectInfo &info = mEffectEntries.at(componentTypeMatchIndex);
- if ( info.shared() ) {
+ if (info.shared()) {
HbEffectFxmlData *dataFromSrv =
HbThemeClient::global()->getSharedEffect(info.mDefFileFullPath);
- if(dataFromSrv) {
+ if (dataFromSrv) {
return *dataFromSrv;
}
} else {
@@ -131,9 +130,8 @@
for (int i = mEffectEntries.count() - 1; i >= 0; i--) {
const HbEffectInfo &info = mEffectEntries[i];
if (info.componentType() == componentType &&
- info.xmlFileFullPath() == fullPath &&
- info.effectEvent() == effectEvent)
- {
+ info.xmlFileFullPath() == fullPath &&
+ info.effectEvent() == effectEvent) {
// Remove the definition for the given component type
mEffectEntries.removeAt(i);
}
@@ -146,9 +144,8 @@
for (int i = mEffectEntries.count() - 1; i >= 0; i--) {
const HbEffectInfo &info = mEffectEntries[i];
if (info.item() == item &&
- info.xmlFileFullPath() == fullPath &&
- info.effectEvent() == effectEvent)
- {
+ info.xmlFileFullPath() == fullPath &&
+ info.effectEvent() == effectEvent) {
// Remove the definition for the given item
mEffectEntries.removeAt(i);
}
@@ -184,7 +181,7 @@
QString HbEffectController::expandFileName(const QString &fn, bool *fromTheme, bool *shared)
{
// Sharing not supported if the file is in Qt resource.
- if (fn.startsWith(":/") && shared && *shared) {
+ if (fn.startsWith(QLatin1String(":/")) && shared && *shared) {
*shared = false;
return fn;
} else {
@@ -202,7 +199,7 @@
shared = mShared;
}
// If client is not connected due to any reason, any kind of sharing is not possible
- if ( !HbThemeClient::global()->clientConnected() ) {
+ if (!HbThemeClient::global()->clientConnected()) {
shared = mShared = mSharingSet = false;
}
bool fromTheme = false;
@@ -215,9 +212,8 @@
HbEffectInfo &info = mEffectEntries[i];
if ((item && info.item() == item)
- || (!componentType.isEmpty() && info.componentType() == componentType))
- {
- if (info.effectEvent() == effectEvent) {
+ || (!componentType.isEmpty() && info.componentType() == componentType)) {
+ if (info.effectEvent() == effectEvent) {
if (info.xmlFileFullPath() == filePath) {
// parsed already, just set in use
info.mInUse = true;
@@ -233,7 +229,7 @@
}
}
- if ( shared ) {
+ if (shared) {
if (!HbThemeClient::global()->addSharedEffect(filePath)) {
// Themeserver failed, try to parse locally.
shared = false;
--- a/src/hbcore/effects/hbeffectcontroller_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectcontroller_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -67,7 +67,7 @@
private:
QList<HbEffectInfo> mEffectEntries;
- HbEffectXmlParser* mParser;
+ HbEffectXmlParser *mParser;
bool mShared;
bool mSharingSet;
};
--- a/src/hbcore/effects/hbeffectdropshadow.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectdropshadow.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -27,7 +27,7 @@
#include "hbeffectgroup_p.h"
#include "hbeffectdef_p.h"
-#include "hbeffectdropshadow_p.h"
+#include "hbeffectdropshadow_p.h" //krazy:exclude=includes
#include "hbeffectfilter_p.h"
#include "hbvgchainedeffect_p.h"
#include "hbvgshadoweffect_p.h"
@@ -43,16 +43,16 @@
const HbEffectFxmlFilterData &data,
QGraphicsItem *item,
HbEffectGroup *group) :
- HbEffectFilter(0, item, group),
- mAnimationO(0),
- mAnimationS(0),
- mAnimationOutlineX(0),
- mAnimationOutlineY(0),
- mAnimationOffsetX(0),
- mAnimationOffsetY(0),
- mAnimationC(0),
- mVgOutline(0),
- mType(HbEffectDropShadow::outline)
+ HbEffectFilter(0, item, group),
+ mAnimationO(0),
+ mAnimationS(0),
+ mAnimationOutlineX(0),
+ mAnimationOutlineY(0),
+ mAnimationOffsetX(0),
+ mAnimationOffsetY(0),
+ mAnimationC(0),
+ mVgOutline(0),
+ mType(HbEffectDropShadow::outline)
{
// Default values from FXML spec
qreal opacity_start = 1;
@@ -77,30 +77,24 @@
QList<HbEffectFxmlParamData> params = data.paramData();
// Handle FXML parameters
- Q_FOREACH(const HbEffectFxmlParamData ¶m, params) {
+ Q_FOREACH(const HbEffectFxmlParamData & param, params) {
if (param.name() == FXML_KEYWORD_DROP_SHADOW_OPACITY) {
mAnimationO = createAnimation(param, opacity_start, opacity_end, group);
- }
- else if (param.name() == FXML_KEYWORD_DROP_SHADOW_COLOR) {
+ } else if (param.name() == FXML_KEYWORD_DROP_SHADOW_COLOR) {
mAnimationC = createAnimation(param, color_start, color_end, group);
- }
- else if (param.name() == FXML_KEYWORD_DROP_SHADOW_OFFSET_X) {
+ } else if (param.name() == FXML_KEYWORD_DROP_SHADOW_OFFSET_X) {
mAnimationOffsetX = createAnimation(param, offset_x_start, offset_x_end, group);
// If offset parameters are used, it is a drop shadow effect.
mType = dropShadow;
- }
- else if (param.name() == FXML_KEYWORD_DROP_SHADOW_OFFSET_Y) {
+ } else if (param.name() == FXML_KEYWORD_DROP_SHADOW_OFFSET_Y) {
mAnimationOffsetY = createAnimation(param, offset_y_start, offset_y_end, group);
// If offset parameters are used, it is a drop shadow effect.
mType = dropShadow;
- }
- else if (param.name() == FXML_KEYWORD_DROP_SHADOW_STEEPNESS) {
+ } else if (param.name() == FXML_KEYWORD_DROP_SHADOW_STEEPNESS) {
mAnimationS = createAnimation(param, steepness_start, steepness_end, group);
- }
- else if (param.name() == FXML_KEYWORD_DROP_SHADOW_OUTLINE_X) {
+ } else if (param.name() == FXML_KEYWORD_DROP_SHADOW_OUTLINE_X) {
mAnimationOutlineX = createAnimation(param, outline_x_start, outline_x_end, group);
- }
- else if (param.name() == FXML_KEYWORD_DROP_SHADOW_OUTLINE_Y) {
+ } else if (param.name() == FXML_KEYWORD_DROP_SHADOW_OUTLINE_Y) {
mAnimationOutlineY = createAnimation(param, outline_y_start, outline_y_end, group);
}
}
@@ -109,7 +103,7 @@
if (mEffectDefined) {
// Add effect to the filter effect chain in the effect group
HbVgChainedEffect *chain = HbEffectAbstract::group()->vgEffect();
-
+
if (mType == dropShadow) {
mVgOutline = new HbVgShadowEffect();
} else {
@@ -165,10 +159,10 @@
mVgOutline->setSteepness(qVariantValue<qreal>(mAnimationS->currentValue()));
}
if (mAnimationC) {
- mVgOutline->setColor(qVariantValue<QColor>(mAnimationC->currentValue()));
+ mVgOutline->setColor(qVariantValue<QColor>(mAnimationC->currentValue()));
}
if (mAnimationO) {
- mVgOutline->setOpacity(qVariantValue<qreal>(mAnimationO->currentValue()));
+ mVgOutline->setOpacity(qVariantValue<qreal>(mAnimationO->currentValue()));
}
}
}
--- a/src/hbcore/effects/hbeffectdropshadow_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectdropshadow_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -54,8 +54,7 @@
{
public:
- enum type
- {
+ enum type {
dropShadow = 0x01,
outline = 0x02
};
--- a/src/hbcore/effects/hbeffectfactory.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectfactory.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -43,7 +43,7 @@
inline bool isScaleParameter(const QString ¶m)
{
- return
+ return
param == FXML_KEYWORD_SCALE_X ||
param == FXML_KEYWORD_SCALE_Y;
}
@@ -68,8 +68,8 @@
inline bool isTranslateParameter(const QString ¶m)
{
return
- param == FXML_KEYWORD_TRANSLATION_X ||
- param == FXML_KEYWORD_TRANSLATION_Y;
+ param == FXML_KEYWORD_TRANSLATION_X ||
+ param == FXML_KEYWORD_TRANSLATION_Y;
}
@@ -105,7 +105,7 @@
// Try to get FXML definition
const HbEffectFxmlData &fxmlData = mController.fetchFxmlData(
- itemType, registrationItem, effectEventType);
+ itemType, registrationItem, effectEventType);
if (!fxmlData.isNull()) {
QList<HbEffectFxmlParamData> params = fxmlData.paramData();
@@ -132,7 +132,7 @@
// This creates HbEffectAbstract instances from the definitions.
// The whole list of parameters is passed to the effect
// constructor, which skips parameters that it does not understand.
- Q_FOREACH(const HbEffectFxmlParamData ¶m, params) {
+ Q_FOREACH(const HbEffectFxmlParamData & param, params) {
QString paramName = param.name();
HbEffectAbstract *effect = 0;
@@ -166,12 +166,12 @@
// Handle filter definitions similarly
QList<HbEffectFxmlFilterData> filters = fxmlData.filterData();
- Q_FOREACH(const HbEffectFxmlFilterData &filter, filters) {
+ Q_FOREACH(const HbEffectFxmlFilterData & filter, filters) {
HbEffectAbstract *effect = 0;
QString type = filter.type();
if (!(effectsCreated & blurBit) &&
- (type == HB_EFFECT_NAME_BLUR || type == HB_EFFECT_NAME_GLOW)) {
+ (type == HB_EFFECT_NAME_BLUR || type == HB_EFFECT_NAME_GLOW)) {
// Create a blur effect
effect = new HbEffectBlur(filter, targetItem, group);
effectsCreated |= blurBit;
@@ -187,7 +187,7 @@
effectsCreated |= colorizeBit;
}
if (!(effectsCreated & dropShadowBit) &&
- (type == HB_EFFECT_NAME_DROP_SHADOW || type == HB_EFFECT_NAME_OUTLINE)) {
+ (type == HB_EFFECT_NAME_DROP_SHADOW || type == HB_EFFECT_NAME_OUTLINE)) {
// Create a drop shadow effect
effect = new HbEffectDropShadow(filter, targetItem, group);
effectsCreated |= dropShadowBit;
--- a/src/hbcore/effects/hbeffectfilter.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectfilter.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -25,7 +25,7 @@
#include <hbglobal.h>
#ifdef HB_FILTER_EFFECTS
-#include "hbeffectfilter_p.h"
+#include "hbeffectfilter_p.h" //krazy:exclude=includes
#include "hbeffectgroup_p.h"
#include "hbeffectdef_p.h"
#include "hbeffectutils_p.h"
@@ -34,10 +34,10 @@
#include <QtDebug>
HbEffectFilterAnimation::HbEffectFilterAnimation(HbEffectFilter *effect,
- int duration,
- HbEffectGroup *group)
+ int duration,
+ HbEffectGroup *group)
: HbEffectAnimation(group),
- mEffect(effect)
+ mEffect(effect)
{
setDuration(duration);
}
@@ -64,7 +64,7 @@
: HbEffectFilterAnimation(effect, duration, group)
{
}
-
+
HbEffectColorAnimation::~HbEffectColorAnimation()
{
}
@@ -78,19 +78,19 @@
int fromValue = fromColor.red();
int toValue = toColor.red();
- ret.setRed(fromValue + (int)(mCurve.valueForProgress(progress) * (toValue - fromValue)));
+ ret.setRed(fromValue + (int)(mCurve.valueForProgress(progress) *(toValue - fromValue)));
fromValue = fromColor.green();
toValue = toColor.green();
- ret.setGreen(fromValue + (int)(mCurve.valueForProgress(progress) * (toValue - fromValue)));
+ ret.setGreen(fromValue + (int)(mCurve.valueForProgress(progress) *(toValue - fromValue)));
fromValue = fromColor.blue();
toValue = toColor.blue();
- ret.setBlue(fromValue + (int)(mCurve.valueForProgress(progress) * (toValue - fromValue)));
+ ret.setBlue(fromValue + (int)(mCurve.valueForProgress(progress) *(toValue - fromValue)));
fromValue = fromColor.alpha();
toValue = toColor.alpha();
- ret.setAlpha(fromValue + (int)(mCurve.valueForProgress(progress) * (toValue - fromValue)));
+ ret.setAlpha(fromValue + (int)(mCurve.valueForProgress(progress) *(toValue - fromValue)));
return ret;
}
@@ -101,14 +101,14 @@
HbEffectFilter::HbEffectFilter(int /*startTime*/, QGraphicsItem *item, HbEffectGroup *group)
: HbEffectAbstract(0, item, group),
- mEffectDefined(false),
- mCanceled(false)
+ mEffectDefined(false),
+ mCanceled(false)
{
}
HbEffectFilter::~HbEffectFilter()
{
- Q_FOREACH(HbEffectFilterAnimation *anim, mAnimations) {
+ Q_FOREACH(HbEffectFilterAnimation * anim, mAnimations) {
anim->stop();
delete anim;
}
@@ -132,7 +132,7 @@
}
if (mAnimations.count()) {
- Q_FOREACH(HbEffectFilterAnimation *anim, mAnimations) {
+ Q_FOREACH(HbEffectFilterAnimation * anim, mAnimations) {
anim->stop(); // rewind the animation before starting again
anim->setCurrentTime(0);
anim->mFinished = false;
@@ -155,7 +155,7 @@
mCanceled = true;
// Put animations in their end state to reach the end state of the effect.
- Q_FOREACH(HbEffectFilterAnimation *anim, mAnimations) {
+ Q_FOREACH(HbEffectFilterAnimation * anim, mAnimations) {
anim->stop();
anim->setCurrentTime(anim->duration());
anim->mFinished = true;
@@ -174,7 +174,7 @@
void HbEffectFilter::pause()
{
- Q_FOREACH(HbEffectFilterAnimation *anim, mAnimations) {
+ Q_FOREACH(HbEffectFilterAnimation * anim, mAnimations) {
if (anim->state() == QAbstractAnimation::Running) {
anim->pause();
}
@@ -183,7 +183,7 @@
void HbEffectFilter::resume()
{
- Q_FOREACH(HbEffectFilterAnimation *anim, mAnimations) {
+ Q_FOREACH(HbEffectFilterAnimation * anim, mAnimations) {
if (anim->state() == QAbstractAnimation::Paused) {
anim->resume();
}
@@ -219,13 +219,12 @@
anim = new HbEffectFilterAnimation(this, duration, group);
mAnimations.append(anim);
// Go through keyframes
- foreach(const HbKeyFrame &kf, keyFrameList) {
- if (HbEffectUtils::fuzzyIsNull(kf.pos)) {
- startValue = kf.val;
- }
- else if (HbEffectUtils::fuzzyIsOneOrGreater(kf.pos)) {
- endValue = kf.val;
- }
+ foreach(const HbKeyFrame & kf, keyFrameList) {
+ if (HbEffectUtils::fuzzyIsNull(kf.pos)) {
+ startValue = kf.val;
+ } else if (HbEffectUtils::fuzzyIsOneOrGreater(kf.pos)) {
+ endValue = kf.val;
+ }
// Set keyframe in animation
else {
anim->setKeyValueAt(kf.pos, QVariant(kf.val));
@@ -277,13 +276,12 @@
anim = new HbEffectColorAnimation(this, duration, group);
mAnimations.append(anim);
// Go through keyframes
- foreach(const HbKeyFrame &kf, keyFrameList) {
- if (HbEffectUtils::fuzzyIsNull(kf.pos)) {
+ foreach(const HbKeyFrame & kf, keyFrameList) {
+ if (HbEffectUtils::fuzzyIsNull(kf.pos)) {
startValue.setNamedColor(kf.stringValue);
- }
- else if (HbEffectUtils::fuzzyIsOneOrGreater(kf.pos)) {
- endValue.setNamedColor(kf.stringValue);
- }
+ } else if (HbEffectUtils::fuzzyIsOneOrGreater(kf.pos)) {
+ endValue.setNamedColor(kf.stringValue);
+ }
// Set keyframe in animation
else {
QColor c(kf.stringValue);
@@ -307,7 +305,7 @@
{
bool allFinished = true;
- Q_FOREACH(HbEffectFilterAnimation *anim, mAnimations) {
+ Q_FOREACH(HbEffectFilterAnimation * anim, mAnimations) {
if (!anim->mFinished) {
allFinished = false;
}
@@ -318,7 +316,7 @@
if (allFinished && !mCanceled) {
// Make sure animations are in their end value to reach the end state of the effect.
// Sometimes QVariantAnimation does not update the animation with its end value before sending finished signal.
- Q_FOREACH(HbEffectFilterAnimation *anim, mAnimations) {
+ Q_FOREACH(HbEffectFilterAnimation * anim, mAnimations) {
anim->stop();
anim->setCurrentTime(anim->duration());
}
--- a/src/hbcore/effects/hbeffectfxmldata.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectfxmldata.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -104,7 +104,7 @@
// Make a regular QList. Note that some of the underlying structures may
// still stay in shared memory.
QList<HbEffectFxmlParamData> paramDataList;
- foreach (const HbEffectFxmlParamData &data, mFxmlParams) {
+ foreach(const HbEffectFxmlParamData & data, mFxmlParams) {
paramDataList.append(data);
}
return paramDataList;
@@ -159,9 +159,10 @@
QString HbEffectFxmlParamData::getAttribute(const QString &attrName) const
{
- foreach (const HbEffectFxmlAttrListEntry &a, mAttributes) {
- if (a.mKey == attrName)
+ foreach(const HbEffectFxmlAttrListEntry & a, mAttributes) {
+ if (a.mKey == attrName) {
return a.mValue;
+ }
}
return QString();
}
@@ -209,7 +210,7 @@
// Make a regular QList. Note that some of the underlying structures may
// still stay in shared memory.
QList<HbKeyFrame> keyFrameList;
- foreach (const HbKeyFrame &keyFrame, mKeyFrames) {
+ foreach(const HbKeyFrame & keyFrame, mKeyFrames) {
keyFrameList.append(keyFrame);
}
return keyFrameList;
@@ -225,7 +226,7 @@
return mStartRef;
}
-void HbEffectFxmlParamData::setStartRef(const QString& value)
+void HbEffectFxmlParamData::setStartRef(const QString &value)
{
mStartRef = value;
}
@@ -235,7 +236,7 @@
return mEndRef;
}
-void HbEffectFxmlParamData::setEndRef(const QString& value)
+void HbEffectFxmlParamData::setEndRef(const QString &value)
{
mEndRef = value;
}
@@ -301,7 +302,7 @@
// Make a regular QList. Note that some of the underlying structures may
// still stay in shared memory.
QList<HbEffectFxmlParamData> paramDataList;
- foreach (const HbEffectFxmlParamData &data, mFxmlParams) {
+ foreach(const HbEffectFxmlParamData & data, mFxmlParams) {
paramDataList.append(data);
}
return paramDataList;
@@ -317,7 +318,7 @@
// Make a regular QList. Note that some of the underlying structures may
// still stay in shared memory.
QList<HbEffectFxmlFilterData> paramDataList;
- foreach (const HbEffectFxmlFilterData &data, mFilters) {
+ foreach(const HbEffectFxmlFilterData & data, mFilters) {
paramDataList.append(data);
}
return paramDataList;
@@ -327,7 +328,7 @@
{
return mMemoryType;
}
-HbEffectInfo::HbEffectInfo():mItem(0)
+HbEffectInfo::HbEffectInfo(): mItem(0)
{
}
@@ -362,7 +363,7 @@
}
bool HbEffectInfo::shared() const
{
- return mShared;
+ return mShared;
}
--- a/src/hbcore/effects/hbeffectfxmldata_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectfxmldata_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -31,7 +31,7 @@
#include <hbstring_p.h>
#include <hbvector_p.h>
-QT_FORWARD_DECLARE_CLASS(QGraphicsItem)
+QT_FORWARD_DECLARE_CLASS(QGraphicsItem)
struct HbKeyFrame {
// Cannot change to qreal even though krazy may insist on that.
@@ -44,8 +44,7 @@
: stringValue(memType) { }
};
-struct HbEffectFxmlAttrListEntry
-{
+struct HbEffectFxmlAttrListEntry {
HbEffectFxmlAttrListEntry(HbMemoryManager::MemoryType memType = HbMemoryManager::HeapMemory)
: mKey(memType), mValue(memType) { }
HbString mKey;
@@ -79,9 +78,9 @@
void append(const HbKeyFrame &keyFrame);
QString startRef() const;
- void setStartRef(const QString& value);
+ void setStartRef(const QString &value);
QString endRef() const;
- void setEndRef(const QString& value);
+ void setEndRef(const QString &value);
bool loopDefined() const;
@@ -166,7 +165,7 @@
QString xmlFileFullPath() const;
QString effectEvent() const;
bool inUse() const;
- bool fromTheme() const;
+ bool fromTheme() const;
QGraphicsItem *item() const;
bool shared() const;
@@ -184,7 +183,7 @@
bool mShared;
QGraphicsItem *mItem; // for object specific effects
// local or shared (depends on HbEffectFxmlData memory type)
- HbEffectFxmlData mFxmlData;
+ HbEffectFxmlData mFxmlData;
// Effect controller fills the info
friend class HbEffectController;
};
--- a/src/hbcore/effects/hbeffectgroup.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectgroup.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -44,8 +44,8 @@
#endif
HbEffectGroup::HbEffectGroup(
- const QString &effectEventType,
- QGraphicsItem *registrationItem,
+ const QString &effectEventType,
+ QGraphicsItem *registrationItem,
QGraphicsItem *targetItem,
const QString &itemType)
: mRegistrationItem(registrationItem),
@@ -133,7 +133,7 @@
if (effect->name() == HB_EFFECT_NAME_SCALE) {
// Move scale effect second last in the effect list
mEffects.takeAt(i);
- mEffects.insert(mEffects.size()-1, effect);
+ mEffects.insert(mEffects.size() - 1, effect);
}
}
@@ -148,18 +148,20 @@
void HbEffectGroup::updateItemTransform()
{
- QGraphicsView *gv(0);
+ QGraphicsView *gv(0);
// support for graphics view transforms
if (mTargetItem->type() == HbGVWrapperItemType) {
- HbGVWrapperItem *gvw = static_cast<HbGVWrapperItem*>(mTargetItem);
- if (gvw)
+ HbGVWrapperItem *gvw = static_cast<HbGVWrapperItem *>(mTargetItem);
+ if (gvw) {
gv = gvw->mainWindow();
+ }
}
QTransform transform;
- foreach (HbEffectAbstract *effect, mEffects) {
- if (effect)
+ foreach(HbEffectAbstract * effect, mEffects) {
+ if (effect) {
effect->updateItemTransform(transform);
+ }
}
if (!gv) {
mTargetItem->setTransform(transform);
@@ -180,7 +182,7 @@
int HbEffectGroup::effectCount() const
{
- return mEffects.count();
+ return mEffects.count();
}
bool HbEffectGroup::isRunning() const
@@ -200,14 +202,14 @@
void HbEffectGroup::pause()
{
- foreach (HbEffectAbstract *effect, mEffects) {
+ foreach(HbEffectAbstract * effect, mEffects) {
effect->pause();
}
}
void HbEffectGroup::resume()
{
- foreach (HbEffectAbstract *effect, mEffects) {
+ foreach(HbEffectAbstract * effect, mEffects) {
effect->resume();
}
}
@@ -303,7 +305,7 @@
// First resolve parameters and set the start states for all the effects.
// This is done before starting the effect animations to avoid screen flickering.
QTransform transform;
- foreach (HbEffectAbstract *effect, mEffects) {
+ foreach(HbEffectAbstract * effect, mEffects) {
// Resolve parameters etc.
effect->init();
if (effect->interval() == 0) {
@@ -329,7 +331,7 @@
mTargetItemHidden = false;
if (mEffects.empty()) {
- // No effect exists but user wants notification when effect finishes.
+ // No effect exists but user wants notification when effect finishes.
// Let the user do whatever he wanted to do when effect finishes.
invokeObserver(Hb::EffectNotStarted);
} else {
@@ -340,7 +342,7 @@
if (isLooping()) {
resolveView();
}
- foreach (HbEffectAbstract *effect, mEffects) {
+ foreach(HbEffectAbstract * effect, mEffects) {
// If the starttime is zero, start effect immediately
if (effect->interval() == 0) {
effect->start(); // This may call group's effectFinished if the effect was empty.
@@ -359,7 +361,7 @@
if (scene) {
// Resolve the main window having the same scene that the item belongs to
QList<HbMainWindow *> windowList = hbInstance->allMainWindows();
- foreach (const HbMainWindow *window, windowList) {
+ foreach(const HbMainWindow * window, windowList) {
if (window->scene() == scene) {
mView = window->currentView();
break;
@@ -371,7 +373,7 @@
bool HbEffectGroup::hasTranslateEffect() const
{
- foreach (HbEffectAbstract *effect, mEffects) {
+ foreach(HbEffectAbstract * effect, mEffects) {
if (effect->name() == HB_EFFECT_NAME_TRANSLATE) {
return true;
}
@@ -381,7 +383,7 @@
bool HbEffectGroup::hasRotateEffect() const
{
- foreach (HbEffectAbstract *effect, mEffects) {
+ foreach(HbEffectAbstract * effect, mEffects) {
if (effect->name() == HB_EFFECT_NAME_ROTATE) {
return true;
}
@@ -392,7 +394,7 @@
bool HbEffectGroup::hasScaleEffect() const
{
- foreach (HbEffectAbstract *effect, mEffects) {
+ foreach(HbEffectAbstract * effect, mEffects) {
if (effect->name() == HB_EFFECT_NAME_SCALE) {
return true;
}
@@ -402,7 +404,7 @@
bool HbEffectGroup::hasOpacityEffect() const
{
- foreach (HbEffectAbstract *effect, mEffects) {
+ foreach(HbEffectAbstract * effect, mEffects) {
if (effect->name() == HB_EFFECT_NAME_OPACITY) {
return true;
}
@@ -438,9 +440,9 @@
mTargetItem->setOpacity(1.0f);
}
// Reset filter effects.
-#ifdef HB_FILTER_EFFECTS
+#ifdef HB_FILTER_EFFECTS
deactivateVgEffect();
-#endif
+#endif
}
void HbEffectGroup::cancelAll(bool sendCallback, bool itemIsValid, bool clearEffect, const QTransform &initialItemTransform)
@@ -452,7 +454,7 @@
QTransform transform;
bool opacityEffectUsed = false;
- foreach (HbEffectAbstract *effect, mEffects) {
+ foreach(HbEffectAbstract * effect, mEffects) {
if (effect) {
HbTimer::instance()->unregisterEntry(effect);
effect->cancel(transform, itemIsValid);
@@ -531,8 +533,8 @@
status.userData = mUserData;
status.reason = reason;
- QObject *observer = mObserver;
-
+ QObject *observer = mObserver;
+
// Clear the observer to make sure it is not sent more than once.
// This is done before invokeMethod to avoid crash if the callback
// deletes this object.
--- a/src/hbcore/effects/hbeffectgroup_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectgroup_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -70,7 +70,7 @@
void addEffect(HbEffectAbstract *effect);
void removeEffect(HbEffectAbstract *effect);
void fixEffectOrder();
-
+
void setObserver(QObject *observer, const QString &effectFinishedSlotName);
void updateItemTransform();
@@ -127,7 +127,7 @@
bool mDirty;
QList<HbEffectAbstract *> mEffects;
-
+
HbVgChainedEffect *mVgEffect;
bool mVgEffectActivated;
QPointer<QGraphicsEffect> mVgEffectGuard;
--- a/src/hbcore/effects/hbeffecthsl.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffecthsl.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -25,7 +25,7 @@
#include <hbglobal.h>
#ifdef HB_FILTER_EFFECTS
-#include "hbeffecthsl_p.h"
+#include "hbeffecthsl_p.h" //krazy:exclude=includes
#include "hbeffectgroup_p.h"
#include "hbeffectdef_p.h"
#include "hbvgchainedeffect_p.h"
@@ -42,12 +42,12 @@
const HbEffectFxmlFilterData &data,
QGraphicsItem *item,
HbEffectGroup *group) :
- HbEffectFilter(0, item, group),
- mAnimationO(0),
- mAnimationH(0),
- mAnimationS(0),
- mAnimationL(0),
- mVgHsl(0)
+ HbEffectFilter(0, item, group),
+ mAnimationO(0),
+ mAnimationH(0),
+ mAnimationS(0),
+ mAnimationL(0),
+ mVgHsl(0)
{
// Default values of if something is not passed in FXML
qreal opacity_start = 1;
@@ -62,17 +62,14 @@
QList<HbEffectFxmlParamData> params = data.paramData();
// Handle FXML parameters
- Q_FOREACH(const HbEffectFxmlParamData ¶m, params) {
+ Q_FOREACH(const HbEffectFxmlParamData & param, params) {
if (param.name() == FXML_KEYWORD_HSL_OPACITY) {
mAnimationO = createAnimation(param, opacity_start, opacity_end, group);
- }
- else if (param.name() == FXML_KEYWORD_HSL_HUE) {
+ } else if (param.name() == FXML_KEYWORD_HSL_HUE) {
mAnimationH = createAnimation(param, hue_start, hue_end, group);
- }
- else if (param.name() == FXML_KEYWORD_HSL_SATURATION) {
+ } else if (param.name() == FXML_KEYWORD_HSL_SATURATION) {
mAnimationS = createAnimation(param, saturation_start, saturation_end, group);
- }
- else if (param.name() == FXML_KEYWORD_HSL_LIGHTNESS) {
+ } else if (param.name() == FXML_KEYWORD_HSL_LIGHTNESS) {
mAnimationL = createAnimation(param, lightness_start, lightness_end, group);
}
}
@@ -81,10 +78,10 @@
if (mEffectDefined) {
// Add blur effect to the filter effect chain in the effect group
HbVgChainedEffect *chain = HbEffectAbstract::group()->vgEffect();
-
+
mVgHsl = new HbVgHslEffect();
mVgHsl->setCaching(true);
-
+
chain->add(mVgHsl);
// Set initial values for the effect
--- a/src/hbcore/effects/hbeffectinternal_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectinternal_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -27,6 +27,7 @@
#define HBEFFECTINTERNAL_P_H
#include <hbglobal.h>
+#include <hbnamespace.h>
#include <QStringList>
const int HbGVWrapperItemType = Hb::ItemType_Last + 10000; // just some value after the last one
@@ -38,8 +39,10 @@
{
public:
HbGVWrapperItem();
- int type() const { return HbGVWrapperItemType; }
- void setMainWindow( HbMainWindow& mainWindow );
+ int type() const {
+ return HbGVWrapperItemType;
+ }
+ void setMainWindow(HbMainWindow &mainWindow);
HbMainWindow *mainWindow() const;
qreal transformDegrees;
private:
@@ -91,7 +94,7 @@
static void reloadFxmlFiles();
- static void cancelAll(const QList<QGraphicsItem*> *exceptionList = 0, bool ignoreLooping = false);
+ static void cancelAll(const QList<QGraphicsItem *> *exceptionList = 0, bool ignoreLooping = false);
static void safeCancelAll(bool clear = false);
static void stopEffects();
--- a/src/hbcore/effects/hbeffectopacity.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectopacity.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -32,8 +32,8 @@
HbEffectOpacityAnimation::HbEffectOpacityAnimation(
HbEffectGroup *group,
- int duration ) :
- HbEffectAnimation(group)
+ int duration) :
+ HbEffectAnimation(group)
{
setDuration(duration);
}
@@ -55,8 +55,8 @@
const QList<HbEffectFxmlParamData> &data,
QGraphicsItem *item,
HbEffectGroup *group) :
- HbEffectAbstract(0, item, group),
- mAnimation(0)
+ HbEffectAbstract(0, item, group),
+ mAnimation(0)
{
// Default values of if something is not passed in FXML
mStartOpacity = 1.0f;
@@ -70,8 +70,8 @@
const HbEffectFxmlParamData *opacityParam = 0;
// Handle FXML parameters
- Q_FOREACH(const HbEffectFxmlParamData ¶m, data) {
- if (param.name() == FXML_KEYWORD_OPACITY) {
+ Q_FOREACH(const HbEffectFxmlParamData & param, data) {
+ if (param.name() == FXML_KEYWORD_OPACITY) {
keyFrameList = param.keyFrames();
HbEffectUtils::resolveFxmlDuration(duration, param);
HbEffectUtils::resolveFxmlCurveShape(curve, param);
@@ -81,20 +81,19 @@
mEndOpacity = mStartOpacity;
opacityParam = ¶m;
- }
+ }
}
if (duration > 0) {
- mAnimation = new HbEffectOpacityAnimation(group, duration);
+ mAnimation = new HbEffectOpacityAnimation(group, duration);
- foreach( const HbKeyFrame &kf, keyFrameList ) {
- if (HbEffectUtils::fuzzyIsNull(kf.pos)) {
- // Start value 0.0 does not work so this trick fixes that.
+ foreach(const HbKeyFrame & kf, keyFrameList) {
+ if (HbEffectUtils::fuzzyIsNull(kf.pos)) {
+ // Start value 0.0 does not work so this trick fixes that.
mStartOpacity = kf.val + 0.0001f;
- }
- else if (HbEffectUtils::fuzzyIsOneOrGreater(kf.pos)) {
- mEndOpacity = kf.val;
- }
+ } else if (HbEffectUtils::fuzzyIsOneOrGreater(kf.pos)) {
+ mEndOpacity = kf.val;
+ }
// Set keyframe in animation
else {
mAnimation->setKeyValueAt(kf.pos, QVariant(kf.val));
--- a/src/hbcore/effects/hbeffectplanarreflection.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectplanarreflection.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -25,7 +25,7 @@
#include <hbglobal.h>
#ifdef HB_FILTER_EFFECTS
-#include "hbeffectplanarreflection_p.h"
+#include "hbeffectplanarreflection_p.h" //krazy:exclude=includes
#include "hbeffectgroup_p.h"
#include "hbeffectdef_p.h"
#include "hbvgchainedeffect_p.h"
@@ -42,13 +42,13 @@
const HbEffectFxmlFilterData &data,
QGraphicsItem *item,
HbEffectGroup *group) :
- HbEffectFilter(0, item, group),
- mAnimationO(0),
- mAnimationC(0),
- mAnimationX(0),
- mAnimationY(0),
- mAnimationF(0),
- mVgReflection(0)
+ HbEffectFilter(0, item, group),
+ mAnimationO(0),
+ mAnimationC(0),
+ mAnimationX(0),
+ mAnimationY(0),
+ mAnimationF(0),
+ mVgReflection(0)
{
// Default values of if something is not passed in FXML
qreal opacity_start = 1;
@@ -69,20 +69,16 @@
QList<HbEffectFxmlParamData> params = data.paramData();
// Handle FXML parameters
- Q_FOREACH(const HbEffectFxmlParamData ¶m, params) {
+ Q_FOREACH(const HbEffectFxmlParamData & param, params) {
if (param.name() == FXML_KEYWORD_PLANAR_REFLECTION_OPACITY) {
mAnimationO = createAnimation(param, opacity_start, opacity_end, group);
- }
- else if (param.name() == FXML_KEYWORD_PLANAR_REFLECTION_COLOR) {
+ } else if (param.name() == FXML_KEYWORD_PLANAR_REFLECTION_COLOR) {
mAnimationC = createAnimation(param, color_start, color_end, group);
- }
- else if (param.name() == FXML_KEYWORD_PLANAR_REFLECTION_OFFSET_X) {
+ } else if (param.name() == FXML_KEYWORD_PLANAR_REFLECTION_OFFSET_X) {
mAnimationX = createAnimation(param, offset_x_start, offset_x_end, group);
- }
- else if (param.name() == FXML_KEYWORD_PLANAR_REFLECTION_OFFSET_Y) {
+ } else if (param.name() == FXML_KEYWORD_PLANAR_REFLECTION_OFFSET_Y) {
mAnimationY = createAnimation(param, offset_y_start, offset_y_end, group);
- }
- else if (param.name() == FXML_KEYWORD_PLANAR_REFLECTION_FADE) {
+ } else if (param.name() == FXML_KEYWORD_PLANAR_REFLECTION_FADE) {
mAnimationF = createAnimation(param, fade_start, fade_end, group);
}
}
@@ -91,10 +87,10 @@
if (mEffectDefined) {
// Add the effect to the filter effect chain in the effect group
HbVgChainedEffect *chain = HbEffectAbstract::group()->vgEffect();
-
+
mVgReflection = new HbVgReflectionEffect();
mVgReflection->setCaching(true);
-
+
chain->add(mVgReflection);
// Set initial values for the effect
@@ -124,7 +120,7 @@
mVgReflection->setOpacity(qVariantValue<qreal>(mAnimationO->currentValue()));
}
if (mAnimationC) {
- mVgReflection->setColor(qVariantValue<QColor>(mAnimationC->currentValue()));
+ mVgReflection->setColor(qVariantValue<QColor>(mAnimationC->currentValue()));
}
QPointF offset = mVgReflection->offset();
@@ -139,7 +135,7 @@
mVgReflection->setOffset(offset);
if (mAnimationF) {
- mVgReflection->setFade(qVariantValue<qreal>(mAnimationF->currentValue()));
+ mVgReflection->setFade(qVariantValue<qreal>(mAnimationF->currentValue()));
}
}
}
--- a/src/hbcore/effects/hbeffectrotate.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectrotate.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -37,7 +37,7 @@
public:
HbEffectRotateAnimation(HbEffectGroup *group,
Qt::Axis axis,
- int duration );
+ int duration);
void setCenter(const QPointF &p);
@@ -56,13 +56,13 @@
HbEffectRotateAnimation::HbEffectRotateAnimation(
HbEffectGroup *group,
Qt::Axis axis,
- int duration ) :
- HbEffectAnimation(group),
- mAxis(axis),
- mCenterX(0),
- mCenterY(0),
- mCurrentRotation(0),
- mTargetRotation(0)
+ int duration) :
+ HbEffectAnimation(group),
+ mAxis(axis),
+ mCenterX(0),
+ mCenterY(0),
+ mCurrentRotation(0),
+ mTargetRotation(0)
{
setDuration(duration);
}
@@ -94,11 +94,11 @@
Example of how to use HbEffectRotate
\code
- // animData here is pointer to HbEffectAnimation data, gruop is pointer to HbEffectGroup, and
+ // animData here is pointer to HbEffectAnimation data, gruop is pointer to HbEffectGroup, and
// item is the QGraphicsItem on which effect will be applied.
HbEffectRotate *effect= new HbEffectScale(animData, item, group);
effect->start();
-
+
\endcode
\warning This class is a part of internal library implementation and may
@@ -111,11 +111,11 @@
const QList<HbEffectFxmlParamData> &data,
QGraphicsItem *item,
HbEffectGroup *group) :
- HbEffectAbstract(0, item, group),
- mAnimation(0),
- mCenterX(0.0),
- mCenterY(0.0),
- mPosChanged(false)
+ HbEffectAbstract(0, item, group),
+ mAnimation(0),
+ mCenterX(0.0),
+ mCenterY(0.0),
+ mPosChanged(false)
{
// Default values of rotation effect if something is not passed in FXML
Qt::Axis axis = Qt::ZAxis;
@@ -130,27 +130,23 @@
const HbEffectFxmlParamData *angleParam = 0;
// Handle FXML parameters
- Q_FOREACH(const HbEffectFxmlParamData ¶m, data) {
- if (param.name() == FXML_KEYWORD_ROTATION_ANGLE) {
+ Q_FOREACH(const HbEffectFxmlParamData & param, data) {
+ if (param.name() == FXML_KEYWORD_ROTATION_ANGLE) {
keyFrameList = param.keyFrames();
HbEffectUtils::resolveFxmlDuration(duration, param);
HbEffectUtils::resolveFxmlCurveShape(curve, param);
angleParam = ¶m;
- }
- else if (param.name() == FXML_KEYWORD_ROTATION_ORIGIN_X) {
+ } else if (param.name() == FXML_KEYWORD_ROTATION_ORIGIN_X) {
originXData = param;
- }
- else if (param.name() == FXML_KEYWORD_ROTATION_ORIGIN_Y) {
+ } else if (param.name() == FXML_KEYWORD_ROTATION_ORIGIN_Y) {
originYData = param;
- }
- else if (param.name() == FXML_KEYWORD_ROTATION_AXIS_X) {
+ } else if (param.name() == FXML_KEYWORD_ROTATION_AXIS_X) {
bool valueOk = false;
int value = param.getValue().toInt(&valueOk);
if (valueOk && (bool)value) {
axis = Qt::XAxis;
}
- }
- else if (param.name() == FXML_KEYWORD_ROTATION_AXIS_Y) {
+ } else if (param.name() == FXML_KEYWORD_ROTATION_AXIS_Y) {
bool valueOk = false;
int value = param.getValue().toInt(&valueOk);
if (valueOk && (bool)value) {
@@ -166,13 +162,12 @@
anim->addLooping(angleParam);
- foreach( const HbKeyFrame &kf, keyFrameList ) {
- if (HbEffectUtils::fuzzyIsNull(kf.pos)) {
- startAngle = kf.val;
- }
- else if (HbEffectUtils::fuzzyIsOneOrGreater(kf.pos)) {
- endAngle = kf.val;
- }
+ foreach(const HbKeyFrame & kf, keyFrameList) {
+ if (HbEffectUtils::fuzzyIsNull(kf.pos)) {
+ startAngle = kf.val;
+ } else if (HbEffectUtils::fuzzyIsOneOrGreater(kf.pos)) {
+ endAngle = kf.val;
+ }
// Set keyframe in animation
else {
anim->setKeyValueAt(kf.pos, QVariant(kf.val));
@@ -228,10 +223,10 @@
the result is undefined.
*/
void HbEffectRotate::start()
-{
- mAnimation->setCenter(QPointF(mCenterX, mCenterY));
+{
+ mAnimation->setCenter(QPointF(mCenterX, mCenterY));
mAnimation->setCurrentTime(0);
- mAnimation->start();
+ mAnimation->start();
}
/* Cancels the effect animation and sets the animation end state immediately.
@@ -241,7 +236,7 @@
Q_UNUSED(itemIsValid)
mAnimation->stop();
-
+
//This will set the endstate for the object correctly when cancelling effect
QTransform newTransform;
newTransform.translate(mAnimation->mCenterX, mAnimation->mCenterY);
@@ -254,7 +249,7 @@
void HbEffectRotate::updateItemTransform(QTransform &transform)
{
if (mAnimation) {
- // Rotate the transformation matrix to reach the new rotation angle.
+ // Rotate the transformation matrix to reach the new rotation angle.
QTransform newTransform;
newTransform.translate(mAnimation->mCenterX, mAnimation->mCenterY);
newTransform.rotate(mAnimation->mCurrentRotation, mAnimation->mAxis);
--- a/src/hbcore/effects/hbeffectrotate_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectrotate_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -63,10 +63,10 @@
qreal mCenterX;
qreal mCenterY;
bool mPosChanged;
-
- HbEffectFxmlParamData originXData;
- HbEffectFxmlParamData originYData;
-
+
+ HbEffectFxmlParamData originXData;
+ HbEffectFxmlParamData originYData;
+
};
--- a/src/hbcore/effects/hbeffectscale.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectscale.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -35,11 +35,11 @@
HbEffectScaleAnimation::HbEffectScaleAnimation(
HbEffectGroup *group,
HbEffectScale *effect,
- int duration ) :
- HbEffectAnimation(group),
- mEffect(effect),
- mCenter(0),
- mCurrentScaling(1.0)
+ int duration) :
+ HbEffectAnimation(group),
+ mEffect(effect),
+ mCenter(0),
+ mCurrentScaling(1.0)
{
setDuration(duration);
}
@@ -75,9 +75,9 @@
const QList<HbEffectFxmlParamData> &data,
QGraphicsItem *item,
HbEffectGroup *group) :
- HbEffectAbstract(0, item, group),
- mAnimationX(0),
- mAnimationY(0)
+ HbEffectAbstract(0, item, group),
+ mAnimationX(0),
+ mAnimationY(0)
{
int durationX = 0;
int durationY = 0;
@@ -92,19 +92,19 @@
mCenterXValue = 0;
mCenterYValue = 0;
- const HbEffectFxmlParamData* paramX = 0;
- const HbEffectFxmlParamData* paramY = 0;
+ const HbEffectFxmlParamData *paramX = 0;
+ const HbEffectFxmlParamData *paramY = 0;
- Q_FOREACH(const HbEffectFxmlParamData ¶m, data) {
- if (param.name() == FXML_KEYWORD_SCALE_X) {
+ Q_FOREACH(const HbEffectFxmlParamData & param, data) {
+ if (param.name() == FXML_KEYWORD_SCALE_X) {
mKeyFrameListX = param.keyFrames();
- // <start> for scale_x
- mStartWidth = param.getAttribute(FXML_KEYWORD_START);
- mStartWidthRef = param.startRef();
- // <end> for scale_x
- mEndWidth = param.getAttribute(FXML_KEYWORD_END);
- mEndWidthRef = param.endRef();
- // duration and curvepath
+ // <start> for scale_x
+ mStartWidth = param.getAttribute(FXML_KEYWORD_START);
+ mStartWidthRef = param.startRef();
+ // <end> for scale_x
+ mEndWidth = param.getAttribute(FXML_KEYWORD_END);
+ mEndWidthRef = param.endRef();
+ // duration and curvepath
HbEffectUtils::resolveFxmlDuration(durationX, param);
HbEffectUtils::resolveFxmlCurveShape(curveX, param);
@@ -114,15 +114,14 @@
}
paramX = ¶m;
- }
- else if (param.name() == FXML_KEYWORD_SCALE_Y) {
+ } else if (param.name() == FXML_KEYWORD_SCALE_Y) {
mKeyFrameListY = param.keyFrames();
- // <start> for scale_y
- mStartHeight = param.getAttribute(FXML_KEYWORD_START);
- mStartHeightRef = param.startRef();
- // <end> for scale_y
- mEndHeight = param.getAttribute(FXML_KEYWORD_END);
- mEndHeightRef = param.endRef();
+ // <start> for scale_y
+ mStartHeight = param.getAttribute(FXML_KEYWORD_START);
+ mStartHeightRef = param.startRef();
+ // <end> for scale_y
+ mEndHeight = param.getAttribute(FXML_KEYWORD_END);
+ mEndHeightRef = param.endRef();
HbEffectUtils::resolveFxmlDuration(durationY, param);
HbEffectUtils::resolveFxmlCurveShape(curveY, param);
@@ -132,22 +131,20 @@
}
paramY = ¶m;
- }
- else if (param.name() == FXML_KEYWORD_SCALE_ORIGIN_X) {
+ } else if (param.name() == FXML_KEYWORD_SCALE_ORIGIN_X) {
mCenterX = param.getValue();
mCenterXRef = param.getAttribute(FXML_PARAM_REF);
- }
- else if (param.name() == FXML_KEYWORD_SCALE_ORIGIN_Y) {
+ } else if (param.name() == FXML_KEYWORD_SCALE_ORIGIN_Y) {
mCenterY = param.getValue();
mCenterYRef = param.getAttribute(FXML_PARAM_REF);
- }
+ }
}
// Validate references. If start and end references are used, at least one of them must be a visual reference.
if ((mStartWidthRef.isEmpty() || mStartWidthRef.startsWith(FXML_VISUAL) ||
- mEndWidthRef.isEmpty() || mEndWidthRef.startsWith(FXML_VISUAL)) &&
- (mStartHeightRef.isEmpty() || mStartHeightRef.startsWith(FXML_VISUAL) ||
- mEndHeightRef.isEmpty() || mEndHeightRef.startsWith(FXML_VISUAL))) {
+ mEndWidthRef.isEmpty() || mEndWidthRef.startsWith(FXML_VISUAL)) &&
+ (mStartHeightRef.isEmpty() || mStartHeightRef.startsWith(FXML_VISUAL) ||
+ mEndHeightRef.isEmpty() || mEndHeightRef.startsWith(FXML_VISUAL))) {
// references ok
} else {
// Invalid references - disable effect
@@ -187,7 +184,7 @@
/* deletes the effect and rewinds the animation so that next animation can star,
- rewind is necessary as the general use case is that the effect is restarted before
+ rewind is necessary as the general use case is that the effect is restarted before
being complete, in which case the rewind would transform the item and prepare for
the next effect.
*/
@@ -224,7 +221,7 @@
// start width
if (!mStartWidth.isEmpty()) {
value = HbEffectUtils::resolveFxmlRef(
- mStartWidthRef, mStartWidth, &valueOk, item(), HbEffectUtils::Size, extRect);
+ mStartWidthRef, mStartWidth, &valueOk, item(), HbEffectUtils::Size, extRect);
if (valueOk) {
mStartXValue = value;
}
@@ -240,7 +237,7 @@
// end width
if (!mEndWidth.isEmpty()) {
value = HbEffectUtils::resolveFxmlRef(
- mEndWidthRef, mEndWidth, &valueOk, item(), HbEffectUtils::Size, extRect);
+ mEndWidthRef, mEndWidth, &valueOk, item(), HbEffectUtils::Size, extRect);
if (valueOk) {
mEndXValue = value;
@@ -249,7 +246,7 @@
// end height
if (!mEndHeight.isEmpty()) {
value = HbEffectUtils::resolveFxmlRef(
- mEndHeightRef, mEndHeight, &valueOk, item(), HbEffectUtils::Size, extRect);
+ mEndHeightRef, mEndHeight, &valueOk, item(), HbEffectUtils::Size, extRect);
if (valueOk) {
mEndYValue = value;
@@ -258,14 +255,14 @@
// CenterX
value = HbEffectUtils::resolveFxmlRef(
- mCenterXRef, mCenterX, &valueOk, item(), HbEffectUtils::CenterMappedToTargetRect, extRect);
-
+ mCenterXRef, mCenterX, &valueOk, item(), HbEffectUtils::CenterMappedToTargetRect, extRect);
+
if (valueOk) {
mCenterXValue = value;
}
// CenterY
value = HbEffectUtils::resolveFxmlRef(
- mCenterYRef, mCenterY, &valueOk, item(), HbEffectUtils::CenterMappedToTargetRect, extRect);
+ mCenterYRef, mCenterY, &valueOk, item(), HbEffectUtils::CenterMappedToTargetRect, extRect);
if (valueOk) {
mCenterYValue = value;
@@ -295,15 +292,15 @@
bool startEndRefUsed = !mStartWidthRef.isEmpty() && !mEndWidthRef.isEmpty();
qreal paramRefValueX = 0.0;
-
+
// Resolve SCALE_X parameter's "ref" value only if that's needed
if (!startEndRefUsed) {
paramRefValueX = HbEffectUtils::resolveFxmlRef(
- mParamRefX, "1", &valueOk, item(), HbEffectUtils::Size, extRect);
+ mParamRefX, "1", &valueOk, item(), HbEffectUtils::Size, extRect);
}
// Set keyframes in animation
- foreach(const HbKeyFrame &kf, mKeyFrameListX) {
+ foreach(const HbKeyFrame & kf, mKeyFrameListX) {
// If start and end references are used,
// value at given step is (1-c)*startX + c*endX where c is the keyframe coefficient value
@@ -342,11 +339,11 @@
// Resolve SCALE_Y parameter's "ref" value only if that's needed
if (!startEndRefUsed) {
paramRefValueY = HbEffectUtils::resolveFxmlRef(
- mParamRefY, "1", &valueOk, item(), HbEffectUtils::Size, extRect);
+ mParamRefY, "1", &valueOk, item(), HbEffectUtils::Size, extRect);
}
// Set keyframes in animation
- foreach(const HbKeyFrame &kf, mKeyFrameListY) {
+ foreach(const HbKeyFrame & kf, mKeyFrameListY) {
// If start and end references are used,
// value at given step is (1-c)*startY + c*endY where c is the keyframe coefficient value
if (startEndRefUsed) {
@@ -425,7 +422,7 @@
QTransform newTransform;
// Handle centering for scaling the matrix
newTransform.translate(mCenterXValue, mCenterYValue);
-
+
// Get the current scaling factor from animation or use 1.0 if animation does not exist
qreal currentScalingX = mAnimationX ? mAnimationX->mCurrentScaling : 1.0;
qreal currentScalingY = mAnimationY ? mAnimationY->mCurrentScaling : 1.0;
--- a/src/hbcore/effects/hbeffectscale_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectscale_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -77,15 +77,15 @@
QString mStartWidthRef;
QString mStartHeight;
QString mStartHeightRef;
- QString mEndWidth;
+ QString mEndWidth;
QString mEndWidthRef;
QString mEndHeight;
QString mEndHeightRef;
// These are resolved from strings in init()
- qreal mStartXValue;
+ qreal mStartXValue;
qreal mStartYValue;
- qreal mEndXValue;
+ qreal mEndXValue;
qreal mEndYValue;
qreal mCenterXValue;
qreal mCenterYValue;
--- a/src/hbcore/effects/hbeffecttranslate.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffecttranslate.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -34,8 +34,8 @@
HbEffectGroup *group,
HbEffectTranslate *effect,
int duration) :
- HbEffectAnimation(group),
- effect(effect)
+ HbEffectAnimation(group),
+ effect(effect)
{
setDuration(duration);
}
@@ -65,9 +65,9 @@
const QList<HbEffectFxmlParamData> &data,
QGraphicsItem *item,
HbEffectGroup *group) :
- HbEffectAbstract(0, item, group),
- mAnimationX(0),
- mAnimationY(0)
+ HbEffectAbstract(0, item, group),
+ mAnimationX(0),
+ mAnimationY(0)
{
// Default values if something is not passed in FXML
int durationX = 0;
@@ -76,43 +76,42 @@
QEasingCurve curveShapeX = QEasingCurve::Linear;
QEasingCurve curveShapeY = QEasingCurve::Linear;
- const HbEffectFxmlParamData* paramX = 0;
- const HbEffectFxmlParamData* paramY = 0;
+ const HbEffectFxmlParamData *paramX = 0;
+ const HbEffectFxmlParamData *paramY = 0;
// Handle FXML parameters
- Q_FOREACH(const HbEffectFxmlParamData ¶m, data) {
- if (param.name() == FXML_KEYWORD_TRANSLATION_X) {
+ Q_FOREACH(const HbEffectFxmlParamData & param, data) {
+ if (param.name() == FXML_KEYWORD_TRANSLATION_X) {
mKeyFrameListX = param.keyFrames();
HbEffectUtils::resolveFxmlDuration(durationX, param);
HbEffectUtils::resolveFxmlCurveShape(curveShapeX, param);
- mStartXRef = param.startRef();
- mEndXRef = param.endRef();
- mStartX = param.getAttribute(FXML_KEYWORD_START);
- mEndX = param.getAttribute(FXML_KEYWORD_END);
+ mStartXRef = param.startRef();
+ mEndXRef = param.endRef();
+ mStartX = param.getAttribute(FXML_KEYWORD_START);
+ mEndX = param.getAttribute(FXML_KEYWORD_END);
// Only if "start ref" and "end ref" are not used, read parameter's "ref" attribute
if (mStartXRef.isEmpty() && mEndXRef.isEmpty()) {
mParamRefX = param.getAttribute(FXML_PARAM_REF);
}
paramX = ¶m;
- }
- else if (param.name() == FXML_KEYWORD_TRANSLATION_Y) {
+ } else if (param.name() == FXML_KEYWORD_TRANSLATION_Y) {
mKeyFrameListY = param.keyFrames();
HbEffectUtils::resolveFxmlDuration(durationY, param);
HbEffectUtils::resolveFxmlCurveShape(curveShapeY, param);
- mStartYRef = param.startRef();
- mEndYRef = param.endRef();
- mStartY = param.getAttribute(FXML_KEYWORD_START);
- mEndY = param.getAttribute(FXML_KEYWORD_END);
+ mStartYRef = param.startRef();
+ mEndYRef = param.endRef();
+ mStartY = param.getAttribute(FXML_KEYWORD_START);
+ mEndY = param.getAttribute(FXML_KEYWORD_END);
// Only if "start ref" and "end ref" are not used, read parameter's "ref" attribute
if (mStartYRef.isEmpty() && mEndYRef.isEmpty()) {
mParamRefY = param.getAttribute(FXML_PARAM_REF);
}
paramY = ¶m;
- }
+ }
}
if (durationX > 0) {
@@ -130,7 +129,7 @@
}
/* Deletes the effect and rewinds the animation so that next animation can start,
- rewind is necessary as the general use case is that the effect is restarted before
+ rewind is necessary as the general use case is that the effect is restarted before
being complete, in which case the rewind would transform the item and prepare for
the next effect,otherwise would result in flicker.
*/
@@ -161,17 +160,17 @@
// StartX
qreal value = HbEffectUtils::resolveFxmlRef(
- mStartXRef, mStartX, &valueOk, item(), HbEffectUtils::Position, extRect);
+ mStartXRef, mStartX, &valueOk, item(), HbEffectUtils::Position, extRect);
if (valueOk) {
mStartXValue = value;
} else {
// Failed to resolve parameters, use item's current position.
mStartXValue = item()->pos().x();
}
-
+
// StartY
value = HbEffectUtils::resolveFxmlRef(
- mStartYRef, mStartY, &valueOk, item(), HbEffectUtils::Position, extRect);
+ mStartYRef, mStartY, &valueOk, item(), HbEffectUtils::Position, extRect);
if (valueOk) {
mStartYValue = value;
} else {
@@ -181,7 +180,7 @@
// EndX
value = HbEffectUtils::resolveFxmlRef(
- mEndXRef, mEndX, &valueOk, item(), HbEffectUtils::Position, extRect);
+ mEndXRef, mEndX, &valueOk, item(), HbEffectUtils::Position, extRect);
if (valueOk) {
mEndXValue = value;
} else {
@@ -191,7 +190,7 @@
// EndY
value = HbEffectUtils::resolveFxmlRef(
- mEndYRef, mEndY, &valueOk, item(), HbEffectUtils::Position, extRect);
+ mEndYRef, mEndY, &valueOk, item(), HbEffectUtils::Position, extRect);
if (valueOk) {
mEndYValue = value;
} else {
@@ -207,7 +206,7 @@
bool startEndRefUsed = !mStartXRef.isEmpty() && !mEndXRef.isEmpty();
// Set keyframes in animation
- foreach(const HbKeyFrame &kf, mKeyFrameListX) {
+ foreach(const HbKeyFrame & kf, mKeyFrameListX) {
// If start and end references are used,
// value at given step is (1-c)*startX + c*endX where c is the keyframe coefficient value
if (startEndRefUsed) {
@@ -216,7 +215,7 @@
// Otherwise c defines the value
else {
value = HbEffectUtils::resolveFxmlRef(
- mParamRefX, QString().setNum(kf.val), &valueOk, item(), HbEffectUtils::Position, extRect);
+ mParamRefX, QString().setNum(kf.val), &valueOk, item(), HbEffectUtils::Position, extRect);
if (!valueOk) {
// Default to item's position if failed
value = item()->pos().x();
@@ -242,7 +241,7 @@
bool startEndRefUsed = !mStartYRef.isEmpty() && !mEndYRef.isEmpty();
// Set keyframes in animation
- foreach(const HbKeyFrame &kf, mKeyFrameListY) {
+ foreach(const HbKeyFrame & kf, mKeyFrameListY) {
// If start and end references are used,
// value at given step is (1-c)*startY + c*endY where c is the keyframe coefficient value
if (startEndRefUsed) {
@@ -251,7 +250,7 @@
// Otherwise c defines the relative value to parameter's reference
else {
value = HbEffectUtils::resolveFxmlRef(
- mParamRefY, QString().setNum(kf.val), &valueOk, item(), HbEffectUtils::Position, extRect);
+ mParamRefY, QString().setNum(kf.val), &valueOk, item(), HbEffectUtils::Position, extRect);
if (!valueOk) {
// Default to item's position if failed
value = item()->pos().y();
@@ -271,7 +270,7 @@
}
void HbEffectTranslate::setStartState(QTransform &transform)
-{
+{
qreal translateX = mAnimationX ? mStartXValue - mAnimationX->originalPos : 0;
qreal translateY = mAnimationY ? mStartYValue - mAnimationY->originalPos : 0;
--- a/src/hbcore/effects/hbeffectutils.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectutils.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -47,7 +47,7 @@
qreal HbEffectUtils::resolveFxmlRef(
const QString &ref,
const QString &value,
- bool* ok,
+ bool *ok,
const QGraphicsItem *item,
HbEffectUtils::valueType type,
const QRectF &extRect)
@@ -73,88 +73,71 @@
refValue = 0;
addToPos = true;
x = true;
- }
- else if (ref == FXML_KEYWORD_VISUAL_RIGHT) {
+ } else if (ref == FXML_KEYWORD_VISUAL_RIGHT) {
refValue = rect.width();
addToPos = true;
x = true;
- }
- else if (ref == FXML_KEYWORD_VISUAL_TOP) {
+ } else if (ref == FXML_KEYWORD_VISUAL_TOP) {
refValue = 0;
addToPos = true;
y = true;
- }
- else if (ref == FXML_KEYWORD_VISUAL_BOTTOM) {
+ } else if (ref == FXML_KEYWORD_VISUAL_BOTTOM) {
refValue = rect.height();
addToPos = true;
y = true;
- }
- else if (ref == FXML_KEYWORD_VISUAL_WIDTH) {
+ } else if (ref == FXML_KEYWORD_VISUAL_WIDTH) {
refValue = rect.width();
addToPos = true;
x = true;
- }
- else if (ref == FXML_KEYWORD_VISUAL_HEIGHT) {
+ } else if (ref == FXML_KEYWORD_VISUAL_HEIGHT) {
refValue = rect.height();
addToPos = true;
y = true;
- }
- else {
+ } else {
// Reference is something else than visual, so need to map to item's coordinates
mapToItemCoordinates = true;
srcRect = extRect;
-
+
// Extrect values
if (ref == FXML_KEYWORD_EXTRECT_LEFT) {
refValue = extRect.left();
x = true;
- }
- else if (ref == FXML_KEYWORD_EXTRECT_RIGHT) {
+ } else if (ref == FXML_KEYWORD_EXTRECT_RIGHT) {
refValue = extRect.right();
x = true;
- }
- else if (ref == FXML_KEYWORD_EXTRECT_TOP) {
+ } else if (ref == FXML_KEYWORD_EXTRECT_TOP) {
refValue = extRect.top();
y = true;
- }
- else if (ref == FXML_KEYWORD_EXTRECT_BOTTOM) {
+ } else if (ref == FXML_KEYWORD_EXTRECT_BOTTOM) {
refValue = extRect.bottom();
y = true;
- }
- else if (ref == FXML_KEYWORD_EXTRECT_WIDTH) {
+ } else if (ref == FXML_KEYWORD_EXTRECT_WIDTH) {
refValue = extRect.width();
x = true;
- }
- else if (ref == FXML_KEYWORD_EXTRECT_HEIGHT) {
+ } else if (ref == FXML_KEYWORD_EXTRECT_HEIGHT) {
refValue = extRect.height();
y = true;
- }
- else {
- // Screen values
- QSize screenSize = HbDeviceProfile::profile(item).logicalSize();
- srcRect = QRectF(QPointF(0,0), screenSize);
+ } else {
+ // Screen values
+ QSize screenSize = HbDeviceProfile::profile(item).logicalSize();
+ srcRect = QRectF(QPointF(0, 0), screenSize);
if (ref == FXML_KEYWORD_SCREEN_LEFT) {
refValue = 0;
x = true;
- }
- else if (ref == FXML_KEYWORD_SCREEN_RIGHT) {
+ } else if (ref == FXML_KEYWORD_SCREEN_RIGHT) {
refValue = screenSize.width();
x = true;
- }
- else if (ref == FXML_KEYWORD_SCREEN_TOP) {
+ } else if (ref == FXML_KEYWORD_SCREEN_TOP) {
refValue = 0;
y = true;
- }
- else if (ref == FXML_KEYWORD_SCREEN_BOTTOM) {
+ } else if (ref == FXML_KEYWORD_SCREEN_BOTTOM) {
refValue = screenSize.height();
y = true;
- }
- else if (ref == FXML_KEYWORD_SCREEN_WIDTH) {
+ } else if (ref == FXML_KEYWORD_SCREEN_WIDTH) {
refValue = screenSize.width();
x = true;
- }
- else if (ref == FXML_KEYWORD_SCREEN_HEIGHT) {
+ } else if (ref == FXML_KEYWORD_SCREEN_HEIGHT) {
refValue = screenSize.height();
y = true;
}
@@ -176,8 +159,7 @@
if (addToPos && type == HbEffectUtils::Position) {
if (x) {
refValue += item->pos().x();
- }
- else {
+ } else {
refValue += item->pos().y();
}
}
@@ -200,26 +182,28 @@
}
}
}
-
+
// Convert to item size units if needed
if (type == HbEffectUtils::Size) {
if (x) {
- if (!fuzzyIsNull(rect.width()))
+ if (!fuzzyIsNull(rect.width())) {
refValue /= rect.width();
- else
+ } else {
refValue = 0;
+ }
} else if (y) {
- if (!fuzzyIsNull(rect.height()))
+ if (!fuzzyIsNull(rect.height())) {
refValue /= rect.height();
- else
+ } else {
refValue = 0;
- }
+ }
+ }
}
// This operation is needed e.g. when scale is done from some other rect to target rect
if (type == HbEffectUtils::CenterMappedToTargetRect && mapToItemCoordinates) {
QPointF scenePos = item->scenePos();
- // If the item is already translated, have to substract that to get correct result
+ // If the item is already translated, have to subtract that to get correct result
QTransform trans = item->transform();
qreal dx = trans.dx();
qreal dy = trans.dy();
@@ -249,7 +233,7 @@
qreal HbEffectUtils::resolveFxmlRef(
- const HbEffectFxmlParamData &data, bool* ok, const QGraphicsItem *item, HbEffectUtils::valueType type, const QRectF &extRect)
+ const HbEffectFxmlParamData &data, bool *ok, const QGraphicsItem *item, HbEffectUtils::valueType type, const QRectF &extRect)
{
return HbEffectUtils::resolveFxmlRef(data.getAttribute(FXML_PARAM_REF), data.getValue(), ok, item, type, extRect);
}
@@ -261,32 +245,24 @@
if (!style.isEmpty()) {
if (style == FXML_KEYWORD_STYLE_LINEAR) {
curve = QEasingCurve::Linear;
- }
- else if (style == FXML_KEYWORD_STYLE_INQUAD) {
+ } else if (style == FXML_KEYWORD_STYLE_INQUAD) {
curve = QEasingCurve::InQuad;
- }
- else if (style == FXML_KEYWORD_STYLE_OUTQUAD) {
+ } else if (style == FXML_KEYWORD_STYLE_OUTQUAD) {
curve = QEasingCurve::OutQuad;
- }
- else if (style == FXML_KEYWORD_STYLE_INOUTQUAD) {
+ } else if (style == FXML_KEYWORD_STYLE_INOUTQUAD) {
curve = QEasingCurve::InOutQuad;
- }
- else if (style == FXML_KEYWORD_STYLE_OUTINQUAD) {
+ } else if (style == FXML_KEYWORD_STYLE_OUTINQUAD) {
curve = QEasingCurve::OutInQuad;
- }
- else if (style == FXML_KEYWORD_STYLE_INBACK) {
+ } else if (style == FXML_KEYWORD_STYLE_INBACK) {
curve = QEasingCurve::InBack;
- }
- else if (style == FXML_KEYWORD_STYLE_OUTBACK) {
+ } else if (style == FXML_KEYWORD_STYLE_OUTBACK) {
curve = QEasingCurve::OutBack;
- }
- else if (style == FXML_KEYWORD_STYLE_INOUTBACK) {
+ } else if (style == FXML_KEYWORD_STYLE_INOUTBACK) {
curve = QEasingCurve::InOutBack;
- }
- else if (style == FXML_KEYWORD_STYLE_OUTINBACK) {
+ } else if (style == FXML_KEYWORD_STYLE_OUTINBACK) {
curve = QEasingCurve::OutInBack;
}
- }
+ }
}
void HbEffectUtils::resolveFxmlDuration(int &duration, const HbEffectFxmlParamData &data)
--- a/src/hbcore/effects/hbeffectutils_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectutils_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -50,14 +50,14 @@
static qreal resolveFxmlRef(
const QString &ref,
const QString &value,
- bool* ok,
+ bool *ok,
const QGraphicsItem *item,
valueType type,
const QRectF &extRect = QRectF());
static qreal resolveFxmlRef(
const HbEffectFxmlParamData &data,
- bool* ok,
+ bool *ok,
const QGraphicsItem *item,
valueType type,
const QRectF &extRect = QRectF());
@@ -66,24 +66,20 @@
static void resolveFxmlDuration(int &duration, const HbEffectFxmlParamData &data);
- static inline bool fuzzyIsNull(double d)
- {
- return qAbs(d) <= 0.000000000001;
+ static inline bool fuzzyIsNull(double d) {
+ return qAbs(d) <= 0.000000000001;
}
- static inline bool fuzzyIsNull(float f)
- {
- return qAbs(f) <= 0.00001f;
+ static inline bool fuzzyIsNull(float f) {
+ return qAbs(f) <= 0.00001f;
}
- static inline bool fuzzyIsOneOrGreater(double d)
- {
- return d >= 1.0 - 0.000000000001;
+ static inline bool fuzzyIsOneOrGreater(double d) {
+ return d >= 1.0 - 0.000000000001;
}
- static inline bool fuzzyIsOneOrGreater(float f)
- {
- return f >= 1.0f - 0.00001f;
+ static inline bool fuzzyIsOneOrGreater(float f) {
+ return f >= 1.0f - 0.00001f;
}
};
--- a/src/hbcore/effects/hbeffectxmlparser.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectxmlparser.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -46,7 +46,7 @@
Constructor.
*/
HbEffectXmlParser::HbEffectXmlParser()
- :mFxmlData(0)
+ : mFxmlData(0)
{
}
@@ -74,7 +74,7 @@
qWarning("HbEffectXmlParser: Document element is invalid (not <layers>");
raiseError("HbEffectXmlParser::read The document is not an valid effect definitions document.");
}
- }
+ }
}
if (error()) {
@@ -141,8 +141,9 @@
readNext();
if (isEndElement()) {
- if (name() == FXML_LAYERS)
+ if (name() == FXML_LAYERS) {
break;
+ }
}
if (isStartElement()) {
@@ -152,14 +153,11 @@
else if (name() == FXML_LAYERGROUP) {
// Not needed
- }
- else if (name() == FXML_BLENDING) {
+ } else if (name() == FXML_BLENDING) {
readBlendingElement();
- }
- else if (name() == FXML_COMMENT) {
+ } else if (name() == FXML_COMMENT) {
// Comments are skipped
- }
- else if (name() == FXML_FILTER) {
+ } else if (name() == FXML_FILTER) {
#ifdef HB_FILTER_EFFECTS
readFilterData();
#endif
@@ -186,13 +184,11 @@
if (isStartElement()) {
if (name() == FXML_PARAM) {
mFxmlData->appendParamData(readParamData());
- }
- else if (name() == FXML_FILTER) {
+ } else if (name() == FXML_FILTER) {
#ifdef HB_FILTER_EFFECTS
readFilterData();
#endif
- }
- else {
+ } else {
readUnknownElement();
}
}
@@ -211,7 +207,7 @@
// Parse filter type
QXmlStreamAttributes attrs = attributes();
- foreach (const QXmlStreamAttribute &attr, attrs) {
+ foreach(const QXmlStreamAttribute & attr, attrs) {
// "type" = ...
if (attr.name().toString() == FXML_PARAM_TYPE) {
filterData.setType(attr.value().toString());
@@ -247,18 +243,18 @@
// This parses information inside one <param> field.
// E.g. "scale_x", "scale_y", "scale_origin_x"
-//
+//
HbEffectFxmlParamData HbEffectXmlParser::readParamData()
{
Q_ASSERT(isStartElement() && name() == FXML_PARAM);
-
+
HbEffectFxmlParamData param(mFxmlData->memoryType());
HbKeyFrame kf(mFxmlData->memoryType());
QXmlStreamAttributes attrs = attributes();
// Populate the PARAM attributes
- foreach (const QXmlStreamAttribute &attr, attrs) {
+ foreach(const QXmlStreamAttribute & attr, attrs) {
// "name" = ...
if (attr.name().toString() == FXML_PARAM_NAME) {
param.setName(attr.value().toString());
@@ -293,7 +289,7 @@
// <marker> tag
else if (name() == FXML_MARKER) {
QXmlStreamAttributes attrs = attributes();
-
+
enum {
Undefined = 0,
Start,
@@ -301,7 +297,7 @@
} loopType = Undefined;
// Fetch "type" attribute from <marker> tag
- foreach (const QXmlStreamAttribute &attr, attrs) {
+ foreach(const QXmlStreamAttribute & attr, attrs) {
if (attr.name().toString() == FXML_PARAM_TYPE) {
QString s = attr.value().toString();
if (s == FXML_LOOP_START) {
@@ -315,7 +311,7 @@
if (loopType != Undefined) {
// Fetch "at" attribute from <marker> tag
- foreach (const QXmlStreamAttribute &attr, attrs) {
+ foreach(const QXmlStreamAttribute & attr, attrs) {
if (attr.name().toString() == FXML_PARAM_AT) {
QString s = attr.value().toString();
bool ok = false;
@@ -343,11 +339,11 @@
// <keyframe> tag
else if (name() == FXML_KEYFRAME) {
QXmlStreamAttributes attrs = attributes();
-
+
bool ok = false;
// Fetch "at" attribute from <keyframe> tag
- foreach (const QXmlStreamAttribute &attr, attrs) {
+ foreach(const QXmlStreamAttribute & attr, attrs) {
if (attr.name().toString() == FXML_PARAM_AT) {
QString s = attr.value().toString();
kf.pos = s.toFloat(&ok);
@@ -373,27 +369,26 @@
}
}
//<start> element
- else if(name() == FXML_KEYWORD_START) {
+ else if (name() == FXML_KEYWORD_START) {
QXmlStreamAttributes attrs = attributes();
- foreach (const QXmlStreamAttribute &attr, attrs) {
- if( attr.name() == FXML_PARAM_REF ) {
+ foreach(const QXmlStreamAttribute & attr, attrs) {
+ if (attr.name() == FXML_PARAM_REF) {
param.setStartRef(attr.value().toString());
}
}
param.setAttribute(FXML_KEYWORD_START, readElementText());
}
//<end> element
- else if(name() == FXML_KEYWORD_END) {
+ else if (name() == FXML_KEYWORD_END) {
QXmlStreamAttributes attrs = attributes();
- foreach (const QXmlStreamAttribute &attr, attrs) {
- if( attr.name() == FXML_PARAM_REF ) {
+ foreach(const QXmlStreamAttribute & attr, attrs) {
+ if (attr.name() == FXML_PARAM_REF) {
param.setEndRef(attr.value().toString());
}
}
param.setAttribute(FXML_KEYWORD_END, readElementText());
- }
- else {
+ } else {
readUnknownElement();
}
}
--- a/src/hbcore/effects/hbeffectxmlparser_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/effects/hbeffectxmlparser_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -51,8 +51,8 @@
void readFilterData();
void readBlendingElement();
- HbEffectFxmlParamData readParamData();
-
+ HbEffectFxmlParamData readParamData();
+
private:
HbEffectFxmlData *mFxmlData;
QString mCurrentBlending;
--- a/src/hbcore/gui/hbabstractbutton.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbabstractbutton.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -299,6 +299,7 @@
q->grabGesture(Qt::TapGesture);
#endif
+ q->setFlag(QGraphicsItem::ItemHasNoContents, true);
// FIXME: size policy is commented out b/c of a bug in Qt #236689, also in our bugtracker.
//q->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum, controlType));
@@ -974,7 +975,7 @@
if (!d->down) {
return;
}
- if ( hit && !d->longPress) {
+ if ( hit ) {
HbWidgetFeedback::triggered(this, Hb::InstantClicked);
}
HbWidgetFeedback::triggered(this, Hb::InstantReleased);
--- a/src/hbcore/gui/hbanchorarrowdrawer_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbanchorarrowdrawer_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -43,7 +43,8 @@
const QString INVALID_COLOR = "qtc_view_visited_normal";
HbAnchorArrowDrawer::HbAnchorArrowDrawer(HbMeshLayout* mesh, QGraphicsItem *parent)
- : HbWidgetBase(parent), mLayout(mesh), mDrawOutlines(true), mDrawArrows(true), mDrawSpacers(true)
+ : HbWidgetBase(parent),
+ mLayout(mesh), mDrawOutlines(true), mDrawArrows(true), mDrawSpacers(true)
{
#if defined(HB_DEVELOPER) || defined(CSS_INSPECTOR)
updateColors();
@@ -92,7 +93,8 @@
#endif
}
-void HbAnchorArrowDrawer::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+void HbAnchorArrowDrawer::paint(
+ QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
{
Q_UNUSED(option);
Q_UNUSED(widget);
@@ -135,17 +137,22 @@
bool overridden = false;
// find all the horizontal anchors
foreach(HbAnchor *anchor, anchors) {
- if (anchor->mStartEdge == Hb::LeftEdge || anchor->mStartEdge == Hb::RightEdge ||anchor->mStartEdge == Hb::CenterHEdge) {
+ if (anchor->mStartEdge == Hb::LeftEdge ||
+ anchor->mStartEdge == Hb::RightEdge ||
+ anchor->mStartEdge == Hb::CenterHEdge) {
+
QGraphicsLayoutItem *other = 0;
if (anchor->mStartItem == layoutItem && anchor->mEndItem != mLayout) {
other = anchor->mEndItem;
- } else if (anchor->mEndItem == layoutItem && anchor->mStartItem != mLayout) {
+ } else if (anchor->mEndItem == layoutItem &&
+ anchor->mStartItem != mLayout) {
other = anchor->mStartItem;
}
if (other) {
if (overridden) {
rectArea.setTop(qMin(rectArea.top(), other->geometry().top()));
- rectArea.setBottom(qMax(rectArea.bottom(), other->geometry().bottom()));
+ rectArea.setBottom(
+ qMax(rectArea.bottom(), other->geometry().bottom()));
break;
} else {
rectArea.setTop(other->geometry().top());
@@ -163,17 +170,22 @@
bool overridden = false;
// find all the vertical anchors
foreach(HbAnchor *anchor, anchors) {
- if (anchor->mStartEdge == Hb::TopEdge || anchor->mStartEdge == Hb::BottomEdge ||anchor->mStartEdge == Hb::CenterVEdge) {
+ if (anchor->mStartEdge == Hb::TopEdge ||
+ anchor->mStartEdge == Hb::BottomEdge ||
+ anchor->mStartEdge == Hb::CenterVEdge) {
QGraphicsLayoutItem *other = 0;
if (anchor->mStartItem == layoutItem && anchor->mEndItem != mLayout) {
other = anchor->mEndItem;
- } else if (anchor->mEndItem == layoutItem && anchor->mStartItem != mLayout) {
+ } else if (anchor->mEndItem == layoutItem &&
+ anchor->mStartItem != mLayout) {
other = anchor->mStartItem;
}
if (other) {
if (overridden) {
- rectArea.setLeft(qMin(rectArea.left(), other->geometry().left()));
- rectArea.setRight(qMax(rectArea.right(), other->geometry().right()));
+ rectArea.setLeft(
+ qMin(rectArea.left(), other->geometry().left()));
+ rectArea.setRight(
+ qMax(rectArea.right(), other->geometry().right()));
break;
} else {
rectArea.setLeft(other->geometry().left());
@@ -205,7 +217,8 @@
if (anchor->mStartItem) {
if (QGraphicsItem *asGraphicsItem = anchor->mStartItem->graphicsItem()) {
if (asGraphicsItem->isWidget()) {
- const QGraphicsWidget *widget = static_cast<const QGraphicsWidget *>(asGraphicsItem);
+ const QGraphicsWidget *widget =
+ static_cast<const QGraphicsWidget *>(asGraphicsItem);
QString itemText(widget->metaObject()->className());
if (itemText == "HbFrameItem"
|| itemText == "HbTouchArea") {
@@ -214,7 +227,8 @@
}
}
}
- // if edge is connected to parent on same edge, and if the gap is zero, then don't show an arrow head
+ // if edge is connected to parent on same edge, and if the gap is zero,
+ // then don't show an arrow head
if(anchor->mEndItem->isLayout()
&& anchor->mStartEdge == anchor->mEndEdge
&& anchor->mValue == 0) {
@@ -346,7 +360,7 @@
QColor arrowColor = mLayout->isValid()
? mValidColor
: mInvalidColor;
- QColor centerColor = Qt::yellow;
+ QColor centerColor = Qt::yellow; //krazy:exclude=qenums
myPen.setWidth(LINE_WIDTH);
myPen.setColor(arrowColor);
--- a/src/hbcore/gui/hbanchorarrowdrawer_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbanchorarrowdrawer_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -36,7 +36,7 @@
Q_OBJECT
public:
- HbAnchorArrowDrawer(HbMeshLayout* mesh, QGraphicsItem *parent = 0);
+ explicit HbAnchorArrowDrawer(HbMeshLayout* mesh, QGraphicsItem *parent = 0);
virtual ~HbAnchorArrowDrawer();
public slots:
--- a/src/hbcore/gui/hbbackgrounditem.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbbackgrounditem.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -23,17 +23,16 @@
**
****************************************************************************/
-#include <QGraphicsSceneResizeEvent>
-#include <QPainter>
-#include <QObject>
-#include <QDebug>
-
#include "hbbackgrounditem_p.h"
#include "hbwidget_p.h"
#include "hbinstance.h"
#include "hbdeviceprofile.h"
#include "hbevent.h"
#include "hbmainwindow_p.h"
+#include <QGraphicsSceneResizeEvent>
+#include <QPainter>
+#include <QObject>
+#include <QDebug>
/*
\class HbBackgroundItem
@@ -44,11 +43,11 @@
*/
HbBackgroundItem::HbBackgroundItem(HbMainWindow *mainWindow, QGraphicsWidget *parent) :
- HbWidget(parent),
- mMainWindow(mainWindow),
- mImageMode(Hb::ScaleBackgroundToFit)
+ HbWidget(parent),
+ mMainWindow(mainWindow),
+ mImageMode(Hb::ScaleBackgroundToFit)
{
- setSizePolicy( QSizePolicy::Ignored, QSizePolicy::Ignored );
+ setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
mPrtImageName = defaultImageName(Qt::Vertical);
mLscImageName = defaultImageName(Qt::Horizontal);
@@ -86,8 +85,8 @@
QString HbBackgroundItem::defaultImageName(Qt::Orientation orientation) const
{
return orientation == Qt::Vertical
- ? QLatin1String("qtg_graf_screen_bg_prt")
- : QLatin1String("qtg_graf_screen_bg_lsc");
+ ? QLatin1String("qtg_graf_screen_bg_prt")
+ : QLatin1String("qtg_graf_screen_bg_lsc");
}
void HbBackgroundItem::setImageMode(Hb::BackgroundImageMode mode)
@@ -116,12 +115,10 @@
mBackground.setIconName(mLscImageName);
}
if (mImageMode == Hb::KeepOriginalBackgroundSize
- || mImageMode == Hb::KeepOriginalBackgroundSizeIfSmaller)
- {
+ || mImageMode == Hb::KeepOriginalBackgroundSizeIfSmaller) {
QSizeF imageSize = mBackground.defaultSize();
if (mImageMode == Hb::KeepOriginalBackgroundSize
- || (imageSize.width() <= size.width() && imageSize.height() <= size.height()))
- {
+ || (imageSize.width() <= size.width() && imageSize.height() <= size.height())) {
size = imageSize;
}
}
--- a/src/hbcore/gui/hbbackgrounditem_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbbackgrounditem_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -32,8 +32,9 @@
class HB_CORE_PRIVATE_EXPORT HbBackgroundItem : public HbWidget
{
Q_OBJECT
+
public:
- HbBackgroundItem(HbMainWindow *mainWindow, QGraphicsWidget *parent = 0);
+ explicit HbBackgroundItem(HbMainWindow *mainWindow, QGraphicsWidget *parent = 0);
~HbBackgroundItem();
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
@@ -41,7 +42,9 @@
bool event(QEvent *e);
enum { Type = HbPrivate::ItemType_BackgroundItem };
- int type() const { return Type; }
+ int type() const {
+ return Type;
+ }
void setImageName(Qt::Orientation orientation, const QString &name);
QString imageName(Qt::Orientation orientation) const;
--- a/src/hbcore/gui/hbcontentwidget.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbcontentwidget.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -42,7 +42,7 @@
\internal
*/
-HbContentWidget::HbContentWidget(HbMainWindow *mainWindow,QGraphicsItem *parent /*= 0*/):
+HbContentWidget::HbContentWidget(HbMainWindow *mainWindow, QGraphicsItem *parent /*= 0*/):
HbStackedWidget(parent),
mViewSwitchRunning(false),
mTargetView(0),
@@ -55,15 +55,14 @@
{
Q_UNUSED(constraint);
- QSizeF size;
+ QSizeF size;
switch (which) {
case Qt::MinimumSize:
size = QSizeF(0, 0);
break;
-
- case Qt::PreferredSize:
- {
+
+ case Qt::PreferredSize: {
HbDeviceProfile profile(HbDeviceProfile::profile(this));
size = profile.logicalSize();
if (!size.isValid()) {
@@ -200,7 +199,7 @@
// 2nd param (hideOld): We still want to see the old view (normally setCurrentWidget would hide it).
// 3rd param (showNew): The new view is not yet needed (the effect will take care of making it visible).
setCurrentWidget(mTargetView, false, false);
-
+
mHidingView = viewToHide;
mViewSwitchFlags = flags;
@@ -208,7 +207,7 @@
if (effectTarget) {
mMainWindow->setInteractive(false); // disable input while the effects are running
QString event = getEffectEvent("hide", flags, viewToHide, mTargetView);
- HbEffectInternal::EffectFlags effectFlags =
+ HbEffectInternal::EffectFlags effectFlags =
HbEffectInternal::ClearEffectWhenFinished // the effect must not be persistent
| HbEffectInternal::HideRegItemBeforeClearingEffect; // to prevent unlikely, but possible flicker
HbEffectInternal::start(viewToHide, effectTarget, effectFlags,
--- a/src/hbcore/gui/hbcontentwidget_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbcontentwidget_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -44,7 +44,9 @@
void delayedConstruction();
void setTargetView(HbView *view);
void runViewSwitchEffectHide(HbView *viewToHide, Hb::ViewSwitchFlags flags);
- bool isSwitchingViews() const { return mViewSwitchRunning; }
+ bool isSwitchingViews() const {
+ return mViewSwitchRunning;
+ }
private slots:
void hideEffectFinished(HbEffect::EffectStatus status);
--- a/src/hbcore/gui/hbcssinspector_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbcssinspector_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -140,10 +140,10 @@
static QString convertEffectiveSizeHintToText(const QGraphicsWidget *item, Qt::SizeHint which)
{
- QString hintText("(");
+ QString hintText('(');
const QSizeF &size = item->effectiveSizeHint(which);
- hintText += convertMeasurementToText(item, size.width()) + ",";
- hintText += convertMeasurementToText(item, size.height()) + ")";
+ hintText += convertMeasurementToText(item, size.width()) + ',';
+ hintText += convertMeasurementToText(item, size.height()) + ')';
return hintText;
}
@@ -152,8 +152,8 @@
QString sizeHint;
if (item->isWidget()) {
const QGraphicsWidget *widget = static_cast<const QGraphicsWidget*>(item);
- sizeHint += convertEffectiveSizeHintToText(widget, Qt::MinimumSize)+"|";
- sizeHint += convertEffectiveSizeHintToText(widget, Qt::PreferredSize)+"|";
+ sizeHint += convertEffectiveSizeHintToText(widget, Qt::MinimumSize)+'|';
+ sizeHint += convertEffectiveSizeHintToText(widget, Qt::PreferredSize)+'|';
sizeHint += convertEffectiveSizeHintToText(widget, Qt::MaximumSize);
}
return sizeHint;
@@ -217,7 +217,8 @@
}
-QString HbCssInspectorWindow::meshItemsToHtmlInfo(HbMeshLayout *mesh, const QString itemName, const QString layoutName)
+QString HbCssInspectorWindow::meshItemsToHtmlInfo(
+ HbMeshLayout *mesh, const QString itemName, const QString layoutName)
{
QString html;
QString widgetML;
@@ -228,12 +229,17 @@
QString str = syntax.lexemValue(HbXmlLoaderAbstractSyntax::TYPE_HBWIDGET);
xmlWriter.writeStartElement(syntax.lexemValue(HbXmlLoaderAbstractSyntax::TYPE_HBWIDGET));
- xmlWriter.writeAttribute(syntax.lexemValue(HbXmlLoaderAbstractSyntax::ATTR_VERSION), HbWidgetLoaderSyntax::version());
+ xmlWriter.writeAttribute(
+ syntax.lexemValue(
+ HbXmlLoaderAbstractSyntax::ATTR_VERSION), HbWidgetLoaderSyntax::version());
xmlWriter.writeAttribute(syntax.lexemValue(HbXmlLoaderAbstractSyntax::ATTR_TYPE), itemName);
xmlWriter.writeStartElement(syntax.lexemValue(HbXmlLoaderAbstractSyntax::TYPE_LAYOUT));
xmlWriter.writeAttribute(syntax.lexemValue(HbXmlLoaderAbstractSyntax::ATTR_NAME), layoutName);
- xmlWriter.writeAttribute(syntax.lexemValue(HbXmlLoaderAbstractSyntax::ATTR_TYPE), syntax.lexemValue(HbXmlLoaderAbstractSyntax::LAYOUT_MESH));
+ xmlWriter.writeAttribute(
+ syntax.lexemValue(
+ HbXmlLoaderAbstractSyntax::ATTR_TYPE),
+ syntax.lexemValue(HbXmlLoaderAbstractSyntax::LAYOUT_MESH));
if (mesh) {
QList<HbAnchor*> anchors = HbMeshLayoutDebug::getAnchors(mesh);
@@ -246,9 +252,11 @@
QGraphicsItem *asGraphicsItem = mesh->parentLayoutItem()->graphicsItem();
if ( asGraphicsItem && asGraphicsItem->isWidget() ){
- HbWidget *asWidget = qobject_cast<HbWidget*>( static_cast<QGraphicsWidget*>(asGraphicsItem) );
+ HbWidget *asWidget = qobject_cast<HbWidget*>(
+ static_cast<QGraphicsWidget*>(asGraphicsItem) );
if( asWidget ) {
- HbWidgetPrivate*priv = static_cast<HbWidgetPrivate*>(HbWidgetBasePrivate::d_ptr(asWidget));
+ HbWidgetPrivate*priv =
+ static_cast<HbWidgetPrivate*>(HbWidgetBasePrivate::d_ptr(asWidget));
if (startName.isEmpty()) {
startName = priv->mSpacers.key(anchor->mStartItem);
@@ -267,11 +275,13 @@
xmlWriter.writeAttribute(
syntax.lexemValue(HbXmlLoaderAbstractSyntax::ML_SRC_NAME), startName);
xmlWriter.writeAttribute(
- syntax.lexemValue(HbXmlLoaderAbstractSyntax::ML_SRC_EDGE), anchorEdgeName(anchor->mStartEdge));
+ syntax.lexemValue(
+ HbXmlLoaderAbstractSyntax::ML_SRC_EDGE), anchorEdgeName(anchor->mStartEdge));
xmlWriter.writeAttribute(
syntax.lexemValue(HbXmlLoaderAbstractSyntax::ML_DST_NAME), endName);
xmlWriter.writeAttribute(
- syntax.lexemValue(HbXmlLoaderAbstractSyntax::ML_DST_EDGE), anchorEdgeName(anchor->mEndEdge));
+ syntax.lexemValue(
+ HbXmlLoaderAbstractSyntax::ML_DST_EDGE), anchorEdgeName(anchor->mEndEdge));
if ( !spacingText.isEmpty() ) {
xmlWriter.writeAttribute(
syntax.lexemValue(HbXmlLoaderAbstractSyntax::ML_SPACING), spacingText);
@@ -284,13 +294,13 @@
xmlWriter.writeEndElement(); // widgetml
html = widgetML;
- html.remove(0, html.indexOf("<")); // trim whitespace
- html.replace("<", "<");
- html.replace(">", ">");
+ html.remove(0, html.indexOf('<')); // trim whitespace
+ html.replace('<', "<");
+ html.replace('>', ">");
html.replace(QRegExp("\"([^\"]*)\""), "\"<span>\\1</span>\""); // Add span elements around things in quotes
- html.replace("\"", """);
+ html.replace('\"', """);
html.replace("\n\n", "\n");
- html.replace("\n", "<br/>");
+ html.replace('\n', "<br/>");
html.insert(0, WIDGETML_HTML_HEADER);
html.append(WIDGETML_HTML_FOOTER);
@@ -446,12 +456,13 @@
}
-static void drawPolicyIcons(QPainter *painter, Qt::Orientation direction, QSizePolicy policy, const QRectF &itemRect)
+static void drawPolicyIcons(
+ QPainter *painter, Qt::Orientation direction, QSizePolicy policy, const QRectF &itemRect)
{
bool vert = direction == Qt::Vertical;
QSizePolicy::Policy pol = vert ? policy.verticalPolicy() : policy.horizontalPolicy();
- const QBrush fillBrush(Qt::gray, Qt::SolidPattern);
+ const QBrush fillBrush(Qt::gray, Qt::SolidPattern); //krazy:exclude=qenums
const QBrush hollowBrush(Qt::white, Qt::SolidPattern);
const QRectF rect = itemRect.adjusted(HOVER_BOX_PEN_WIDTH/2, HOVER_BOX_PEN_WIDTH/2,
-HOVER_BOX_PEN_WIDTH/2, -HOVER_BOX_PEN_WIDTH/2);
@@ -462,11 +473,13 @@
bool drawSecondIcons;
if (vert) {
- drawSecondIcons = (3*SIZE_PREF_DRAW_SIZE) + rect.top() <= hLinePos + SIZE_PREF_ALLOWED_OVERLAP;
- painter->drawLine(linePos, rect.top(), linePos, rect.bottom());
+ drawSecondIcons = (3*SIZE_PREF_DRAW_SIZE) + rect.top() <=
+ hLinePos + SIZE_PREF_ALLOWED_OVERLAP;
+ painter->drawLine(linePos, (int)(rect.top()), linePos, (int)(rect.bottom()));
} else {
- drawSecondIcons = rect.right() - (3*SIZE_PREF_DRAW_SIZE) >= vLinePos - SIZE_PREF_ALLOWED_OVERLAP;
- painter->drawLine(rect.left(), linePos, rect.right(), linePos);
+ drawSecondIcons = rect.right() - (3*SIZE_PREF_DRAW_SIZE) >=
+ vLinePos - SIZE_PREF_ALLOWED_OVERLAP;
+ painter->drawLine((int)(rect.left()), linePos, (int)(rect.right()), linePos);
}
// Ignore icons have different rules
@@ -538,19 +551,19 @@
paintRect(painter, mItemRect);
}
if (mShowMinHintBox) {
- painter->setPen(QPen(Qt::blue, HOVER_BOX_PEN_WIDTH));
+ painter->setPen(QPen(Qt::blue, HOVER_BOX_PEN_WIDTH)); //krazy:exclude=qenums
QRectF rect = mMinHintRect;
rect.moveCenter(mItemRect.center());
paintRect(painter, rect);
}
if (mShowPrefHintBox) {
- painter->setPen(QPen(Qt::green, HOVER_BOX_PEN_WIDTH));
+ painter->setPen(QPen(Qt::green, HOVER_BOX_PEN_WIDTH)); //krazy:exclude=qenums
QRectF rect = mPrefHintRect;
rect.moveCenter(mItemRect.center());
paintRect(painter, rect);
}
if (mShowMaxHintBox) {
- painter->setPen(QPen(Qt::red, HOVER_BOX_PEN_WIDTH));
+ painter->setPen(QPen(Qt::red, HOVER_BOX_PEN_WIDTH)); //krazy:exclude=qenums
QRectF rect = mMaxHintRect;
rect.moveCenter(mItemRect.center());
paintRect(painter, rect);
@@ -589,7 +602,7 @@
// Draw the size prefs icons
if (mShowSizePrefs) {
- painter->setPen(QPen(Qt::gray, SIZE_PREF_LINE_WIDTH));
+ painter->setPen(QPen(Qt::gray, SIZE_PREF_LINE_WIDTH)); //krazy:exclude=qenums
if (mItemRect.height() > SIZE_PREF_MINIMUM_THRESHOLD) {
drawPolicyIcons(painter, Qt::Horizontal, mItemPolicy, mItemRect);
}
@@ -676,19 +689,30 @@
HoveredWidgetFilter *filter = new HoveredWidgetFilter(window->scene());
window->scene()->installEventFilter(filter);
mInstalledFilters.append(filter);
- connect(filter, SIGNAL(newItemHovered(const QGraphicsItem*)), SLOT(updateFocusItem(const QGraphicsItem*)));
+ connect(filter, SIGNAL(newItemHovered(const QGraphicsItem*)),
+ SLOT(updateFocusItem(const QGraphicsItem*)));
- connect(mObjectNameCheck, SIGNAL(toggled(bool)), filter->mCssInfoDrawer, SLOT(setItemTextVisible(bool)));
- connect(mAnchorArrowsCheck, SIGNAL(toggled(bool)), filter->mArrowDrawer, SLOT(setDrawArrows(bool)));
- connect(mSubitemOutlinesCheck, SIGNAL(toggled(bool)), filter->mArrowDrawer, SLOT(setDrawOutlines(bool)));
- connect(mSpacersCheck, SIGNAL(toggled(bool)), filter->mArrowDrawer, SLOT(setDrawSpacers(bool)));
- connect(mGuideLinesCheck, SIGNAL(toggled(bool)), filter->mCssInfoDrawer, SLOT(setGuideLinesVisible(bool)));
+ connect(mObjectNameCheck, SIGNAL(toggled(bool)), filter->mCssInfoDrawer,
+ SLOT(setItemTextVisible(bool)));
+ connect(mAnchorArrowsCheck, SIGNAL(toggled(bool)), filter->mArrowDrawer,
+ SLOT(setDrawArrows(bool)));
+ connect(mSubitemOutlinesCheck, SIGNAL(toggled(bool)), filter->mArrowDrawer,
+ SLOT(setDrawOutlines(bool)));
+ connect(mSpacersCheck, SIGNAL(toggled(bool)), filter->mArrowDrawer,
+ SLOT(setDrawSpacers(bool)));
+ connect(mGuideLinesCheck, SIGNAL(toggled(bool)), filter->mCssInfoDrawer,
+ SLOT(setGuideLinesVisible(bool)));
- connect(mSizeHintTextCheck, SIGNAL(toggled(bool)), filter->mCssInfoDrawer, SLOT(setHintTextVisible(bool)));
- connect(mMinSizeHintCheck, SIGNAL(toggled(bool)), filter->mCssInfoDrawer, SLOT(setMinHintBoxVisible(bool)));
- connect(mPrefSizeHintCheck, SIGNAL(toggled(bool)), filter->mCssInfoDrawer, SLOT(setPrefHintBoxVisible(bool)));
- connect(mMaxSizeHintCheck, SIGNAL(toggled(bool)), filter->mCssInfoDrawer, SLOT(setMaxHintBoxVisible(bool)));
- connect(mSizePrefCheck, SIGNAL(toggled(bool)), filter->mCssInfoDrawer, SLOT(setSizePrefsVisible(bool)));
+ connect(mSizeHintTextCheck, SIGNAL(toggled(bool)), filter->mCssInfoDrawer,
+ SLOT(setHintTextVisible(bool)));
+ connect(mMinSizeHintCheck, SIGNAL(toggled(bool)), filter->mCssInfoDrawer,
+ SLOT(setMinHintBoxVisible(bool)));
+ connect(mPrefSizeHintCheck, SIGNAL(toggled(bool)), filter->mCssInfoDrawer,
+ SLOT(setPrefHintBoxVisible(bool)));
+ connect(mMaxSizeHintCheck, SIGNAL(toggled(bool)), filter->mCssInfoDrawer,
+ SLOT(setMaxHintBoxVisible(bool)));
+ connect(mSizePrefCheck, SIGNAL(toggled(bool)), filter->mCssInfoDrawer,
+ SLOT(setSizePrefsVisible(bool)));
connect(mHoverRadio, SIGNAL(toggled(bool)), filter, SLOT(setHoverMode(bool)));
connect(mBlockRadio, SIGNAL(toggled(bool)), filter, SLOT(setBlockingMode(bool)));
@@ -834,10 +858,12 @@
NODEPTR_N(widget);
HbDeviceProfile profile(HbDeviceProfile::profile(widget));
- HbLayeredStyleLoader *layoutStack = HbLayeredStyleLoader::getStack(HbLayeredStyleLoader::Concern_Layouts);
+ HbLayeredStyleLoader *layoutStack =
+ HbLayeredStyleLoader::getStack(HbLayeredStyleLoader::Concern_Layouts);
if (layoutStack) {
// Update layout CSS box
- HbVector<HbCss::StyleRule> layoutRules = layoutStack->styleRulesForNode(n, profile.orientation());
+ HbVector<HbCss::StyleRule> layoutRules =
+ layoutStack->styleRulesForNode(n, profile.orientation());
mLayoutCssBox->setHtml(CSS_HTML_HEADER + HbCssFormatter::styleRulesToHtml(layoutRules));
// Get layoutname from CSS
@@ -847,7 +873,7 @@
HbCss::ValueExtractor extractor(decls, profile);
QString layoutName;
QString sectionName;
- extractor.extractLayout(&layoutName, §ionName);
+ extractor.extractLayout(layoutName, sectionName);
// Update widgetML box
QString html;
@@ -860,9 +886,11 @@
}
// Update colours CSS box
- HbLayeredStyleLoader *colorsStack = HbLayeredStyleLoader::getStack(HbLayeredStyleLoader::Concern_Colors);
+ HbLayeredStyleLoader *colorsStack =
+ HbLayeredStyleLoader::getStack(HbLayeredStyleLoader::Concern_Colors);
if (colorsStack) {
- HbVector<HbCss::StyleRule> colorRules = colorsStack->styleRulesForNode(n, profile.orientation());
+ HbVector<HbCss::StyleRule> colorRules =
+ colorsStack->styleRulesForNode(n, profile.orientation());
mColorsCssBox->setHtml(CSS_HTML_HEADER + HbCssFormatter::styleRulesToHtml(colorRules));
}
@@ -963,7 +991,8 @@
}
HoveredWidgetFilter::HoveredWidgetFilter(QGraphicsScene *scene)
- : mScene(scene), mCurrentItem(0), mArrowDrawer(0), mCssInfoDrawer(0), mHoverMode(true), mBlockingMode(false)
+ : mScene(scene), mCurrentItem(0), mArrowDrawer(0),
+ mCssInfoDrawer(0), mHoverMode(true), mBlockingMode(false)
{
mCssInfoDrawer = new HbCssInfoDrawer(0);
mScene->addItem(mCssInfoDrawer);
@@ -974,8 +1003,10 @@
mCssInfoDrawer->setZValue(HbPrivate::PopupZValueRangeEnd + ABOVE_POPUP_ZVALUE);
mArrowDrawer->setZValue(HbPrivate::PopupZValueRangeEnd + ABOVE_POPUP_ZVALUE);
- connect(this, SIGNAL(newItemHovered(const QGraphicsItem*)), mCssInfoDrawer, SLOT(updateFocusItem(const QGraphicsItem*)));
- connect(this, SIGNAL(newItemHovered(const QGraphicsItem*)), mArrowDrawer, SLOT(updateFocusItem(const QGraphicsItem*)));
+ connect(this, SIGNAL(newItemHovered(const QGraphicsItem*)),
+ mCssInfoDrawer, SLOT(updateFocusItem(const QGraphicsItem*)));
+ connect(this, SIGNAL(newItemHovered(const QGraphicsItem*)),
+ mArrowDrawer, SLOT(updateFocusItem(const QGraphicsItem*)));
}
HoveredWidgetFilter::~HoveredWidgetFilter()
--- a/src/hbcore/gui/hbcssinspector_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbcssinspector_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -125,7 +125,7 @@
Q_OBJECT
public:
- CodeWidget(const QString &title, QWidget *parent=0);
+ explicit CodeWidget(const QString &title, QWidget *parent=0);
virtual ~CodeWidget();
public slots:
void setText(const QString &text);
--- a/src/hbcore/gui/hbdevice.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbdevice.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -32,13 +32,13 @@
}
HbDeviceView::HbDeviceView(HbMainWindow *window, QWidget *parent) :
-QGraphicsView(parent), mMainWindow(window), mAngle(0), mLastPos(0,0),
-mMouseMove(false)
+ QGraphicsView(parent), mMainWindow(window), mAngle(0), mLastPos(0, 0),
+ mMouseMove(false)
{
Q_UNUSED(parent);
//Set background
- setBackgroundBrush(QBrush(QColor(0,0,0),Qt::SolidPattern/*Qt::VerPattern*/));
+ setBackgroundBrush(QBrush(QColor(0, 0, 0), Qt::SolidPattern/*Qt::VerPattern*/));
//Take scene from window
setScene(mMainWindow->scene());
@@ -48,12 +48,12 @@
qreal y = mMainWindow->rect().y();
int h = profile.logicalSize().height();
int w = profile.logicalSize().width();
-
+
//Centralize
setSceneRect(x, y, w, h);
setDragMode(QGraphicsView::NoDrag/*QGraphicsView::ScrollHandDrag*/);
- connect(mMainWindow, SIGNAL(orientationChanged(Qt::Orientation)), this, SLOT(orientationChanged(Qt::Orientation)));
+ connect(mMainWindow, SIGNAL(orientationChanged(Qt::Orientation)), this, SLOT(orientationChanged(Qt::Orientation)));
}
HbDeviceView::~HbDeviceView()
@@ -63,22 +63,22 @@
void HbDeviceView::rotateDevice(int angle)
{
//Store angle and block turning more than 90 or -90 degrees
- mAngle = mAngle+angle;
- if ( mAngle < -90 || mAngle > 90 ){
+ mAngle = mAngle + angle;
+ if (mAngle < -90 || mAngle > 90) {
if (mAngle < -90) {
mAngle = -90;
} else {
- mAngle = 90;
+ mAngle = 90;
}
return;
}
rotate(angle);
- // For special purpose, if needed..
- if (mAngle == 0) {
- }else if (mAngle == 90) {
- }else if (mAngle == -90) {
+// For special purpose, if needed..
+ if (mAngle == 0) {
+ } else if (mAngle == 90) {
+ } else if (mAngle == -90) {
}
}
@@ -92,8 +92,8 @@
//This is needed to centralize mMainWindow
setSceneRect(0, 0, w, h);
- if(!mMouseMove) {
- resize(w+5, h+5);
+ if (!mMouseMove) {
+ resize(w + 5, h + 5);
}
}
@@ -101,12 +101,12 @@
//Remove black "frames"
void HbDeviceView::compressDevice()
{
- if(mAngle <0 ) {
- rotate(+(-mAngle));
+ if (mAngle < 0) {
+ rotate(+(-mAngle));
mAngle = 0;
} else {
- rotate(-(+mAngle));
- mAngle = 0;
+ rotate(-(+mAngle));
+ mAngle = 0;
}
HbDeviceProfile profile = HbDeviceProfile::profile(mMainWindow);
@@ -114,31 +114,30 @@
int w = profile.logicalSize().width();
setSceneRect(0, 0, w, h);
- resize(w+5, h+5);
+ resize(w + 5, h + 5);
}
//Catch mouse move event and rotate this view
void HbDeviceView::mouseMoveEvent(QMouseEvent *event)
-{
+{
if (!mMouseMove || itemAt(event->pos())) {
return;
- }
- if ((event->buttons() & Qt::LeftButton)) {
+ }
+ if ((event->buttons() & Qt::LeftButton)) {
if (event->pos().x() < mLastPos.x()) {
rotateDevice(-10);
- }else if (event->pos().x() > mLastPos.x()) {
+ } else if (event->pos().x() > mLastPos.x()) {
rotateDevice(10);
}
- mLastPos = event->pos();
+ mLastPos = event->pos();
}
}
void HbDeviceView::keyPressEvent(QKeyEvent *event)
{
//If "Ctrl+D" is pressed, enable or disable rotate
- if(event->modifiers() == Qt::ControlModifier && event->key() == Qt::Key_D )
- {
- if(!mMouseMove) {
+ if (event->modifiers() == Qt::ControlModifier && event->key() == Qt::Key_D) {
+ if (!mMouseMove) {
mMouseMove = true;
enableDevice(true);
} else {
@@ -150,7 +149,7 @@
void HbDeviceView::enableDevice(bool enable)
{
- if(enable) {
+ if (enable) {
resize(900, 900);
} else {
compressDevice();
--- a/src/hbcore/gui/hbdevice_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbdevice_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -27,23 +27,23 @@
#include <hbmainwindow.h>
#include <QObject>
-#ifndef HBDEVICE_VIEW_H
-#define HBDEVICE_VIEW_H
+#ifndef HBDEVICE_P_H
+#define HBDEVICE_P_H
class HbMainWindow;
class HbDeviceView: public QGraphicsView
{
+ Q_OBJECT
- Q_OBJECT
public:
HbDeviceView();
- HbDeviceView(HbMainWindow *window, QWidget *parent = 0);
+ explicit HbDeviceView(HbMainWindow *window, QWidget *parent = 0);
virtual ~HbDeviceView();
protected:
void mouseMoveEvent(QMouseEvent *event);
- void keyPressEvent(QKeyEvent *event);
+ void keyPressEvent(QKeyEvent *event);
public slots:
void orientationChanged(Qt::Orientation orientation);
@@ -60,4 +60,4 @@
bool mMouseMove;
};
-#endif //HBDEVICE_VIEW_H
+#endif // HBDEVICE_P_H
--- a/src/hbcore/gui/hbdevicefadecontrolsym.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbdevicefadecontrolsym.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -41,8 +41,8 @@
{
public:
struct FadeControl {
- int fadeOff:1; // command for application to unfade
- int spare:31;
+ int fadeOff: 1; // command for application to unfade
+ int spare: 31;
};
public:
@@ -87,6 +87,7 @@
CActiveScheduler::Add(this);
start();
}
+ process.Close();
}
HbDeviceFadeControlPrivate::~HbDeviceFadeControlPrivate()
--- a/src/hbcore/gui/hbdialog.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbdialog.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -384,7 +384,8 @@
bool HbDialog::event(QEvent *event)
{
Q_D(HbDialog);
- event->accept();
+ if(event->type() != QEvent::ShortcutOverride && event->type() != QEvent::GestureOverride)
+ event->accept();
if (event->type() == QEvent::ActionAdded) {
if (!d->toolBar) {
--- a/src/hbcore/gui/hbdockwidget.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbdockwidget.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -67,6 +67,7 @@
Q_D(HbDockWidget);
d->q_ptr = this;
setFlag( QGraphicsItem::ItemClipsChildrenToShape, true );
+ setFlag(QGraphicsItem::ItemHasNoContents, true);
}
/*!
@@ -78,6 +79,7 @@
Q_D(HbDockWidget);
d->q_ptr = this;
setFlag( QGraphicsItem::ItemClipsChildrenToShape, true );
+ setFlag(QGraphicsItem::ItemHasNoContents, true);
}
/*!
--- a/src/hbcore/gui/hbfadeitem.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbfadeitem.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -41,8 +41,8 @@
{
Q_DECLARE_PUBLIC(HbFadeItem)
- public:
- HbFadeItemPrivate( );
+public:
+ HbFadeItemPrivate();
virtual ~HbFadeItemPrivate();
void init();
@@ -75,7 +75,7 @@
q->setFlag(QGraphicsItem::ItemIsFocusable);
}
-HbFadeItem::HbFadeItem( QGraphicsItem *parent ) : HbWidget(*new HbFadeItemPrivate, parent)
+HbFadeItem::HbFadeItem(QGraphicsItem *parent) : HbWidget(*new HbFadeItemPrivate, parent)
{
Q_D(HbFadeItem);
d->q_ptr = this;
@@ -92,12 +92,12 @@
QRectF HbFadeItem::boundingRect() const
{
Q_D(const HbFadeItem);
- if(!d->mRect.isValid()){
+ if (!d->mRect.isValid()) {
// set size so that it is big enough
// to cover the screen both landscape and portrait mode
const QSizeF screenSize = HbDeviceProfile::profile(this).logicalSize();
qreal dim = qMax(screenSize.width(), screenSize.height());
- d->mRect.adjust(0,0,dim,dim);
+ d->mRect.adjust(0, 0, dim, dim);
}
return d->mRect;
}
--- a/src/hbcore/gui/hbfadeitem_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbfadeitem_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -36,12 +36,14 @@
Q_OBJECT
public:
- HbFadeItem( QGraphicsItem *parent = 0 );
+ HbFadeItem(QGraphicsItem *parent = 0);
QRectF boundingRect() const;
enum { Type = HbPrivate::ItemType_FadeItem };
- int type() const { return Type; }
+ int type() const {
+ return Type;
+ }
protected:
HbFadeItem(HbFadeItemPrivate &dd, QGraphicsItem *parent = 0);
--- a/src/hbcore/gui/hblongpressvisualizer_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hblongpressvisualizer_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -23,6 +23,9 @@
**
****************************************************************************/
+#ifndef HBLONGPRESSVISUALIZER_P_H
+#define HBLONGPRESSVISUALIZER_P_H
+
#include <hbglobal.h>
#include <QPointF>
#include <QTimer>
@@ -51,3 +54,5 @@
QTimer mTimer;
QPointF mPos;
};
+
+#endif
--- a/src/hbcore/gui/hbmainwindow.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbmainwindow.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -23,6 +23,9 @@
**
****************************************************************************/
+#include "hbmainwindow.h"
+#include "hbmainwindow_p.h"
+
#include <QGraphicsView>
#include <QGraphicsWidget>
#include <QGraphicsItem>
@@ -35,8 +38,6 @@
#include "hbinstance.h"
#include "hbinstance_p.h"
#include "hbgraphicsscene.h"
-#include "hbmainwindow.h"
-#include "hbmainwindow_p.h"
#include "hbnamespace.h"
#include "hbnamespace_p.h"
#include "hbtitlebar_p.h"
@@ -208,7 +209,7 @@
class HbRootItem : public HbWidget
{
public:
- explicit HbRootItem( QGraphicsItem *parent = 0 );
+ explicit HbRootItem(QGraphicsItem *parent = 0);
~HbRootItem() {}
private:
bool event(QEvent *event);
@@ -216,13 +217,13 @@
/*!
Constructs an HbMainWindow object with \a parent.
-
+
\a windowFlags can be used for specifying special functionality to HbMainWindow.
-
+
\sa Hb::WindowFlag
*/
HbMainWindow::HbMainWindow(QWidget *parent, Hb::WindowFlags windowFlags):
- QGraphicsView(parent), d_ptr(new HbMainWindowPrivate)
+ QGraphicsView(parent), d_ptr(new HbMainWindowPrivate)
{
Q_D(HbMainWindow);
d->q_ptr = this;
@@ -264,7 +265,7 @@
d->mAutomaticOrientationSwitch = true;
} else {
d->mOrientation = d->mDefaultOrientation;
- d->mAutomaticOrientationSwitch = false;
+ d->mAutomaticOrientationSwitch = false;
}
#if defined(Q_WS_S60) || defined(HB_Q_WS_MAEMO)
@@ -281,7 +282,7 @@
// workaround for problems with BSP tree implementation in Qt
d->mScene->setItemIndexMethod(QGraphicsScene::NoIndex);
- d->mScene->setSceneRect(0, 0, pSize.width(), pSize.height());
+ d->mScene->setSceneRect(0, 0, pSize.width(), pSize.height());
setScene(d->mScene);
// add root item
@@ -305,8 +306,8 @@
d->mClippingItem->setStackWidget(d->mViewStackWidget);
connect(d->mViewStackWidget, SIGNAL(currentChanged(int)),
this, SLOT(_q_viewChanged()));
- connect(d->mViewStackWidget, SIGNAL(widgetRemoved(QGraphicsWidget*)),
- this, SLOT(_q_viewRemoved(QGraphicsWidget*)));
+ connect(d->mViewStackWidget, SIGNAL(widgetRemoved(QGraphicsWidget *)),
+ this, SLOT(_q_viewRemoved(QGraphicsWidget *)));
// create Titlebar (container for indicators, titlepane and secondary softkey
d->mTitleBar = new HbTitleBar(this, d->mClippingItem);
@@ -319,9 +320,9 @@
// At this point the mainwindow is considered more or less fully constructed.
HbInstancePrivate::d_ptr()->addWindow(this);
- QRectF rect(0,0,pSize.width(),pSize.height());
+ QRectF rect(0, 0, pSize.width(), pSize.height());
resize(pSize);
- d->mLayoutRect = rect;
+ d->mLayoutRect = rect;
d->mRootItem->setGeometry(rect);
d->mClippingItem->setGeometry(rect);
setSceneRect(0, 0, pSize.width(), pSize.height());
@@ -374,9 +375,9 @@
delete d_ptr;
// to workaround problem when creating/destroying multiple hbmainwindow's in unit tests (win env)
- #ifdef Q_OS_WIN
- destroy();
- #endif
+#ifdef Q_OS_WIN
+ destroy();
+#endif
}
/*!
@@ -384,20 +385,43 @@
\a widget creates an empty HbView.
The \a widget can be either a HbView or QGraphicsWidget. If it is
- the QGraphicsWidget then HbMainWindow will create a HbView and set
- \a widget as the new HbView's content widget.
+ a QGraphicsWidget (or any subclass that is not HbView) then
+ HbMainWindow will create a HbView and set \a widget as the new
+ HbView's content widget.
+
+ When \a widget is a HbView, use HbView::setWidget() to set the content
+ widget for the view. Note that you should never attach child items directly
+ to the HbView instance, even though HbView is also a HbWidget. Instead, create
+ a content widget, set it to the view via HbView::setWidget(), and attach children
+ to that.
+
+ Use setCurrentView() to switch between the added views. (only one of them is visible at a time)
+ The view-specific decorators (toolbar, Options menu, title in the titlebar) and of course
+ the visibility of the view's content widgets will be updated and managed automatically by the framework
+ when switching views.
+
+ For a detailed description of views see the HbView class.
+
+ Note that using view switching (i.e. several HbView instances, setCurrentView(), etc.) in
+ Hb applications is not mandatory, it is purely optional. For applications that are not really
+ view based (e.g. because they only have one screen of content or because they have more "fluid" UI where
+ the traditional view separation does not make that much sense) it may sometimes be better (and may provide more freedom)
+ to have just one view and manage the content entirely via the content widget of that one view.
+ (one can still use HbStackedLayout and manual visibility management of child widgets to achieve a traditional view-like look,
+ even when the Hb view management is not used)
+
+ After calling addView() the caller does not need to care about
+ destroying \a widget, the framework will take care of that by
+ reparenting \a widget if needed.
A HbMainWindow should only have one of each view and adding a view
it already has will not cause the same view to be in the
HbMainWindow twice.
- After calling addView() the caller does not need to care about
- destroying \a widget, the framework will take care of that by
- reparenting \a widget if needed.
-
\return the new view
- \sa insertView removeView
+ \sa insertView() removeView() setCurrentView()
+ \sa HbView HbStackedLayout
*/
HbView *HbMainWindow::addView(QGraphicsWidget *widget)
{
@@ -443,7 +467,7 @@
\sa addView removeView
*/
HbView *HbMainWindow::insertView(int index, QGraphicsWidget *widget)
-{
+{
Q_D(HbMainWindow);
HbView *view = 0;
if (!widget) {
@@ -492,8 +516,8 @@
d->mViewStackWidget->removeWidget(view);
} else {
// Check if it is a widget inside a view and delete that view
- for (int n=0; n<d->mViewStackWidget->count(); n++) {
- HbView *tempView = qobject_cast<HbView*>(d->mViewStackWidget->widgetAt(n));
+ for (int n = 0; n < d->mViewStackWidget->count(); n++) {
+ HbView *tempView = qobject_cast<HbView *>(d->mViewStackWidget->widgetAt(n));
if (tempView->widget() == widget) {
d->mViewStackWidget->removeWidget(tempView);
// Take a widget out from the view, before deleting it.
@@ -575,15 +599,15 @@
{
Q_D(const HbMainWindow);
HbContentWidget *stackWidget = d->mViewStackWidget;
-
+
const int n = stackWidget->count();
QList<HbView *> result;
- for ( int i=0; i<n; ++i ) {
+ for (int i = 0; i < n; ++i) {
HbView *view = qobject_cast<HbView *>(stackWidget->widgetAt(i));
Q_ASSERT_X(view, "HbMainWindow::views()", "HbView was expected");
result.append(view);
}
-
+
return result;
}
@@ -630,8 +654,9 @@
if (!d->mAutomaticOrientationSwitch) {
d->mAutomaticOrientationSwitch = true;
d->mUserOrientationSwitch = false;
- if(HbMainWindowOrientation::instance()->isEnabled())
+ if (HbMainWindowOrientation::instance()->isEnabled()) {
d->setTransformedOrientation(HbMainWindowOrientation::instance()->sensorOrientation(), animate);
+ }
}
}
@@ -688,14 +713,14 @@
/*!
Returns the rectangle which is used for layouting HbMainWindow contents. Updates on orientation change and is up to date
- after HbMainWindow orientationChanged() signal. Note that this is not the same thing as QGraphicsView (HbMainWindow) geometry.
+ after HbMainWindow orientationChanged() signal. Note that this is not the same thing as QGraphicsView (HbMainWindow) geometry.
HbMainWindow geometry does not update on orientation change since the contents are only transformed with a rotate transform.
-
+
*/
QRectF HbMainWindow::layoutRect() const
{
Q_D(const HbMainWindow);
- return d->mLayoutRect;
+ return d->mLayoutRect;
}
/*!
@@ -757,7 +782,7 @@
/*!
Sets the animations enabled when the orientation is changed automatically.
By default animations are enabled.
-
+
\sa automaticOrientationEffectEnabled()
*/
@@ -768,7 +793,7 @@
}
/*!
- Returns boolean value to signify whether animations enabled/disabled during
+ Returns boolean value to signify whether animations enabled/disabled during
automatic orientation change. By default animations are enabled.
\sa setAutomaticOrientationEffectEnabled()
@@ -789,12 +814,12 @@
// Notify layout direction change to the icon framework
HbLayoutDirectionNotifier::instance()->notifyLayoutDirectionChange();
- broadcastEvent( HbEvent::WindowLayoutDirectionChanged );
+ broadcastEvent(HbEvent::WindowLayoutDirectionChanged);
- foreach (QGraphicsItem *item, items()) {
- if (item->isWidget() && !item->parentItem() ) {
+ foreach(QGraphicsItem * item, items()) {
+ if (item->isWidget() && !item->parentItem()) {
QGraphicsWidget *widget = static_cast<QGraphicsWidget *>(item);
- if (!widget->testAttribute(Qt::WA_SetLayoutDirection)){
+ if (!widget->testAttribute(Qt::WA_SetLayoutDirection)) {
widget->setLayoutDirection(layoutDirection());
widget->setAttribute(Qt::WA_SetLayoutDirection, false);
}
@@ -820,7 +845,7 @@
// pass the soft key press into the soft key decorator class
HbAction *action = 0;
- switch(event->key()) {
+ switch (event->key()) {
#ifdef Q_OS_SYMBIAN
case Qt::Key_Context1:
@@ -876,19 +901,20 @@
{
Q_D(HbMainWindow);
- if ( !HbMainWindowPrivate::dragToResizeEnabled ) {
+ if (!HbMainWindowPrivate::dragToResizeEnabled) {
// determine the default orientation width < height -> portrait
- if (event->size().width() < event->size().height())
+ if (event->size().width() < event->size().height()) {
d->mDefaultOrientation = Qt::Vertical;
- else
+ } else {
d->mDefaultOrientation = Qt::Horizontal;
+ }
d->mForceSetOrientation = true;
d->setTransformedOrientation(d->mOrientation, false);
d->mForceSetOrientation = false;
} else {
// RnD feature for resizing the window by dragging
QSize newSize(event->size());
- setSceneRect(0,0,newSize.width(),newSize.height());
+ setSceneRect(0, 0, newSize.width(), newSize.height());
d->mClippingItem->resize(newSize);
if (d->mBgItem) {
d->mBgItem->resize(newSize);
@@ -899,15 +925,15 @@
/*!
Reimplemented from QObject::customEvent().
*/
-void HbMainWindow::customEvent( QEvent *event )
+void HbMainWindow::customEvent(QEvent *event)
{
Q_D(HbMainWindow);
if (event->type() == HbMainWindowPrivate::IdleEvent) { // called asyncronously after the application start-up
if (!d->mIdleEventHandled) {
d->mIdleEventHandled = true;
- if ( HbFeatureManager::instance()->featureStatus( HbFeatureManager::TheTestUtility ) ) {
+ if (HbFeatureManager::instance()->featureStatus(HbFeatureManager::TheTestUtility)) {
// create the test utility
- if ( !d->mTheTestUtility ) {
+ if (!d->mTheTestUtility) {
d->mTheTestUtility = new HbTheTestUtility(this);
}
}
@@ -924,7 +950,7 @@
// Notify that mainwindow is (most probably) ready.
// The signal must be emitted always, even when there was no need to do anything.
emit d->idleEventDispatched();
- } else if(event->type() == HbMainWindowPrivate::IdleOrientationEvent) { // complete the orientation change effect chain
+ } else if (event->type() == HbMainWindowPrivate::IdleOrientationEvent) { // complete the orientation change effect chain
if (d->mEffectItem && d->mOrientationChangeOngoing) {
HbEffect::start(d->mEffectItem, "rootItemFinalPhase", this, "rootItemFinalPhaseDone");
}
@@ -932,15 +958,21 @@
if (d->mAnimateOrientationSwitch) {
HbEffect::start(d->mTitleBar, "titlebar", "appear_orient");
HbEffect::start(d->mStatusBar, "statusbar", "appear_orient");
- if (d->mCurrentToolbar) {
+ if (d->mCurrentToolbar) {
HbToolBarPrivate *toolBarD = HbToolBarPrivate::d_ptr(d->mCurrentToolbar);
toolBarD->startAppearOrientEffect();
+ } else {
+ foreach(HbView * view, views()) {
+ view->toolBar()->resetTransform();
+ view->toolBar()->setOpacity(1);
+ view->toolBar()->show();
+ HbToolBarPrivate::d_ptr(view->toolBar())->mOrientationEffectsRunning = false;
+ }
}
- d->mOrientationChangeOngoing = false;
+ d->updateOrientationChangeStatus();
if (d->mAutomaticOrientationSwitch && HbMainWindowOrientation::instance()->isEnabled()) {
d->setTransformedOrientation(HbMainWindowOrientation::instance()->sensorOrientation(), d->mAnimateOrientationSwitch);
- }
- else if (d->mRequestedOrientation != d->mOrientation) {
+ } else if (d->mRequestedOrientation != d->mOrientation) {
d->setTransformedOrientation(d->mRequestedOrientation, d->mAnimateOrientationSwitch);
}
} else {
@@ -1010,12 +1042,12 @@
asynchronously.
If the receiving widget has abstract items as child items, these will be informed
- after the widget has received the event.
+ after the widget has received the event.
*/
-void HbMainWindow::broadcastEvent( int eventType )
+void HbMainWindow::broadcastEvent(int eventType)
{
Q_D(HbMainWindow);
- d->broadcastEvent( eventType );
+ d->broadcastEvent(eventType);
}
HbRootItem::HbRootItem(QGraphicsItem *parent)
--- a/src/hbcore/gui/hbmainwindow.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbmainwindow.h Fri Jun 11 13:58:22 2010 +0300
@@ -43,7 +43,7 @@
{
Q_OBJECT
- Q_PROPERTY(Qt::Orientation orientation
+ Q_PROPERTY(Qt::Orientation orientation
READ orientation
WRITE setOrientation
RESET unsetOrientation
@@ -79,7 +79,7 @@
bool automaticOrientationEffectEnabled() const;
public slots:
- void broadcastEvent( int eventType );
+ void broadcastEvent(int eventType);
signals:
void viewReady();
@@ -105,9 +105,9 @@
private:
Q_DISABLE_COPY(HbMainWindow)
Q_DECLARE_PRIVATE_D(d_ptr, HbMainWindow)
- Q_PRIVATE_SLOT(d_func(), void rootItemFirstPhaseDone(const HbEffect::EffectStatus& status))
- Q_PRIVATE_SLOT(d_func(), void rootItemFinalPhaseDone(const HbEffect::EffectStatus& status))
- Q_PRIVATE_SLOT(d_func(), void orientationEffectFinished(const HbEffect::EffectStatus& status))
+ Q_PRIVATE_SLOT(d_func(), void rootItemFirstPhaseDone(const HbEffect::EffectStatus &status))
+ Q_PRIVATE_SLOT(d_func(), void rootItemFinalPhaseDone(const HbEffect::EffectStatus &status))
+ Q_PRIVATE_SLOT(d_func(), void orientationEffectFinished(const HbEffect::EffectStatus &status))
Q_PRIVATE_SLOT(d_func(), void _q_viewChanged())
Q_PRIVATE_SLOT(d_func(), void _q_viewRemoved(QGraphicsWidget *))
Q_PRIVATE_SLOT(d_func(), void _q_viewTitleChanged(const QString &))
--- a/src/hbcore/gui/hbmainwindow_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbmainwindow_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -23,15 +23,11 @@
**
****************************************************************************/
-#include <QApplication>
-#include <QGraphicsLayout>
-#include <QLocale>
-#include <QDebug>
+#include "hbmainwindow_p.h"
#include "hbgraphicsscene.h"
#include "hbindicatorbutton_p.h"
#include "hbtitlebar_p.h"
#include "hbstatusbar_p.h"
-#include "hbmainwindow_p.h"
#include "hbmenu.h"
#include "hbnamespace.h"
#include "hbnamespace_p.h"
@@ -55,6 +51,11 @@
#include "hbcorepskeys_p.h"
#include "hbmainwindoworientation_p.h"
+#include <QApplication>
+#include <QGraphicsLayout>
+#include <QLocale>
+#include <QDebug>
+
#ifdef Q_OS_SYMBIAN
#include "hbnativewindow_sym_p.h"
#include "hbdevicedialogserverdefs_p.h"
@@ -83,11 +84,13 @@
mTitleBar(0),
mStatusBar(0),
mFadeItem(0),
- mRootItem(0),
+ mRootItem(0),
mPendingOrientationValue(0),
mAutomaticOrientationSwitch(true),
mUserOrientationSwitch(false),
mOrientationChangeOngoing(false),
+ mRootItemFinalPhaseDone(false),
+ mOrientationEffectFinished(false),
mGVOrientationChangeEffectEnabled(false),
mPendingPsPublish(false),
mOrientation(Qt::Vertical),
@@ -100,8 +103,6 @@
q_ptr(0),
mTheTestUtility(0),
mIdleEventHandled(false),
- mNotifyOrientationChange(false),
- mOrientationChangeNotified(false),
mToolbarWasAdded(false),
mAutomaticOrientationChangeAnimation(true)
#ifdef Q_OS_SYMBIAN
@@ -109,7 +110,7 @@
mNativeWindow(0),
mDevDlgClientSession(0)
#endif
-{
+{
}
HbMainWindowPrivate::~HbMainWindowPrivate()
@@ -150,7 +151,7 @@
HbToolBar *HbMainWindowPrivate::toolBar() const
{
HbView *view = qobject_cast<HbView *>(mViewStackWidget->currentWidget());
- return view?HbViewPrivate::d_ptr(view)->toolBar:0;
+ return view ? HbViewPrivate::d_ptr(view)->toolBar : 0;
}
void HbMainWindowPrivate::addToolBarToLayout(HbToolBar *toolBar)
@@ -167,16 +168,16 @@
toolBar->setParentItem(0);
HbView *currentView = q->currentView();
if (toolBar->scene() != mScene
- && currentView
- && currentView->isItemVisible(Hb::ToolBarItem)) { // check just to avoid warnings
+ && currentView
+ && currentView->isItemVisible(Hb::ToolBarItem)) { // check just to avoid warnings
// Update the toolbar to use the current orientation
// and layout direction.
if (toolBar->layoutDirection() != q->layoutDirection() &&
- !toolBar->testAttribute(Qt::WA_SetLayoutDirection)){
+ !toolBar->testAttribute(Qt::WA_SetLayoutDirection)) {
toolBar->setLayoutDirection(q->layoutDirection());
toolBar->setAttribute(Qt::WA_SetLayoutDirection, false);
- }
+ }
HbToolBarPrivate *toolBarD = HbToolBarPrivate::d_ptr(toolBar);
toolBarD->mDoLayout = false;
// No "appear" effect when changing views or when the first
@@ -195,9 +196,12 @@
}
toolBar->setZValue(HbPrivate::ToolBarZValue);
- toolBar->setParentItem( mClippingItem );
+ toolBar->setParentItem(mClippingItem);
mClippingItem->setToolBar(toolBar);
mCurrentToolbar = toolBar;
+
+ toolBar->resetTransform();
+ toolBar->show();
}
}
}
@@ -206,7 +210,7 @@
{
Q_Q(HbMainWindow);
if (mCurrentToolbar && mCurrentToolbar->scene() && mCurrentToolbar == toolBar) {
- mClippingItem->setToolBar( 0 );
+ mClippingItem->setToolBar(0);
mScene->removeItem(mCurrentToolbar);
mCurrentToolbar->disconnect(q);
mCurrentToolbar = 0;
@@ -216,7 +220,7 @@
HbDockWidget *HbMainWindowPrivate::dockWidget() const
{
HbView *view = qobject_cast<HbView *>(mViewStackWidget->currentWidget());
- return view?HbViewPrivate::d_ptr(view)->dockWidget:0;
+ return view ? HbViewPrivate::d_ptr(view)->dockWidget : 0;
}
void HbMainWindowPrivate::addDockWidgetToLayout(HbDockWidget *dockWidget)
@@ -231,16 +235,16 @@
if (dockWidget) {
dockWidget->setParentItem(0);
if (dockWidget->scene() != mScene) {
- HbView* currentView = q->currentView();
+ HbView *currentView = q->currentView();
if (currentView && currentView->isItemVisible(Hb::DockWidgetItem)) {
mScene->addItem(dockWidget); // top level
}
}
-
+
dockWidget->setZValue(HbPrivate::DockWidgetZValue);
- dockWidget->setParentItem( mClippingItem );
- mClippingItem->setDockWidget(dockWidget);
+ dockWidget->setParentItem(mClippingItem);
+ mClippingItem->setDockWidget(dockWidget);
mCurrentDockWidget = dockWidget;
}
}
@@ -250,7 +254,7 @@
{
Q_Q(HbMainWindow);
if (mCurrentDockWidget && mCurrentDockWidget->scene() && mCurrentDockWidget == dockWidget) {
- mClippingItem->setDockWidget( 0 );
+ mClippingItem->setDockWidget(0);
mScene->removeItem(mCurrentDockWidget);
mCurrentDockWidget->disconnect(q);
mCurrentDockWidget = 0;
@@ -261,38 +265,42 @@
{
Q_Q(HbMainWindow);
mRequestedOrientation = orientation;
-
+
if (mOrientationChangeOngoing) {
if (!mForceSetOrientation && !mUserOrientationSwitch) {
return;
- } else {
+ } else if (mOrientation != orientation) {
HbEffectInternal::cancelAll();
+ // Possibly posted idle events must not be delivered,
+ // there will be new ones due to this new orientation switch.
+ QCoreApplication::removePostedEvents(q);
}
}
-
+
if (mOrientation == orientation && !mForceSetOrientation && mEffectItem) {
return;
}
-
+
// skip transition if graphicsview is not visible
mAnimateOrientationSwitch = animate;
- if (!q->isVisible())
+ if (!q->isVisible()) {
mAnimateOrientationSwitch = false;
-
+ }
+
// calling due to resize, orientation remains the same -> no signalling
- if ( !((mOrientation == orientation) && mForceSetOrientation) ) {
+ if (!((mOrientation == orientation) && mForceSetOrientation)) {
// cancel all effects
HbEffectInternal::cancelAll();
mOrientationChangeOngoing = true;
- mNotifyOrientationChange = false;
- mOrientationChangeNotified = false;
+ mRootItemFinalPhaseDone = false;
+ mOrientationEffectFinished = false;
emit q->aboutToChangeOrientation();
emit q->aboutToChangeOrientation(orientation, mAnimateOrientationSwitch);
- }
-
+ }
+
mOrientation = orientation;
-
+
if (!mAnimateOrientationSwitch) {
HbEffect::disable(mEffectItem);
HbEffect::disable(&mGVWrapperItem);
@@ -300,16 +308,16 @@
HbEffect::enable(mEffectItem);
HbEffect::enable(&mGVWrapperItem);
}
-
+
// Sets graphicsview rotation effect to either 90/270 degrees
updateRotationEffects();
//For mirroring case
changeSceneSize();
-
-#ifdef Q_OS_SYMBIAN
+
+#ifdef Q_OS_SYMBIAN
updateForegroundOrientationPSKey();
-#endif
+#endif
HbEffect::start(mEffectItem, "rootItemFirstPhase", q, "rootItemFirstPhaseDone");
@@ -329,9 +337,10 @@
void HbMainWindowPrivate::changeSceneSize()
{
- // no need to perform the scene size change if there's no (rotation) effect for graphicsview
- if (!mGVOrientationChangeEffectEnabled)
+ // no need to perform the scene size change if there's no (rotation) effect for graphicsview
+ if (!mGVOrientationChangeEffectEnabled) {
return;
+ }
Q_Q(HbMainWindow);
HbDeviceProfile profile = HbDeviceProfile::profile(q);
@@ -361,17 +370,16 @@
HbDeviceProfile o = HbDeviceProfile::profile(q);
mOrientationAngle = o.orientationAngle();
-
+
// Effects for GraphicsView (HbMainWindow)
bool ret(true);
bool ret2(true);
- // wrapper item holds the degree value for optimisation purposes (set effect only once)
- if (mOrientationAngle == 270 && (mGVWrapperItem.transformDegrees != 270) ) {
+ // wrapper item holds the degree value for optimization purposes (set effect only once)
+ if (mOrientationAngle == 270 && (mGVWrapperItem.transformDegrees != 270)) {
mGVWrapperItem.transformDegrees = 270;
ret = HbEffectInternal::add(&mGVWrapperItem, "toDefaultOrientation270", "toDefault");
ret2 = HbEffectInternal::add(&mGVWrapperItem, "toRotatedOrientation270", "toRotated");
- }
- else if(mOrientationAngle == 90 &&(mGVWrapperItem.transformDegrees != 90)) {
+ } else if (mOrientationAngle == 90 && (mGVWrapperItem.transformDegrees != 90)) {
mGVWrapperItem.transformDegrees = 90;
ret = HbEffectInternal::add(&mGVWrapperItem, "toDefaultOrientation90", "toDefault");
ret2 = HbEffectInternal::add(&mGVWrapperItem, "toRotatedOrientation90", "toRotated");
@@ -379,7 +387,7 @@
mGVOrientationChangeEffectEnabled = true;
if (!ret || !ret2) {
- HbEffectInternal::remove(&mGVWrapperItem);
+ HbEffectInternal::remove(&mGVWrapperItem);
mGVOrientationChangeEffectEnabled = false;
}
}
@@ -405,7 +413,7 @@
// if setting the same orientation send the profile changed event here since the setTransformedOrientation won't do it
if ((mOrientation == profile.orientation()) &&
- mClippingItem->size() == profile.logicalSize()) {
+ mClippingItem->size() == profile.logicalSize()) {
HbDeviceProfileChangedEvent *event = new HbDeviceProfileChangedEvent(profile, oldProfile);
broadcastEvent(event);
}
@@ -424,53 +432,54 @@
{
HbDeviceProfile result = profile;
if (!result.isNull() && result.orientation() != mOrientation) {
- if(mAlternateProfile.isNull()) {
+ if (mAlternateProfile.isNull()) {
mAlternateProfile = HbDeviceProfile(profile.alternateProfileName());
return mAlternateProfile;
+ } else {
+ return mAlternateProfile;
}
- else {
- return mAlternateProfile;
- }
- }
- return result;
+ }
+ return result;
}
-void HbMainWindowPrivate::orientationEffectFinished(const HbEffect::EffectStatus& status)
+void HbMainWindowPrivate::orientationEffectFinished(const HbEffect::EffectStatus &status)
{
Q_UNUSED(status);
Q_Q(HbMainWindow);
+ mOrientationEffectFinished = true;
QSize newSize;
-
+
HbDeviceProfile o = HbDeviceProfile::profile(q);
- newSize = o.logicalSize();
+ newSize = o.logicalSize();
// do some sanity checking for the size got from device profile
- if( newSize.isNull() || ((newSize.width()*newSize.height()) < QVga_res) ) { // the resolution must be at least QVGA..
+ if (newSize.isNull() || ((newSize.width()*newSize.height()) < QVga_res)) { // the resolution must be at least QVGA..
qWarning("Orient. change error: size from device profile is faulty!");
}
-
- q->setSceneRect(0,0,newSize.width(),newSize.height());
-
- if (mBgItem)
+
+ q->setSceneRect(0, 0, newSize.width(), newSize.height());
+
+ if (mBgItem) {
mBgItem->updateBackgroundImage();
+ }
// re-layouting, skip if size does not change
if (mClippingItem->size() != newSize) {
mClippingItem->resize(newSize);
- mLayoutRect = QRectF(QPointF(0,0), newSize);
+ mLayoutRect = QRectF(QPointF(0, 0), newSize);
// reset transformation
q->resetTransform();
// if not default rotation, rotate to the defined angle no matter what the effect did
- if( mOrientation != mDefaultOrientation)
+ if (mOrientation != mDefaultOrientation) {
q->rotate(mOrientationAngle);
+ }
// handle actual orientation change only if the orientation really changes (not just a resize)
- if (mOrientationChangeOngoing || mNotifyOrientationChange) {
- mOrientationChangeNotified = true;
+ if (mOrientationChangeOngoing) {
// signal only if layout changes (=orientation changes)
// Background item is re-layouted from device profile changed event
emit q->orientationChanged(mOrientation);
@@ -481,24 +490,26 @@
HbInputSettingProxy::instance()->setScreenOrientation(mOrientation);
}
}
- mNotifyOrientationChange = false;
+ updateOrientationChangeStatus();
}
-void HbMainWindowPrivate::rootItemFirstPhaseDone(const HbEffect::EffectStatus& status)
+void HbMainWindowPrivate::rootItemFirstPhaseDone(const HbEffect::EffectStatus &status)
{
Q_UNUSED(status)
Q_Q(HbMainWindow);
- if (mOrientation == mDefaultOrientation)
- HbEffect::start(&mGVWrapperItem,"toDefault", q, "orientationEffectFinished");
- else
- HbEffect::start(&mGVWrapperItem,"toRotated", q, "orientationEffectFinished");
+ if (mOrientation == mDefaultOrientation) {
+ HbEffect::start(&mGVWrapperItem, "toDefault", q, "orientationEffectFinished");
+ } else {
+ HbEffect::start(&mGVWrapperItem, "toRotated", q, "orientationEffectFinished");
+ }
}
-void HbMainWindowPrivate::rootItemFinalPhaseDone(const HbEffect::EffectStatus& status)
+void HbMainWindowPrivate::rootItemFinalPhaseDone(const HbEffect::EffectStatus &status)
{
Q_UNUSED(status);
+ mRootItemFinalPhaseDone = true;
if (mEffectItem) {
HbEffect::enable(mEffectItem);
// make sure effect does not leave anything in wrong state
@@ -509,8 +520,14 @@
HbEffect::enable(&mGVWrapperItem);
postIdleEvent(HbMainWindowPrivate::IdleOrientationFinalEvent);
- mNotifyOrientationChange = !mOrientationChangeNotified && mOrientationChangeOngoing;
- mOrientationChangeOngoing = false;
+ updateOrientationChangeStatus();
+}
+
+void HbMainWindowPrivate::updateOrientationChangeStatus()
+{
+ if (mOrientationChangeOngoing && mRootItemFinalPhaseDone && mOrientationEffectFinished) {
+ mOrientationChangeOngoing = false;
+ }
}
void HbMainWindowPrivate::addOrientationChangeEffects()
@@ -519,9 +536,10 @@
// If effect loading fails, remove both effects.
bool ret = HbEffectInternal::add(mEffectItem, "rootitem_orientation_firstPhase", "rootItemFirstPhase");
bool ret2 = HbEffectInternal::add(mEffectItem, "rootitem_orientation_finalPhase", "rootItemFinalPhase");
-
- if (!ret || !ret2)
+
+ if (!ret || !ret2) {
HbEffectInternal::remove(mEffectItem);
+ }
mOrientationChangeEffectItems.append(mEffectItem);
mOrientationChangeEffectItems.append(&mGVWrapperItem);
@@ -533,18 +551,18 @@
// Use HbEffectInternal and the HB_ prefix to prevent general overriding of these effects.
// Instead, view switch effects can be overridden on a per-instance basis.
bool ok = HbEffectInternal::add(
- QStringList() << "HB_view" << "HB_view" << "HB_view" << "HB_view",
- QStringList() << "view_show_normal" << "view_hide_normal" << "view_show_back" << "view_hide_back",
- QStringList() << "show" << "hide" << "show_back" << "hide_back");
+ QStringList() << "HB_view" << "HB_view" << "HB_view" << "HB_view",
+ QStringList() << "view_show_normal" << "view_hide_normal" << "view_show_back" << "view_hide_back",
+ QStringList() << "show" << "hide" << "show_back" << "hide_back");
if (!ok) {
qWarning("HbMainWindow: addViewEffects: atomic registration for show/hide effects failed");
}
// Register the alternative default.
ok = HbEffectInternal::add(
- QStringList() << "HB_view" << "HB_view" << "HB_view" << "HB_view",
- QStringList() << "view_show_normal_alt" << "view_hide_normal_alt" << "view_show_back_alt" << "view_hide_back_alt",
- QStringList() << "show_alt" << "hide_alt" << "show_alt_back" << "hide_alt_back");
+ QStringList() << "HB_view" << "HB_view" << "HB_view" << "HB_view",
+ QStringList() << "view_show_normal_alt" << "view_hide_normal_alt" << "view_show_back_alt" << "view_hide_back_alt",
+ QStringList() << "show_alt" << "hide_alt" << "show_alt_back" << "hide_alt_back");
if (!ok) {
qWarning("HbMainWindow: addViewEffects: atomic registration for alternative show/hide effects failed");
}
@@ -552,18 +570,18 @@
// Register titlebar effects.
// These should be overridable in general (so we use HbEffect and no HB_ prefix).
ok = HbEffect::add(
- QStringList() << "titlebar" << "titlebar" << "titlebar" << "titlebar",
- QStringList() << "titlebar_disappear" << "titlebar_appear" << "titlebar_orient_disappear" << "titlebar_orient_appear",
- QStringList() << "disappear" << "appear" << "disappear_orient" << "appear_orient");
+ QStringList() << "titlebar" << "titlebar" << "titlebar" << "titlebar",
+ QStringList() << "titlebar_disappear" << "titlebar_appear" << "titlebar_orient_disappear" << "titlebar_orient_appear",
+ QStringList() << "disappear" << "appear" << "disappear_orient" << "appear_orient");
if (!ok) {
qWarning("HbMainWindow: addViewEffects: atomic registration for titlebar effects failed");
}
// Register statusbar effects.
ok = HbEffect::add(
- QStringList() << "statusbar" << "statusbar" << "statusbar" << "statusbar",
- QStringList() << "statusbar_disappear" << "statusbar_appear" << "statusbar_orient_disappear" << "statusbar_orient_appear",
- QStringList() << "disappear" << "appear" << "disappear_orient" << "appear_orient");
+ QStringList() << "statusbar" << "statusbar" << "statusbar" << "statusbar",
+ QStringList() << "statusbar_disappear" << "statusbar_appear" << "statusbar_orient_disappear" << "statusbar_orient_appear",
+ QStringList() << "disappear" << "appear" << "disappear_orient" << "appear_orient");
if (!ok) {
qWarning("HbMainWindow: addViewEffects: atomic registration for statusbar effects failed");
}
@@ -577,8 +595,8 @@
Q_Q(HbMainWindow);
HbView *view = qobject_cast<HbView *>(mViewStackWidget->currentWidget());
- if (view) {
- if(!HbViewPrivate::d_ptr(view)->mVisited) {
+ if (view) {
+ if (!HbViewPrivate::d_ptr(view)->mVisited) {
HbViewPrivate::d_ptr(view)->mVisited = true;
// connect signals when the view is first time visited
QObject::connect(view, SIGNAL(titleChanged(QString)), q, SLOT(_q_viewTitleChanged(QString)));
@@ -604,7 +622,7 @@
Q_Q(HbMainWindow);
widget->disconnect(q);
- HbView *view = qobject_cast<HbView*>(widget);
+ HbView *view = qobject_cast<HbView *>(widget);
if (view) {
// Reset view visit flag
HbViewPrivate::d_ptr(view)->mVisited = false;
@@ -638,7 +656,7 @@
Q_Q(HbMainWindow);
HbView *view = qobject_cast<HbView *>(q->sender());
if (view) {
- if(view == q->currentView()) {
+ if (view == q->currentView()) {
addDockWidgetToLayout(HbViewPrivate::d_ptr(view)->dockWidget);
}
}
@@ -647,7 +665,7 @@
/*
Launches the menu of the current view at given pos.
*/
-void HbMainWindowPrivate::_q_launchMenu(const QPointF& pos) // TODO - pos unused!
+void HbMainWindowPrivate::_q_launchMenu(const QPointF &pos) // TODO - pos unused!
{
Q_Q(HbMainWindow);
Q_UNUSED(pos);
@@ -657,7 +675,7 @@
if (!menu->isEmpty()) {
q->connect(menu, SIGNAL(aboutToClose()), q, SLOT(_q_restoreTitlePane()));
menu->setTimeout(HbPopup::NoTimeout);
- menu->open( this, SLOT(menuClosed()));
+ menu->open(this, SLOT(menuClosed()));
} else {
_q_restoreTitlePane();
}
@@ -694,7 +712,7 @@
}
/*
- Updates the layout of current view when fullscreen
+ Updates the layout of current view when fullscreen
property has been toggled.
*/
void HbMainWindowPrivate::_q_contentFullScreenChanged()
@@ -753,7 +771,7 @@
if (view) {
const Hb::SceneItems visibleItems(view->visibleItems());
view->setTitleBarVisible(visibleItems & Hb::TitleBarItem); // also handles updating of the navigation button
-
+
// ToolBar is a special case, since it depens on the current view's toolbar
if (visibleItems & Hb::ToolBarItem) {
if (q->currentView()) {
@@ -785,13 +803,13 @@
*/
void HbMainWindowPrivate::_q_themeChanged()
{
- broadcastEvent( HbEvent::ThemeChanged );
+ broadcastEvent(HbEvent::ThemeChanged);
}
static void informWidget(HbMainWindowPrivate::BroadcastItem &bcItem, QGraphicsWidget *widget);
/*
- Sends event of \eventType to all items in the \inform list
+ Sends event of \eventType to all items in the \inform list
excluding ones in the \a ignoreItems list.
Invible widgets will be added onto \deferredItems list which will be
@@ -799,16 +817,16 @@
*/
static void informItems(HbMainWindowPrivate::BroadcastItem &bcItem, QList<QGraphicsItem *> &inform)
{
- if ( inform.count() ) {
- foreach( QGraphicsItem *item, inform ) {
- if ( item->isWidget() ) {
+ if (inform.count()) {
+ foreach(QGraphicsItem * item, inform) {
+ if (item->isWidget()) {
QGraphicsWidget *widget = static_cast<QGraphicsWidget *>(item);
- if ( item->isVisible() ) {
+ if (item->isVisible()) {
informWidget(bcItem, widget);
} else {
- bcItem.mPending.append(QPointer<QGraphicsWidget>( widget ));
+ bcItem.mPending.append(QPointer<QGraphicsWidget>(widget));
}
- }
+ }
}
}
}
@@ -830,11 +848,11 @@
/*
Broadcasts event of type \a eventType into all widgets in the scene.
-
- This is a convenince method for void broadcastEvent( QEvent * ).
+
+ This is a convenince method for void broadcastEvent( QEvent * ).
*/
-void HbMainWindowPrivate::broadcastEvent( int eventType )
+void HbMainWindowPrivate::broadcastEvent(int eventType)
{
HbEvent *event = new HbEvent(eventType);
broadcastEvent(event);
@@ -849,14 +867,14 @@
Invisible child items are added into mPending array which will be handled
asynchronously.
*/
-void HbMainWindowPrivate::broadcastEvent( QEvent *event )
+void HbMainWindowPrivate::broadcastEvent(QEvent *event)
{
Q_Q(HbMainWindow);
int type = event->type();
- bool previousEvent(mBroadcastItems.contains( type ));
+ bool previousEvent(mBroadcastItems.contains(type));
- BroadcastItem& broadcastItem = mBroadcastItems[type];
+ BroadcastItem &broadcastItem = mBroadcastItems[type];
broadcastItem.mEvent = event;
// cancel previous requests
@@ -866,29 +884,29 @@
// create high priority items
QList<QGraphicsItem *> priorityItems;
- if ( type == HbEvent::ThemeChanged ) {
- if ( q->currentView() ) {
- priorityItems.append( q->currentView() );
+ if (type == HbEvent::ThemeChanged) {
+ if (q->currentView()) {
+ priorityItems.append(q->currentView());
}
}
-
+
// inform prority items now
informItems(broadcastItem, priorityItems);
// inform root items in the scene
QList<QGraphicsItem *> sceneItems = mScene->items();
QList<QGraphicsItem *> rootItems;
- foreach( QGraphicsItem *item, sceneItems ) {
- if ( !item->parentItem() && !priorityItems.contains(item)) {
- rootItems.append( item );
+ foreach(QGraphicsItem * item, sceneItems) {
+ if (!item->parentItem() && !priorityItems.contains(item)) {
+ rootItems.append(item);
}
}
informItems(broadcastItem, rootItems);
// create asynchronous broadcast loop if needed.
- if ( broadcastItem.mPending.count() ) {
+ if (broadcastItem.mPending.count()) {
Q_Q(HbMainWindow);
- QMetaObject::invokeMethod( q, "_q_continueBroadcasting", Qt::QueuedConnection, Q_ARG(int, type) );
+ QMetaObject::invokeMethod(q, "_q_continueBroadcasting", Qt::QueuedConnection, Q_ARG(int, type));
} else {
// no pending items left, remove the broadcast item
delete mBroadcastItems[type].mEvent;
@@ -897,9 +915,9 @@
}
/*
- For asynchronous event broadcasting.
+ For asynchronous event broadcasting.
- Items in the mPending array are informed.
+ Items in the mPending array are informed.
*/
void HbMainWindowPrivate::_q_continueBroadcasting(int type)
{
@@ -908,22 +926,22 @@
return;
}
- BroadcastItem& broadcastItem = mBroadcastItems[type];
+ BroadcastItem &broadcastItem = mBroadcastItems[type];
// take a copy and then clear the pending items
QList<HbMainWindowPrivate::QGraphicsWidgetPtr> informItems = broadcastItem.mPending;
broadcastItem.mPending.clear();
- foreach( QPointer<QGraphicsWidget> widgetPtr, informItems ) {
- if ( !widgetPtr.isNull() ) {
+ foreach(QPointer<QGraphicsWidget> widgetPtr, informItems) {
+ if (!widgetPtr.isNull()) {
informWidget(broadcastItem, widgetPtr.data());
}
}
// create another broadcast loop if needed.
- if ( broadcastItem.mPending.count() ) {
+ if (broadcastItem.mPending.count()) {
Q_Q(HbMainWindow);
- QMetaObject::invokeMethod( q, "_q_continueBroadcasting", Qt::QueuedConnection, Q_ARG(int, type) );
+ QMetaObject::invokeMethod(q, "_q_continueBroadcasting", Qt::QueuedConnection, Q_ARG(int, type));
} else {
// no pending items left, remove the broadcast item
delete mBroadcastItems[type].mEvent;
@@ -940,7 +958,7 @@
void HbMainWindowPrivate::_q_delayedConstruction()
{
- if (!mDelayedConstructionHandled){
+ if (!mDelayedConstructionHandled) {
Q_Q(HbMainWindow);
mDelayedConstructionHandled = true;
@@ -957,10 +975,10 @@
mViewStackWidget->delayedConstruction();
connect(hbInstance->theme(), SIGNAL(changed()),
- q, SLOT(_q_themeChanged()) );
+ q, SLOT(_q_themeChanged()));
- connect(q, SIGNAL(currentViewChanged(HbView*)),
- mClippingItem, SLOT(currentViewChanged(HbView*)));
+ connect(q, SIGNAL(currentViewChanged(HbView *)),
+ mClippingItem, SLOT(currentViewChanged(HbView *)));
mTitleBar->delayedConstruction();
connect(mTitleBar->titlePane(), SIGNAL(visibilityChanged()),
@@ -976,13 +994,13 @@
initFadeItem();
-#ifdef Q_OS_SYMBIAN
- mDevDlgConnectHelper = new HbDeviceDialogConnectHelper(this);
+#ifdef Q_OS_SYMBIAN
+ mDevDlgConnectHelper = new HbDeviceDialogConnectHelper(this);
connect(mDevDlgConnectHelper, SIGNAL(sessionEstablished(RHbDeviceDialogClientSession *)),
this, SLOT(deviceDialogConnectionReady(RHbDeviceDialogClientSession *)));
- mDevDlgConnectHelper->connect();
+ mDevDlgConnectHelper->connect();
#endif //Q_OS_SYMBIAN
-
+
_q_viewReady();
postIdleEvent(HbMainWindowPrivate::IdleEvent);
@@ -991,18 +1009,19 @@
void HbMainWindowPrivate::_q_viewReady()
{
- Q_Q(HbMainWindow);
- emit q->viewReady();
+ Q_Q(HbMainWindow);
+ emit q->viewReady();
}
QGraphicsWidget *HbMainWindowPrivate::element(HbMainWindowPrivate::Element element) const
{
- if( element == HbMainWindowPrivate::RootItem )
+ if (element == HbMainWindowPrivate::RootItem) {
return mRootItem;
- else if( element == HbMainWindowPrivate::ViewportItem )
+ } else if (element == HbMainWindowPrivate::ViewportItem) {
return mClippingItem;
- else if( element == HbMainWindowPrivate::BackgroundItem )
+ } else if (element == HbMainWindowPrivate::BackgroundItem) {
return mBgItem;
+ }
return 0;
}
@@ -1024,10 +1043,10 @@
}
}
-void HbMainWindowPrivate::setViewportSize(const QSizeF& newSize)
+void HbMainWindowPrivate::setViewportSize(const QSizeF &newSize)
{
mClippingItem->resize(newSize);
- mLayoutRect = QRectF(QPointF(0,0), newSize);
+ mLayoutRect = QRectF(QPointF(0, 0), newSize);
mViewStackWidget->resize(newSize);
}
@@ -1041,36 +1060,37 @@
{
// check current process is not devicedialog
RProcess process;
- if (process.SecureId().iId != deviceDialogUid.iUid) {
- if (mDevDlgClientSession && !mPendingPsPublish) {
+ if (process.SecureId().iId != deviceDialogUid.iUid) {
+ if (mDevDlgClientSession && !mPendingPsPublish) {
int orie = mOrientation;
- if (!mAutomaticOrientationSwitch)
- orie |= KHbFixedOrientationMask;
- mDevDlgClientSession->SendSyncRequest( EHbSrvPublishOrientation, orie );
- }
- else if (mDevDlgClientSession && mPendingPsPublish) {
- mDevDlgClientSession->SendSyncRequest( EHbSrvPublishOrientation, mPendingOrientationValue );
+ if (!mAutomaticOrientationSwitch) {
+ orie |= KHbFixedOrientationMask;
+ }
+ mDevDlgClientSession->SendSyncRequest(EHbSrvPublishOrientation, orie);
+ } else if (mDevDlgClientSession && mPendingPsPublish) {
+ mDevDlgClientSession->SendSyncRequest(EHbSrvPublishOrientation, mPendingOrientationValue);
mPendingPsPublish = false;
mPendingOrientationValue = 0;
- }
- else if (!mDevDlgClientSession && !mPendingPsPublish) {
+ } else if (!mDevDlgClientSession && !mPendingPsPublish) {
mPendingOrientationValue = mOrientation;
- if (!mAutomaticOrientationSwitch)
- mPendingOrientationValue |= KHbFixedOrientationMask;
- mPendingPsPublish = true;
- }
+ if (!mAutomaticOrientationSwitch) {
+ mPendingOrientationValue |= KHbFixedOrientationMask;
+ }
+ mPendingPsPublish = true;
+ }
}
- process.Close();
+ process.Close();
}
#endif
#ifdef Q_OS_SYMBIAN
void HbMainWindowPrivate::deviceDialogConnectionReady(RHbDeviceDialogClientSession *clientSession)
{
- mDevDlgClientSession = clientSession;
- if (mPendingPsPublish)
+ mDevDlgClientSession = clientSession;
+ if (mPendingPsPublish) {
updateForegroundOrientationPSKey();
+ }
}
-
+
#endif //Q_OS_SYMBIAN
// end of file
--- a/src/hbcore/gui/hbmainwindow_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbmainwindow_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -44,7 +44,7 @@
#ifdef Q_OS_SYMBIAN
#include <hbdevicedialogclientsession_p.h>
#include <hbdevicedialogconnecthelper_p.h>
-#endif
+#endif
class HbBackgroundItem;
class HbGraphicsScene;
@@ -96,7 +96,7 @@
HbDeviceProfile adjustedProfile(const HbDeviceProfile &profile) const;
void broadcastEvent(int eventType);
- void broadcastEvent(QEvent* event);
+ void broadcastEvent(QEvent *event);
void changeSceneSize();
void updateRotationEffects();
@@ -110,7 +110,7 @@
void unfadeScreen();
void _q_viewReady();
-
+
QGraphicsWidget *element(HbMainWindowPrivate::Element element) const;
HbGraphicsScene *mScene;
@@ -125,14 +125,16 @@
Qt::Orientation mDefaultOrientation;
int mPendingOrientationValue;
qreal mOrientationAngle;
- QList<QGraphicsItem*> mItemList;
- QList<QGraphicsItem*> mOrientationChangeEffectItems;
+ QList<QGraphicsItem *> mItemList;
+ QList<QGraphicsItem *> mOrientationChangeEffectItems;
bool mAutomaticOrientationSwitch;
bool mUserOrientationSwitch;
bool mOrientationChangeOngoing;
+ bool mRootItemFinalPhaseDone;
+ bool mOrientationEffectFinished;
bool mAnimateOrientationSwitch;
bool mGVOrientationChangeEffectEnabled;
- bool mPendingPsPublish;
+ bool mPendingPsPublish;
Qt::Orientation mOrientation;
Qt::Orientation mRequestedOrientation;
HbToolBar *mCurrentToolbar;
@@ -154,8 +156,6 @@
QRectF mLayoutRect;
mutable HbDeviceProfile mAlternateProfile;
QPointer<HbView> mMenuView;
- bool mNotifyOrientationChange;
- bool mOrientationChangeNotified;
bool mToolbarWasAdded;
bool mAutomaticOrientationChangeAnimation;
QTranslator mCommonTranslator;
@@ -164,10 +164,11 @@
RHbDeviceDialogClientSession *mDevDlgClientSession;
HbDeviceDialogConnectHelper *mDevDlgConnectHelper;
#endif
- void rootItemFirstPhaseDone(const HbEffect::EffectStatus& status);
- void rootItemFinalPhaseDone(const HbEffect::EffectStatus& status);
- void orientationEffectFinished(const HbEffect::EffectStatus& status);
+ void rootItemFirstPhaseDone(const HbEffect::EffectStatus &status);
+ void rootItemFinalPhaseDone(const HbEffect::EffectStatus &status);
+ void orientationEffectFinished(const HbEffect::EffectStatus &status);
+ void updateOrientationChangeStatus();
void addOrientationChangeEffects();
void addViewEffects();
void _q_viewChanged();
@@ -190,7 +191,7 @@
static const int IdleOrientationEvent;
static const int IdleOrientationFinalEvent;
- void setViewportSize(const QSizeF& newSize);
+ void setViewportSize(const QSizeF &newSize);
QSizeF viewPortSize() const;
static HbMainWindowPrivate *d_ptr(HbMainWindow *mainWindow) {
@@ -203,13 +204,14 @@
public slots:
void menuClosed();
-#ifdef Q_OS_SYMBIAN
+#ifdef Q_OS_SYMBIAN
void updateForegroundOrientationPSKey();
void deviceDialogConnectionReady(RHbDeviceDialogClientSession *clientSession);
#endif
- friend class HbForegroundWatcher;
- friend class HbDeviceDialogConnectHelperPrivate;
+ friend class HbShrinkingVkbHostPrivate;
+ friend class HbForegroundWatcher;
+ friend class HbDeviceDialogConnectHelperPrivate;
};
#endif // HBMAINWINDOW_P_H
--- a/src/hbcore/gui/hbmenu.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbmenu.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -46,14 +46,14 @@
menuItemView(0),
subMenuAction(0),
activeSubMenu(0),
- resultAction(0),
actionTriggered(false),
menuType(HbMenu::ContextMenu),
mSubMenuItem(0),
mRightMargin(0.0),
mDownMargin(0.0),
delayMenuConstruction(true),
- receiverToDisconnectOnClose(0)
+ receiverToDisconnectOnClose(0),
+ mNumberOfColumns(1)
{
}
@@ -88,11 +88,6 @@
if (hasEffects) {
hasEffects = HbEffectInternal::add("HB_menuitem", "menuitem_press", "clicked");
}
- if (hasEffects ) {
- hasEffects = HbEffectInternal::add("HB_POPUP",
- "dialog_rotate",
- "orientationswitch");
- }
}
#endif
}
@@ -108,15 +103,13 @@
}
#endif
HbAction *hbAction = qobject_cast<HbAction *>(currentItem->action());
+ q->setActiveAction(hbAction);
if (hbAction && hbAction->menu() && !actionTriggered) {
hbAction->trigger();
stopTimeout();
openSubmenu(currentItem);
} else {
q->close();
-
- resultAction = hbAction;
-
if (!actionTriggered) { // prevent duplicate events
currentItem->action()->trigger();
}
@@ -257,7 +250,6 @@
}
if (activeItem && activeItem->action() && activeItem->action()->isEnabled()) {
HbAction *hbAction = qobject_cast<HbAction *>(activeItem->action());
- q->setActiveAction(hbAction);
if (!hbAction)
return;
HbMenu *subMenu = hbAction->menu();
@@ -291,7 +283,7 @@
}
}
-void HbMenuPrivate::_q_handleMenuAfterOrientationChange()
+void HbMenuPrivate::_q_handleMenuClose()
{
Q_Q(HbMenu);
if ( menuType == HbMenu::ContextMenu || menuType == HbMenu::OptionsMenu ) {
@@ -307,17 +299,21 @@
}
/*!
- closes the menu after Orientation change
+ Handles menu close
*/
-void HbMenuPrivate::closeMenuAfterOrientationChange()
+void HbMenuPrivate::closeMenu()
{
Q_Q(HbMenu);
HbMainWindow* w(q->mainWindow());
if ( w ){
QObject::disconnect( w, SIGNAL(aboutToChangeOrientation()),
- q, SLOT(_q_handleMenuAfterOrientationChange()));
+ q, SLOT(_q_handleMenuClose()));
QObject::connect( w, SIGNAL(aboutToChangeOrientation()),
- q, SLOT(_q_handleMenuAfterOrientationChange()));
+ q, SLOT(_q_handleMenuClose()));
+ QObject::disconnect( w, SIGNAL(aboutToChangeView(HbView*, HbView*)),
+ q, SLOT(_q_handleMenuClose()));
+ QObject::connect( w, SIGNAL(aboutToChangeView(HbView*, HbView*)),
+ q, SLOT(_q_handleMenuClose()));
}
}
@@ -421,18 +417,11 @@
The receiver is notifed when the action is triggered (QAction::triggered()).
HbMenu also has a triggered() menu signal, which signals which HbAction was triggered in the menu.
- Context menu example:
-
- A menu and a few actions are created. The triggered() signal of the menu is connected to
- the mute() function of the enclosing class (implementation not shown).
- The exec() function shows the menu.
+ An example of how to create an option menu.
+ \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,2}
- User needs to connect to "longPress" signal and implement corresponding slot. This enables
- longpress events to be received from list.
-
- \dontinclude decoratorlistdemo/contentwidget.cpp
- \skip // Create new menu
- \until ( coords );
+ An example of how to create and show a context menu from the gesture.
+ \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,54}
\sa HbDialog, HbView
*/
@@ -617,7 +606,9 @@
*/
HbAction *HbMenu::addSeparator()
{
- return insertSeparator(0);
+ //functionality removed for now
+ //return insertSeparator(0);
+ return 0;
}
/*!
@@ -629,12 +620,15 @@
*/
HbAction *HbMenu::insertSeparator(HbAction *before)
{
- HbAction *action = new HbAction(this);
+ Q_UNUSED(before);
+ //functionality removed for now
+ /*HbAction *action = new HbAction(this);
action->setSeparator(true);
action->setEnabled(true);
action->setVisible(true);
insertAction(before, action);
- return action;
+ return action;*/
+ return 0;
}
/*!
@@ -707,14 +701,13 @@
Q_D(HbMenu);
if (change == QGraphicsItem::ItemSceneHasChanged) {
- d->closeMenuAfterOrientationChange();
+ d->closeMenu();
}
if (change == QGraphicsItem::ItemVisibleChange) {
if (value.toBool() && d->delayMenuConstruction) {
d->delayedLayout();
}
if (value.toBool()) {
- d->resultAction = 0;
d->actionTriggered = false;
}
else if (!value.toBool() && !d->menuItemView){
@@ -757,6 +750,9 @@
void HbMenu::polish(HbStyleParameters ¶ms)
{
Q_D(HbMenu);
+ const QString NumberOfCols = "number-of-columns";
+ params.addParameter(NumberOfCols);
+
if (d->mSubMenuItem) {
const QString RightMargin = "submenu-right-offset";
const QString DownMargin = "submenu-bottom-margin";
@@ -775,18 +771,28 @@
} else {
HbPopup::polish(params);
}
+
+ if (!params.value(NumberOfCols).isNull()) {
+ int cols = params.value(NumberOfCols).toInt();
+ if (d->mNumberOfColumns != cols) {
+ d->mNumberOfColumns = cols;
+ if (d->menuItemView) {
+ d->menuItemView->updateContainer();
+ }
+ }
+ }
}
QPainterPath HbMenu::shape() const
{
- /*QRectF sceneRect = mapRectToScene(QRectF(-0.5, -0.5, boundingRect().width() + 0.5, boundingRect().height() + 0.5));
- QRectF clipRect = sceneRect.intersected(QRectF(pos().x() - 0.5, pos().y() - 0.5, size().width() + 0.5, size().height() + 0.5));
+ /*QRectF rect = QRectF(-1.0, -1.0, boundingRect().width() + 1.0, boundingRect().height() + 1.0);
+ QRectF clipRect = rect.intersected(mapRectFromParent(QRectF(pos().x() - 1.0, pos().y() - 1.0, size().width() + 1.0, size().height() + 1.0)));
QPainterPath path;
- path.addRect(mapRectFromScene(clipRect));
+ path.addRect(clipRect);
- return path.intersected(HbPopup::shape());*/
- return HbPopup::shape();
+ return path;*/
+ return HbPopup::shape();
}
/*!
--- a/src/hbcore/gui/hbmenu.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbmenu.h Fri Jun 11 13:58:22 2010 +0300
@@ -98,7 +98,7 @@
Q_PRIVATE_SLOT(d_func(), void _q_onActionTriggered())
Q_PRIVATE_SLOT(d_func(), void _q_subMenuItemTriggered(HbAction *action))
Q_PRIVATE_SLOT(d_func(), void _q_subMenuTimedOut())
- Q_PRIVATE_SLOT(d_func(), void _q_handleMenuAfterOrientationChange())
+ Q_PRIVATE_SLOT(d_func(), void _q_handleMenuClose())
};
#endif // HBMENU_H
--- a/src/hbcore/gui/hbmenu_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbmenu_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -54,14 +54,14 @@
void changeToOptionsMenu();
HbMenuItem *subMenuItem();
void setSubMenuItem(HbMenuItem *menuItem);
- void closeMenuAfterOrientationChange();
+ void closeMenu();
void closeMenuRecursively(HbAction* menuAction);
void _q_triggerAction(HbMenuItem *currentItem);
void _q_onActionTriggered();
void _q_subMenuItemTriggered(HbAction *action);
void _q_subMenuTimedOut();
- void _q_handleMenuAfterOrientationChange();
+ void _q_handleMenuClose();
void actionAdded(QActionEvent *actionEvent);
void actionRemoved(QActionEvent *actionEvent);
void actionChanged(QActionEvent *actionEvent);
@@ -72,7 +72,6 @@
HbMenuListView *menuItemView;
HbAction *subMenuAction;
HbMenu *activeSubMenu;
- HbAction *resultAction;
bool actionTriggered;
bool menuTimedOut(HbMenu* menu);
@@ -85,6 +84,7 @@
QPointer<QObject> receiverToDisconnectOnClose;
QByteArray memberToDisconnectOnClose;
+ int mNumberOfColumns;
private:
static bool menuEffectsLoaded;
--- a/src/hbcore/gui/hbmenucontainer_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbmenucontainer_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -31,8 +31,7 @@
#include "hbinstance.h"
#include <hbwidgetfeedback.h>
#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsLayout>
-#include <QDebug>
+#include <QGraphicsGridLayout>
HbMenuContainerPrivate::HbMenuContainerPrivate(HbMenu *menu) :
menu(menu), actionManager(0)
@@ -45,12 +44,13 @@
void HbMenuContainerPrivate::init()
{
Q_Q(HbMenuContainer);
- mLayout = new QGraphicsLinearLayout(Qt::Vertical, q);
+ mLayout = new QGraphicsGridLayout(q);
mLayout->setContentsMargins(0.0, 0.0, 0.0, 0.0);
mLayout->setSpacing(0.0);
mLayout->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
q->setLayout(mLayout);
+ q->setFlag(QGraphicsItem::ItemHasNoContents, true);
}
HbMenuContainer::HbMenuContainer(HbMenu *menu,QGraphicsItem *parent):
@@ -98,11 +98,11 @@
void HbMenuContainer::removeActionItem(QAction *action)
{
Q_D(HbMenuContainer);
- for (int i = 0; d->mItems.count(); i++) {
+ for (int i = 0; i < d->mItems.count(); i++) {
HbMenuItem *item = d->mItems.at(i);
if (item->action() == action) {
d->mItems.removeAt(i);
- d->mLayout->removeItem(item);
+ reLayout();
delete item;
break;
}
@@ -121,6 +121,32 @@
}
}
+/*!
+ Reforms the menu layout when needed, e.g. after an orientation change.
+*/
+void HbMenuContainer::reLayout()
+{
+ Q_D(HbMenuContainer);
+
+ int layoutItems = d->mLayout->count();
+ for ( int i = 0; i < layoutItems; i++ ) {
+ d->mLayout->removeAt(0);
+ }
+
+ int pos = 0;
+ int numCols = (HbMenuPrivate::d_ptr(d->menu))->mNumberOfColumns;
+
+ for ( int i = 0; i < d->mItems.count(); i++ ) {
+ int row = pos / numCols;
+ int col = pos % numCols;
+
+ if (!d->mItems.at(i)->action()->isSeparator()) {
+ d->mLayout->addItem(d->mItems.at(i), row, col, Qt::AlignCenter);
+ pos++;
+ }
+ }
+}
+
//creates new menu items if needed. This is called when actionadded event is received by hbmenu.
void HbMenuContainer::addItem(QAction *action, HbMenuItem *item)
{
@@ -142,12 +168,8 @@
if (castedAction && castedAction->menu()) {
HbMenuPrivate::d_ptr(castedAction->menu())->setSubMenuItem(item);
}
- /* Workaround for layout flushing problem */
- if (item->action()->isSeparator())
- item->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
- /* Workaround ends */
d->mItems.insert(pos, item);
- d->mLayout->insertItem(pos, item);
+ reLayout();
}
//this is called when an existing items visibility has changed.
@@ -163,7 +185,7 @@
d->mItems.removeAt(i);
item->recycleItem();
item->setVisible(false);
- d->mLayout->removeItem(item);
+ reLayout();
d->mBufferItems.insert(action, item);
}
}
@@ -220,6 +242,7 @@
d->mContainer = new HbMenuContainer(menu, this);
setContentWidget(d->mContainer);
setScrollingStyle(HbScrollArea::Pan);
+ setFlag(QGraphicsItem::ItemHasNoContents, true);
}
bool HbMenuListView::scrollByAmount(const QPointF& delta)
@@ -280,149 +303,6 @@
}
}
-/*!
- \reimp
-*/
-void HbMenuListView::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-#ifdef HB_GESTURE_FW
- Q_UNUSED(event);
- HbScrollArea::mousePressEvent(event);
- event->accept();
-#else
- Q_D(HbMenuListView);
- d->mHitItem = itemAt(event->scenePos());
- if (d->mHitItem){
- Hb::InteractionModifiers modifiers = 0;
- if (d->mIsScrolling) {
- modifiers |= Hb::ModifierScrolling;
- d->mWasScrolling = true;
- }
- HbWidgetFeedback::triggered(d->mHitItem, Hb::InstantPressed, modifiers);
- if (!d->mWasScrolling){
- ensureVisible(d->mHitItem->pos());
- if(!isFocusable(d->mHitItem->action()))
- d->mHitItem = 0;
- else
- d->mHitItem->pressStateChanged(true);
- }
- else
- d->mHitItem = 0;
- }
- HbScrollArea::mousePressEvent(event);
- event->accept();
-#endif
-}
-
-/*!
- \reimp
-*/
-void HbMenuListView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-#ifdef HB_GESTURE_FW
- HbScrollArea::mouseReleaseEvent(event);
-#else
- Q_D(HbMenuListView);
-
- HbScrollArea::mouseReleaseEvent(event);
-
- HbMenuItem* hitItem = itemAt(event->scenePos());
- if (hitItem){
- Hb::InteractionModifiers modifiers = 0;
- if (d->mWasScrolling) {
- modifiers |= Hb::ModifierScrolling;
- d->mWasScrolling = false;
- }
- HbWidgetFeedback::triggered(hitItem, Hb::InstantReleased, modifiers);
- }
- if (d->mHitItem){
- d->mHitItem->pressStateChanged(false);
- if (d->mHitItem == hitItem) {
- d->mCurrentItem = d->mHitItem;
- d->mCurrentIndex = d->mContainer->items().indexOf(d->mCurrentItem);
- HbMenuPrivate::d_ptr(d->mCurrentItem->menu())->_q_triggerAction(d->mCurrentItem);
-
- }
- d->mHitItem = 0;
- }
- event->accept();
-#endif
-}
-
-HbMenuItem *HbMenuListView::itemAt(const QPointF& position) const
-{
- HbMenuItem *hitItem = 0;
- const QList<QGraphicsItem *> items = scene()->items(position);
-
- const int count(items.count());
- for (int current = 0; current < count; ++current) {
- QGraphicsItem *item = items.at(current);
- if (item && item->isWidget()) {
- QGraphicsWidget *widget = static_cast<QGraphicsWidget *>(item);
-
- hitItem = qobject_cast<HbMenuItem *>(widget);
- // Workaround for QT bug which is not returning all the scene items properly
- if (!hitItem) {
- QGraphicsItem *parent = widget->parentItem();
- while (parent && parent->isWidget()) {
- hitItem = qobject_cast<HbMenuItem *>(static_cast<QGraphicsWidget*>(parent));
- if (hitItem)
- break;
- parent = parent->parentItem();
- }
- }
- //workaround ends
- }
- if (hitItem)
- break;
- }
- return hitItem;
-}
-
-/*!
- \reimp
-*/
-void HbMenuListView::upGesture(int value)
-{
- Q_D(HbMenuListView);
-
- if (d->mHitItem) {
- d->mHitItem->pressStateChanged(false);
- d->mHitItem = 0;
- }
-
- HbScrollArea::upGesture(value);
-}
-
-/*!
- \reimp
-*/
-void HbMenuListView::downGesture(int value)
-{
- Q_D(HbMenuListView);
-
- if (d->mHitItem) {
- d->mHitItem->pressStateChanged(false);
- d->mHitItem = 0;
- }
-
- HbScrollArea::downGesture(value);
-}
-
-/*!
- \reimp
-*/
-void HbMenuListView::panGesture(const QPointF &point)
-{
- Q_D(HbMenuListView);
-
- if (d->mHitItem) {
- d->mHitItem->pressStateChanged(false);
- d->mHitItem = 0;
- }
- HbScrollArea::panGesture(point);
-}
-
bool HbMenuListView::isFocusable(QAction *action)// krazy:exclude=qclasses
{
return action && action->isVisible() && !action->isSeparator() && action->isEnabled();
@@ -430,8 +310,15 @@
void HbMenuListView::doDelayedLayout()
{
- Q_D(HbMenuListView);
- d->mContainer->delayedLayout();
+ Q_D(HbMenuListView);
+ d->mContainer->delayedLayout();
+}
+
+void HbMenuListView::updateContainer()
+{
+ Q_D(HbMenuListView);
+ d->mContainer->reLayout();
+ updateGeometry();
}
/*!
@@ -453,60 +340,8 @@
void HbMenuListView::gestureEvent(QGestureEvent *event)
{
- Q_D(HbMenuListView);
HbScrollArea::gestureEvent(event);
- //WORKAROUND for bug scene doesn't return all the items
- if(QTapGesture *gesture = static_cast<QTapGesture *>(event->gesture(Qt::TapGesture))) {
- // Stop scrolling on tap
- if (gesture->state() == Qt::GestureStarted) {
- event->accept();
- d->mHitItem = itemAt(gesture->position());
- if (d->mHitItem){
- Hb::InteractionModifiers modifiers = 0;
- if (d->mIsScrolling) {
- modifiers |= Hb::ModifierScrolling;
- d->mWasScrolling = true;
- }
- HbWidgetFeedback::triggered(d->mHitItem, Hb::InstantPressed, modifiers);
- if (!d->mWasScrolling){
- ensureVisible(d->mHitItem->pos());
- if(!isFocusable(d->mHitItem->action()))
- d->mHitItem = 0;
- else
- d->mHitItem->pressStateChanged(true);
- }
- else
- d->mHitItem = 0;
- }
- } else if (gesture->state() == Qt::GestureFinished) {
- HbMenuItem* hitItem = itemAt(gesture->position());
- if (hitItem){
- Hb::InteractionModifiers modifiers = 0;
- if (d->mWasScrolling) {
- modifiers |= Hb::ModifierScrolling;
- d->mWasScrolling = false;
- }
- HbWidgetFeedback::triggered(hitItem, Hb::InstantReleased, modifiers);
- }
- if (d->mHitItem){
- d->mHitItem->pressStateChanged(false);
- if (d->mHitItem == hitItem) {
- d->mCurrentItem = d->mHitItem;
- d->mCurrentIndex = d->mContainer->items().indexOf(d->mCurrentItem);
- HbMenuPrivate::d_ptr(d->mCurrentItem->menu())->_q_triggerAction(d->mCurrentItem);
- }
- d->mHitItem = 0;
- }
- } else if (gesture->state() == Qt::GestureCanceled) {
- if (d->mHitItem) {
- d->mHitItem->pressStateChanged(false);
- d->mHitItem = 0;
- }
- }
- }
- //WORKAROUND
-
if (QPanGesture *panGesture = qobject_cast<QPanGesture*>(event->gesture(Qt::PanGesture))) {
event->accept(panGesture);
}
--- a/src/hbcore/gui/hbmenucontainer_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbmenucontainer_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -32,7 +32,7 @@
#include "hbscrollarea.h"
#include "hbscrollarea_p.h"
#include "hbactionmanager_p.h"
-#include <QGraphicsLinearLayout>
+#include <QGraphicsGridLayout>
#include <QGesture>
class HbMenuContainer;
@@ -53,21 +53,16 @@
void removeActionItem(QAction *Action);
void updateActionItem(QAction *action);
void doDelayedLayout();
+ void updateContainer();
HbMenuItem* currentItem() const;
void setCurrentItem(HbAction *action);
enum { Type = HbPrivate::ItemType_MenuListView };
int type() const { return Type; }
protected:
- void mousePressEvent(QGraphicsSceneMouseEvent *event);
- void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
- void upGesture(int value);
- void downGesture(int value);
- void panGesture(const QPointF &point);
virtual void gestureEvent(QGestureEvent *event);
QVariant itemChange(GraphicsItemChange change, const QVariant &value);
private:
- HbMenuItem* itemAt(const QPointF& position) const;
void updateCurrentItem();
bool isFocusable(QAction *action);
protected:
@@ -104,6 +99,7 @@
void removeActionItem(QAction *Action);
void visibleItemsChanged();
void updateVisibleActionList();
+ void reLayout();
protected:
void polish(HbStyleParameters ¶ms);
@@ -120,7 +116,7 @@
explicit HbMenuContainerPrivate(HbMenu *menu);
void init();
virtual ~HbMenuContainerPrivate();
- QGraphicsLinearLayout *mLayout;
+ QGraphicsGridLayout *mLayout;
HbMenu *menu;
HbActionManager *actionManager;
QList<HbMenuItem*> mItems;
--- a/src/hbcore/gui/hbnativewindow_sym.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbnativewindow_sym.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include <hbglobal.h>
+#include <hbglobal.h>
#include <hbdeviceprofile.h>
#include "hbnativewindow_sym_p.h"
@@ -47,6 +47,6 @@
ActivateL();
}
-void HbNativeWindow::Draw( const TRect& /*aRect*/ ) const
+void HbNativeWindow::Draw(const TRect& /*aRect*/) const
{
}
--- a/src/hbcore/gui/hbnativewindow_sym_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbnativewindow_sym_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -40,7 +40,7 @@
void ConstructL();
protected:
- void Draw(const TRect& aRect) const;
+ void Draw(const TRect &aRect) const;
};
#endif // HBNATIVEWINDOW_P_H
--- a/src/hbcore/gui/hbpopup.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbpopup.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -281,7 +281,9 @@
preferredPosSet(false),
mStartEffect(false),
mScreenMargin(0.0),
+ mAutoLayouting(true),
mVgMaskEffect(0),
+ mOrientationEffectHide(false),
timeoutTimerInstance(0)
{
}
@@ -358,16 +360,33 @@
hidingInProgress = false;
}
-void HbPopupPrivate::_q_orientationChange(Qt::Orientation orient, bool animate)
+void HbPopupPrivate::_q_orientationAboutToChange(Qt::Orientation orient, bool animate)
{
- Q_UNUSED(orient);
- if (animate) {
+ Q_UNUSED(orient);
Q_Q(HbPopup);
- HbEffect::start(q, "HB_POPUP", "orientationswitch");
+ if (animate && q->isVisible()) {
+ HbEffect::start(q, "HB_POPUP", "orient_disappear");
+ mOrientationEffectHide = true;
}
+}
+
+#endif // HB_EFFECTS
+void HbPopupPrivate::_q_orientationChanged()
+{
+ Q_Q(HbPopup);
+ if (q->isVisible()) {
+ QEvent userEvent(QEvent::ContextMenu);
+ QCoreApplication::sendEvent(q, &userEvent);
+ }
+#ifdef HB_EFFECTS
+ if (mOrientationEffectHide) {
+ HbEffect::cancel(q);
+ HbEffect::start(q, "HB_POPUP", "orient_appear");
+ mOrientationEffectHide = false;
+ }
+#endif
}
-#endif // HB_EFFECTS
void HbPopupPrivate::_q_timeoutFinished()
{
@@ -514,8 +533,13 @@
}
if (hasEffects ) {
hasEffects = HbEffectInternal::add("HB_POPUP",
- "dialog_rotate",
- "orientationswitch");
+ "popup_orient_disappear",
+ "orient_disappear");
+ }
+ if (hasEffects ) {
+ hasEffects = HbEffectInternal::add("HB_POPUP",
+ "popup_orient_appear",
+ "orient_appear");
}
#endif
}
@@ -792,7 +816,10 @@
{
Q_D(HbPopup);
- /*if (change == QGraphicsItem::ItemVisibleHasChanged) {
+ if (change == QGraphicsItem::ItemPositionChange) {
+ d->mAutoLayouting = false;
+ }
+ if (change == QGraphicsItem::ItemVisibleHasChanged) {
if (value.toBool()) {
if(d->hasEffects && boundingRect().isValid()) {
@@ -801,6 +828,7 @@
-boundingRect().height(),
boundingRect().width(),
0);
+ HbEffect::cancel(this);
HbEffect::start(this, d->effectType, "appear", 0, 0, QVariant(), extRect);
#endif//HB_EFFECTS
d->mStartEffect = false;
@@ -808,7 +836,7 @@
d->mStartEffect = true;
}
}
- }*/
+ }
if (change == QGraphicsItem::ItemVisibleChange) {
if (value.toBool()) {
@@ -837,6 +865,7 @@
-boundingRect().height(),
boundingRect().width(),
0);
+ HbEffect::cancel(this);
if (!HbEffect::start(this, d->effectType, "disappear",
this, "_q_delayedHide",
QVariant(), extRect)) {
@@ -856,9 +885,12 @@
} else if (change == QGraphicsItem::ItemSceneHasChanged) {
HbMainWindow* w(mainWindow());
if ( w ){
+ disconnect(this, SLOT(_q_orientationAboutToChange(Qt::Orientation, bool)));
+ connect( w, SIGNAL(aboutToChangeOrientation(Qt::Orientation, bool)),
+ this, SLOT(_q_orientationAboutToChange(Qt::Orientation, bool)) );
disconnect(this, SLOT(handlePopupPos()));
connect( w, SIGNAL(orientationChanged(Qt::Orientation)),
- this, SLOT(handlePopupPos()) );
+ this, SLOT(_q_orientationChanged()) );
}
}
return HbWidget::itemChange(change, value);
@@ -869,8 +901,9 @@
*/
void HbPopup::handlePopupPos()
{
+ //Not used inside hbpopup, deprecate this(?)
QEvent userEvent(QEvent::ContextMenu);
- QCoreApplication::sendEvent(this, &userEvent);
+ QCoreApplication::sendEvent(this, &userEvent);
}
/*!
@@ -1041,7 +1074,7 @@
*/
bool HbPopup::event(QEvent *event)
{
-/* Q_D(HbPopup);
+ Q_D(HbPopup);
if (event->type() == QEvent::LayoutRequest) {
//Workaround when showing first time
#ifdef HB_EFFECTS
@@ -1052,17 +1085,12 @@
-boundingRect().height(),
boundingRect().width(),
0);
+ HbEffect::cancel(this);
HbEffect::start(this, d->effectType, "appear", 0, 0, QVariant(), extRect);
- qDebug() << "effect start";
}
#endif//HB_EFFECTS
//workaround ends
- }
- qDebug() << "event: " << event;*/
- /*Q_D(HbPopup);
- if (event->type() == QEvent::LayoutDirectionChange) {
- d->calculateShape();
- }*/
+ }
return HbWidget::event(event);
}
@@ -1070,15 +1098,18 @@
Sets preferred position\a position for popup with \a placement
as origin.
+ By default popup is placed in the middle of the screen. If other positions are needed please
+ ensure that the preferred position is working properly with different screen sizes.
+
\param position is the position at which the popup is shown.
\param placement is the corner or edge which \a position refers to
Example usage:
\code
- HbDialog popup;
+ HbPopup *popup = new HbPopup();
...
- popup.setPreferredPosition( QPointF(x,y), HbPopupBase::BottomEdgeCenter );
- popup.show();
+ popup->setPreferredPosition( QPointF(x,y), HbPopupBase::BottomEdgeCenter );
+ popup->show();
\endcode
*/
@@ -1099,7 +1130,8 @@
d->preferredPosSet = true;
//If position updated, informing layoutproxy with layoutrequest
if (layoutFlag) {
- QApplication::sendEvent(this, new QEvent(QEvent::LayoutRequest));
+ QEvent layoutRequest = QEvent::LayoutRequest;
+ QApplication::sendEvent(this, &layoutRequest);
}
}
--- a/src/hbcore/gui/hbpopup.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbpopup.h Fri Jun 11 13:58:22 2010 +0300
@@ -143,7 +143,8 @@
Q_DISABLE_COPY(HbPopup)
#ifdef HB_EFFECTS
Q_PRIVATE_SLOT(d_func(), void _q_delayedHide(HbEffect::EffectStatus status))
- Q_PRIVATE_SLOT(d_func(), void _q_orientationChange(Qt::Orientation orient, bool animate))
+ Q_PRIVATE_SLOT(d_func(), void _q_orientationAboutToChange(Qt::Orientation orient, bool animate))
+ Q_PRIVATE_SLOT(d_func(), void _q_orientationChanged())
#endif // HB_EFFECTS
Q_PRIVATE_SLOT(d_func(), void _q_timeoutFinished())
};
--- a/src/hbcore/gui/hbpopup_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbpopup_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -109,13 +109,15 @@
QPointer<QObject> receiverToDisconnectOnClose;
QByteArray memberToDisconnectOnClose;
qreal mScreenMargin;
+ bool mAutoLayouting;
public:
#ifdef HB_EFFECTS
void _q_delayedHide(HbEffect::EffectStatus status);
- void _q_orientationChange(Qt::Orientation orient, bool animate);
+ void _q_orientationAboutToChange(Qt::Orientation orient, bool animate);
#endif // HB_EFFECTS
void _q_timeoutFinished();
+ void _q_orientationChanged();
bool addPopupToScene();
void handleBackgroundMousePressEvent();
@@ -134,6 +136,7 @@
void doSetModal( bool modal );
QString effectType;
HbVgMaskEffect *mVgMaskEffect;
+ bool mOrientationEffectHide;
private:
static bool popupEffectsLoaded;
static HbPopupPrivate *d_ptr(HbPopup *popup) {
--- a/src/hbcore/gui/hbpopupmanager.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbpopupmanager.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -94,7 +94,7 @@
{
if (!mPopup.isNull()) {
const QSizeF popupPreferredSize =
- mPopup->effectiveSizeHint(Qt::PreferredSize);
+ mPopup->effectiveSizeHint(Qt::PreferredSize);
const QSizeF usedSize( qMin(rect.width(), popupPreferredSize.width() ),
qMin( rect.height(), popupPreferredSize.height() ) );
QPointF usedPos(rect.left(), rect.top());
@@ -157,7 +157,12 @@
usedPos = QPointF(usedx, usedy);
}
- mPopup->setGeometry(QRectF(usedPos, usedSize));
+ if (((HbPopupPrivate*)HbPopupPrivate::d_ptr(mPopup))->mAutoLayouting) {
+ mPopup->setGeometry(QRectF(usedPos, usedSize));
+ ((HbPopupPrivate*)HbPopupPrivate::d_ptr(mPopup))->mAutoLayouting = true;
+ } else {
+ mPopup->resize(usedSize);
+ }
}
}
@@ -178,7 +183,7 @@
Q_UNUSED( obj );
switch( event->type() ) {
case QEvent::LayoutRequest: {
- updateGeometry();
+ updateGeometry();
break;
}
case QEvent::ContextMenu: {
@@ -416,8 +421,7 @@
popup->metaObject()->className() != QLatin1String("HbExactWordPopup") &&
popup->metaObject()->className() != QLatin1String("HbInputSmileyPicker") &&
popup->metaObject()->className() != QLatin1String("Hb12KeyCustomKeypad") &&
- popup->metaObject()->className() != QLatin1String("HbInputThaiSpecialPopup") &&
- !popup->inherits("HbInputVkbWidget")) {
+ !popup->inherits("HbInputVkbWidget")) {
setGeometryForPopup( popup );
}
}
@@ -432,8 +436,12 @@
if(!initialFocusedItem && scene) {
initialFocusedItem = scene->focusItem();
}
-
- topLevelFocusablePopup->setFocus();
+
+ // an embedded graphics item is already having a
+ // focus so do not set focus as graphicsscene will automatically
+ // set the focus to the embedded item.
+ if (!topLevelFocusablePopup->focusItem())
+ topLevelFocusablePopup->setFocus();
}
updateFading();
--- a/src/hbcore/gui/hbscreen.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbscreen.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -46,8 +46,8 @@
\internal
*/
-HbScreen::HbScreen() :
- HbWidget(),
+HbScreen::HbScreen() :
+ HbWidget(),
mStack(0),
mTb(0),
mDock(0),
@@ -57,14 +57,14 @@
{
}
-void HbScreen::setStackWidget(HbContentWidget *stack)
+void HbScreen::setStackWidget(HbContentWidget *stack)
{
if (mStack != stack) {
if (mStack) {
HbStyle::setItemName(mTb, QString());
HbStyle::setItemName(mDock, QString());
}
- mStack = stack;
+ mStack = stack;
}
}
@@ -75,10 +75,10 @@
disconnect(&HbToolBarPrivate::d_ptr(mTb)->core, 0, this, 0);
HbStyle::setItemName(mTb, QString());
}
- mTb = tb;
+ mTb = tb;
if (mTb) {
- setToolBarOrientation(mTb->orientation());
- if (mDelayedConstructionHandled){
+ setToolBarOrientation(mTb->orientation());
+ if (mDelayedConstructionHandled) {
connect(&HbToolBarPrivate::d_ptr(mTb)->core, SIGNAL(orientationChanged()), this, SLOT(toolBarOrientationChanged()));
connect(&HbToolBarPrivate::d_ptr(mTb)->core, SIGNAL(visibilityChanged()), this, SLOT(decoratorVisibilityChanged()));
}
@@ -95,7 +95,7 @@
disconnect(&HbDockWidgetPrivate::d_ptr(mDock)->core, 0, this, 0);
HbStyle::setItemName(mDock, QString());
}
- mDock = dock;
+ mDock = dock;
if (mDock && mDelayedConstructionHandled) {
connect(&HbDockWidgetPrivate::d_ptr(mDock)->core, SIGNAL(visibilityChanged()), this, SLOT(decoratorVisibilityChanged()));
}
@@ -117,13 +117,12 @@
//avoid unnecessary complications in setName function.
if ((mTb->isVisible() || forced) && mTb->actions().count()) {
HbStyle::setItemName(mTb, "toolbar");
- }
- else {
+ } else {
HbStyle::setItemName(mTb, QString());
}
}
-void HbScreen::polish(HbStyleParameters& params)
+void HbScreen::polish(HbStyleParameters ¶ms)
{
if (!mScreenPolished) {
mScreenOrientation = mainWindow()->orientation();
@@ -131,10 +130,10 @@
}
if (mStack) {
- HbView *currentView = qobject_cast<HbView*>(mStack->currentWidget());
+ HbView *currentView = qobject_cast<HbView *>(mStack->currentWidget());
if (currentView && currentView->isContentFullScreen()) {
setName(mStack, "mainfull");
- } else {
+ } else {
setName(mStack, "main");
}
}
@@ -145,7 +144,7 @@
}
if (mDock) {
- setName(mDock,"dock");
+ setName(mDock, "dock");
}
mScreenPolished = true;
@@ -158,17 +157,18 @@
layout()->activate();
}
HbMainWindow *w = mainWindow();
- HbMainWindowPrivate::d_ptr(w)->postIdleEvent(HbMainWindowPrivate::IdleOrientationEvent);
+ HbMainWindowPrivate::d_ptr(w)->postIdleEvent(HbMainWindowPrivate::IdleOrientationEvent);
}
void HbScreen::delayedConstruction()
{
- if (mDelayedConstructionHandled)
+ if (mDelayedConstructionHandled) {
return;
+ }
mDelayedConstructionHandled = true;
if (mTb) {
- connect( &HbToolBarPrivate::d_ptr ( mTb )->core, SIGNAL(orientationChanged()), this, SLOT(toolBarOrientationChanged()));
- connect( &HbToolBarPrivate::d_ptr ( mTb )->core, SIGNAL(visibilityChanged()), this, SLOT(decoratorVisibilityChanged()));
+ connect(&HbToolBarPrivate::d_ptr(mTb)->core, SIGNAL(orientationChanged()), this, SLOT(toolBarOrientationChanged()));
+ connect(&HbToolBarPrivate::d_ptr(mTb)->core, SIGNAL(visibilityChanged()), this, SLOT(decoratorVisibilityChanged()));
HbToolBarPrivate::d_ptr(mTb)->delayedConstruction();
}
if (mDock) {
@@ -176,7 +176,7 @@
}
}
-void HbScreen::setGeometry (const QRectF & rect)
+void HbScreen::setGeometry(const QRectF &rect)
{
prepareGeometryChange();
HbWidget::setGeometry(rect);
@@ -197,11 +197,12 @@
{
bool contentUnderTitleBar = false;
if (mStack) {
- HbView *currentView = qobject_cast<HbView*>(mStack->currentWidget());
- if (currentView && (currentView->viewFlags()
- & (HbView::ViewTitleBarMinimized | HbView::ViewTitleBarFloating
- | HbView::ViewTitleBarHidden))) {
- contentUnderTitleBar = true;
+ HbView *currentView = qobject_cast<HbView *>(mStack->currentWidget());
+ if (currentView && !(currentView->viewFlags() & HbView::ViewDisableRelayout)) {
+ if (currentView->viewFlags() & (HbView::ViewTitleBarMinimized
+ | HbView::ViewTitleBarFloating | HbView::ViewTitleBarHidden)) {
+ contentUnderTitleBar = true;
+ }
}
}
return contentUnderTitleBar;
@@ -211,10 +212,12 @@
{
bool contentUnderStatusBar = false;
if (mStack) {
- HbView *currentView = qobject_cast<HbView*>(mStack->currentWidget());
- if (currentView && (currentView->viewFlags()
- & (HbView::ViewStatusBarFloating | HbView::ViewStatusBarHidden))) {
- contentUnderStatusBar = true;
+ HbView *currentView = qobject_cast<HbView *>(mStack->currentWidget());
+ if (currentView && !(currentView->viewFlags() & HbView::ViewDisableRelayout)) {
+ if (currentView->viewFlags() & (HbView::ViewStatusBarFloating
+ | HbView::ViewStatusBarHidden)) {
+ contentUnderStatusBar = true;
+ }
}
}
return contentUnderStatusBar;
@@ -224,7 +227,7 @@
{
bool titleBarMinimizable = false;
if (mStack) {
- HbView *currentView = qobject_cast<HbView*>(mStack->currentWidget());
+ HbView *currentView = qobject_cast<HbView *>(mStack->currentWidget());
if (currentView && (currentView->viewFlags() & (HbView::ViewTitleBarMinimizable))) {
titleBarMinimizable = true;
}
@@ -249,7 +252,7 @@
void HbScreen::setToolBarOrientation(Qt::Orientation orientation)
{
if (orientation != mToolBarOrientation) {
- if (mTb){
+ if (mTb) {
HbToolBarPrivate::d_ptr(mTb)->mDoLayout = false;
repolish();
}
@@ -259,6 +262,12 @@
void HbScreen::decoratorVisibilityChanged()
{
+ HbMainWindow *window = mainWindow();
+ // Do not repolish if orientation is about to change
+ if (window && HbMainWindowPrivate::d_ptr(window)->mOrientationChangeOngoing
+ && mScreenOrientation != HbMainWindowPrivate::d_ptr(window)->mOrientation) {
+ return;
+ }
if (mTb) {
HbToolBarPrivate::d_ptr(mTb)->mDoLayout = false;
}
@@ -266,7 +275,7 @@
QCoreApplication::sendPostedEvents(this, QEvent::Polish);
}
-void HbScreen::currentViewChanged(HbView* view)
+void HbScreen::currentViewChanged(HbView *view)
{
Q_UNUSED(view);
repolish();
@@ -275,7 +284,7 @@
bool HbScreen::event(QEvent *e)
{
if (e->type() == HbEvent::DeviceProfileChanged) {
- // supress polishEvent() [which is called in HbWidget::event()] into repolish()
+ // suppress polishEvent() [which is called in HbWidget::event()] into repolish()
repolish();
return QGraphicsWidget::event(e);
} else {
--- a/src/hbcore/gui/hbscrollarea_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbscrollarea_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -135,6 +135,7 @@
q->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
q->setFlag( QGraphicsItem::ItemClipsChildrenToShape, true );
+ q->setFlag(QGraphicsItem::ItemHasNoContents, true);
q->setFocusPolicy(Qt::StrongFocus);
// Scrollbar is created when it is shown for the first time.
@@ -168,7 +169,11 @@
QObject::connect(&(mScrollTimer), SIGNAL(timeout()), q, SLOT(_q_animateScrollTimeout()));
QObject::connect(&(mScrollBarHideTimer), SIGNAL(timeout()), q, SLOT(_q_hideScrollBars()));
+#if QT_VERSION >= 0x040700
+ q->grabGesture(Qt::PanGesture, Qt::ReceivePartialGestures | Qt::IgnoredGesturesPropagateToParent);
+#else
q->grabGesture(Qt::PanGesture, Qt::ReceivePartialGestures);
+#endif
q->grabGesture(Qt::TapGesture);
}
@@ -684,6 +689,10 @@
{
if(mContents) {
Q_Q(HbScrollArea);
+ // if contentwidget size has changed, xxxBoundary() functions
+ // won't work without this
+ QCoreApplication::sendPostedEvents(q, QEvent::LayoutRequest);
+
QPointF currentPosition = -mContents->pos();
QPointF newPosition = currentPosition;
--- a/src/hbcore/gui/hbscrollbar.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbscrollbar.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -98,6 +98,7 @@
Q_Q(HbScrollBar);
q->grabGesture(Qt::PanGesture);
q->grabGesture(Qt::TapGesture);
+ q->setFlag(QGraphicsItem::ItemHasNoContents, true);
}
void HbScrollBarPrivate::createPrimitives()
--- a/src/hbcore/gui/hbsettingswindow_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbsettingswindow_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -36,14 +36,14 @@
#include "hbgraphicsscene_p.h"
#include "hbeffectinternal_p.h"
-#include <QPointer>
-#include <QComboBox>
-#include <QFormLayout>
-#include <QVBoxLayout>
-#include <QGroupBox>
-#include <QApplication>
-#include <QSettings>
-#include <QPushButton>
+#include <QPointer> //krazy:exclude=qclasses
+#include <QComboBox> //krazy:exclude=qclasses
+#include <QFormLayout> //krazy:exclude=qclasses
+#include <QVBoxLayout> //krazy:exclude=qclasses
+#include <QGroupBox> //krazy:exclude=qclasses
+#include <QApplication> //krazy:exclude=qclasses
+#include <QSettings> //krazy:exclude=qclasses
+#include <QPushButton> //krazy:exclude=qclasses
#include <hbevent.h>
#ifdef HB_CSS_INSPECTOR
@@ -94,14 +94,14 @@
directionComboBox = new QComboBox(this);
dragToResizeComboBox = new QComboBox(this);
mSensorComboBox = new QComboBox(this);
- mGeneralSettingsForSensorsComboBox = new QComboBox(this);
- mUnsetOrientationButton = new QPushButton(tr("&Unset orientation"), this);
+ mGeneralSettingsForSensorsComboBox = new QComboBox(this); //krazy:exclude=qclasses
+ mUnsetOrientationButton = new QPushButton(tr("&Unset orientation"), this); //krazy:exclude=qclasses
mLights = true;
HbIcon icon("qtg_mono_light");
- mLightsButton = new QPushButton(icon.pixmap(), "", this);
- mAnimationButton = new QPushButton(tr("&Animation on"), this);
- mViewPortSizeButton = new QPushButton(tr("&Set custom ViewPortSize"),this);
+ mLightsButton = new QPushButton(icon.pixmap(), "", this); //krazy:exclude=qclasses
+ mAnimationButton = new QPushButton(tr("&Animation on"), this); //krazy:exclude=qclasses
+ mViewPortSizeButton = new QPushButton(tr("&Set custom ViewPortSize"), this); //krazy:exclude=qclasses
resolutionComboBox->addItems(HbDeviceProfile::profileNames());
directionComboBox->addItems(QStringList() << tr("Left to right") << tr("Right to left"));
@@ -121,10 +121,10 @@
connect(mAnimationButton, SIGNAL(pressed()), SLOT(toggleAnimation()));
connect(mViewPortSizeButton, SIGNAL(pressed()), SLOT(resizeViewPort()));
- QVBoxLayout *boxLayout = new QVBoxLayout(this);
-
- QGroupBox *mainGroup = new QGroupBox(this);
- QFormLayout *layout = new QFormLayout(mainGroup);
+ QVBoxLayout *boxLayout = new QVBoxLayout(this); //krazy:exclude=qclasses
+
+ QGroupBox *mainGroup = new QGroupBox(this); //krazy:exclude=qclasses
+ QFormLayout *layout = new QFormLayout(mainGroup); //krazy:exclude=qclasses
layout->addRow(tr("&Window"), windowComboBox);
layout->addRow(tr("&Resolution"), resolutionComboBox);
layout->addRow(tr("&Direction"), directionComboBox);
@@ -133,9 +133,9 @@
mainGroup->setLayout(layout);
boxLayout->addWidget(mainGroup);
-
- QGroupBox *sensorGroup = new QGroupBox(tr("Sensor handling"), this);
- QFormLayout *sensorLayout = new QFormLayout(sensorGroup);
+
+ QGroupBox *sensorGroup = new QGroupBox(tr("Sensor handling"), this); //krazy:exclude=qclasses
+ QFormLayout *sensorLayout = new QFormLayout(sensorGroup); //krazy:exclude=qclasses
sensorLayout->addRow(tr("&Sensors"), mSensorComboBox);
sensorLayout->addRow(tr("&GS sensors"), mGeneralSettingsForSensorsComboBox);
@@ -146,28 +146,28 @@
mainGroup->setLayout(sensorLayout);
boxLayout->addWidget(sensorGroup);
- QGroupBox *globalGroup = new QGroupBox(tr("Global debug drawing"), this);
- QFormLayout *globalLayout = new QFormLayout(globalGroup);
-
+ QGroupBox *globalGroup = new QGroupBox(tr("Global debug drawing"), this); //krazy:exclude=qclasses
+ QFormLayout *globalLayout = new QFormLayout(globalGroup); //krazy:exclude=qclasses
+
touchAreaComboBox = new QComboBox(this);
touchAreaComboBox->addItems(QStringList() << tr("Invisible") << tr("Visible"));
connect(touchAreaComboBox, SIGNAL(currentIndexChanged(int)), SLOT(changeTouchArea(int)));
- globalLayout->addRow(tr("&Touch areas"), touchAreaComboBox);
-
+ globalLayout->addRow(tr("&Touch areas"), touchAreaComboBox);
+
textBoxesComboBox = new QComboBox(this);
textBoxesComboBox->addItems(QStringList() << tr("Invisible") << tr("Visible"));
connect(textBoxesComboBox, SIGNAL(currentIndexChanged(int)), SLOT(changeTextBoxes(int)));
- globalLayout->addRow(tr("&Text items"), textBoxesComboBox);
-
+ globalLayout->addRow(tr("&Text items"), textBoxesComboBox);
+
iconBoxesComboBox = new QComboBox(this);
iconBoxesComboBox->addItems(QStringList() << tr("Invisible") << tr("Visible"));
connect(iconBoxesComboBox, SIGNAL(currentIndexChanged(int)), SLOT(changeIconBoxes(int)));
- globalLayout->addRow(tr("&Icon items"), iconBoxesComboBox);
-
+ globalLayout->addRow(tr("&Icon items"), iconBoxesComboBox);
+
fpsCounterComboBox = new QComboBox(this);
fpsCounterComboBox->addItems(QStringList() << tr("Invisible") << tr("Visible"));
connect(fpsCounterComboBox, SIGNAL(currentIndexChanged(int)), SLOT(changeFpsCounter(int)));
- globalLayout->addRow(tr("&Fps counter"), fpsCounterComboBox);
+ globalLayout->addRow(tr("&Fps counter"), fpsCounterComboBox);
globalGroup->setLayout(globalLayout);
boxLayout->addWidget(globalGroup);
@@ -176,14 +176,14 @@
QGroupBox *cssGroup = new QGroupBox(tr("CSS Debugging"), this);
QHBoxLayout *cssLayout = new QHBoxLayout(cssGroup);
- cssWindowButton = new QPushButton(tr("Show CSS inspector"), this);
+ cssWindowButton = new QPushButton(tr("Show CSS inspector"), this); //krazy:exclude=qclasses
connect(cssWindowButton, SIGNAL(pressed()), HbCssInspectorWindow::instance(), SLOT(show()));
cssLayout->addWidget(cssWindowButton);
cssGroup->setLayout(cssLayout);
boxLayout->addWidget(cssGroup);
#endif
- initStartUpValues();
+ initStartUpValues();
}
HbSettingsWindow::~HbSettingsWindow()
@@ -196,7 +196,7 @@
QStringList windows;
windows << tr("Global");
- foreach (HbMainWindow *window, hbInstance->allMainWindows()) {
+ foreach(HbMainWindow * window, hbInstance->allMainWindows()) {
windows << windowName(window);
}
@@ -227,15 +227,15 @@
HbMainWindow *window = getWindow(windowComboBox->currentIndex());
if (!window) {
// global
-
+
// resize all windows
- QListIterator<HbMainWindow*> iterator(hbInstance->allMainWindows());
+ QListIterator<HbMainWindow *> iterator(hbInstance->allMainWindows());
while (iterator.hasNext()) {
HbMainWindow *window = iterator.next();
window->resize(profile.logicalSize());
HbDeviceProfileManager::select(*window, profile);
}
-
+
} else {
// window specific
window->resize(profile.logicalSize());
@@ -247,14 +247,14 @@
void HbSettingsWindow::changeDirection(int index)
{
HbMainWindow *window = getWindow(windowComboBox->currentIndex());
- if(!window){
+ if (!window) {
Qt::LayoutDirection dir = HbApplication::layoutDirection();
HbApplication::setLayoutDirection(dir == Qt::LeftToRight ? Qt::RightToLeft : Qt::LeftToRight);
- }else{
+ } else {
Qt::LayoutDirection dir = index == 0 ? Qt::LeftToRight : Qt::RightToLeft;
- if(dir != HbApplication::layoutDirection()){
+ if (dir != HbApplication::layoutDirection()) {
window->setLayoutDirection(dir);
- }else{
+ } else {
window->unsetLayoutDirection();
}
}
@@ -263,47 +263,47 @@
void HbSettingsWindow::changeTouchArea(int index)
{
HbTouchAreaPrivate::setOutlineDrawing(index > 0);
- foreach (HbMainWindow *window, hbInstance->allMainWindows()) {
+ foreach(HbMainWindow * window, hbInstance->allMainWindows()) {
// Force window to redraw
QEvent event(QEvent::WindowActivate);
- QApplication::sendEvent(window, &event);
+ QApplication::sendEvent(window, &event); //krazy:exclude=qclasses
}
}
void HbSettingsWindow::changeTextBoxes(int index)
{
HbTextItemPrivate::outlinesEnabled = index > 0;
- foreach (HbMainWindow *window, hbInstance->allMainWindows()) {
+ foreach(HbMainWindow * window, hbInstance->allMainWindows()) {
// Force window to redraw
QEvent event(QEvent::WindowActivate);
- QApplication::sendEvent(window, &event);
- }
+ QApplication::sendEvent(window, &event); //krazy:exclude=qclasses
+ }
}
void HbSettingsWindow::changeIconBoxes(int index)
{
HbIconItemPrivate::outlinesEnabled = index > 0;
- foreach (HbMainWindow *window, hbInstance->allMainWindows()) {
+ foreach(HbMainWindow * window, hbInstance->allMainWindows()) {
// Force window to redraw
QEvent event(QEvent::WindowActivate);
- QApplication::sendEvent(window, &event);
- }
+ QApplication::sendEvent(window, &event); //krazy:exclude=qclasses
+ }
}
void HbSettingsWindow::changeFpsCounter(int index)
{
HbGraphicsScenePrivate::fpsCounterEnabled = index > 0;
- foreach (HbMainWindow *window, hbInstance->allMainWindows()) {
+ foreach(HbMainWindow * window, hbInstance->allMainWindows()) {
// Force window to redraw
QEvent event(QEvent::WindowActivate);
- QApplication::sendEvent(window, &event);
- }
+ QApplication::sendEvent(window, &event); //krazy:exclude=qclasses
+ }
}
void HbSettingsWindow::changeDragToResize(int index)
{
resolutionComboBox->setEnabled(index == 0);
- foreach (HbMainWindow *window, hbInstance->allMainWindows()) {
+ foreach(HbMainWindow * window, hbInstance->allMainWindows()) {
HbDeviceProfile profile = HbDeviceProfile::profile(window);
window->resize(profile.logicalSize());
}
@@ -312,38 +312,40 @@
void HbSettingsWindow::changeSensorValue(int index)
{
- if (mSensorComboBox->count() == 3 && (index == 0 || index == 1))
+ if (mSensorComboBox->count() == 3 && (index == 0 || index == 1)) {
mSensorComboBox->removeItem(2);
+ }
- QSettings mSettings( "Nokia", "HbStartUpDeskTopSensors");
- switch(index) {
- case 0:
- HbMainWindowOrientation::instance()->mSensorListener->setSensorOrientation(Qt::Horizontal);
- mSettings.setValue("Orientation", 1);
+ QSettings mSettings("Nokia", "HbStartUpDeskTopSensors");
+ switch (index) {
+ case 0:
+ HbMainWindowOrientation::instance()->mSensorListener->setSensorOrientation(Qt::Horizontal);
+ mSettings.setValue("Orientation", 1);
break;
- case 1:
- HbMainWindowOrientation::instance()->mSensorListener->setSensorOrientation(Qt::Vertical);
- mSettings.setValue("Orientation", 2);
+ case 1:
+ HbMainWindowOrientation::instance()->mSensorListener->setSensorOrientation(Qt::Vertical);
+ mSettings.setValue("Orientation", 2);
break;
- case 2: //Empty
+ case 2: //Empty
break;
- case 3: //Initialize
- if (mSettings.value("Orientation").toInt() == 1)
- mSensorComboBox->setCurrentIndex(0);
- else
- mSensorComboBox->setCurrentIndex(1);
- break;
- default:
- break;
+ case 3: //Initialize
+ if (mSettings.value("Orientation").toInt() == 1) {
+ mSensorComboBox->setCurrentIndex(0);
+ } else {
+ mSensorComboBox->setCurrentIndex(1);
+ }
+ break;
+ default:
+ break;
}
}
void HbSettingsWindow::changeGSettingsForSensors(int index)
{
QSettings mSettings("Nokia", "HbStartUpDeskTopSensors");
- if (index == 3){ //Initialize
+ if (index == 3) { //Initialize
mGeneralSettingsForSensorsComboBox->setCurrentIndex(mSettings.value("SensorsEnabled").toBool());
- } else {
+ } else {
mSettings.setValue("SensorsEnabled", (bool)index);
HbMainWindowOrientation::instance()->mSensorListener->enableSensors(index, true);
}
@@ -351,7 +353,7 @@
void HbSettingsWindow::unsetOrientation()
{
- foreach (HbMainWindow *window, hbInstance->allMainWindows()) {
+ foreach(HbMainWindow * window, hbInstance->allMainWindows()) {
if (!HbMainWindowPrivate::d_ptr(window)->mAutomaticOrientationSwitch) {
window->unsetOrientation();
}
@@ -365,13 +367,13 @@
for (int i = 0; i < mainWindowList.count(); ++i) {
if (mLights) {
icon.setIconName("qtg_mono_light_off");
- mainWindowList[i]->broadcastEvent(HbEvent::SleepModeEnter);
- mLights = false;
+ mainWindowList[i]->broadcastEvent(HbEvent::SleepModeEnter);
+ mLights = false;
mainWindowList[i]->setForegroundBrush(QBrush(Qt::black, Qt::Dense1Pattern));
} else {
icon.setIconName("qtg_mono_light");
mainWindowList[i]->broadcastEvent(HbEvent::SleepModeExit);
- mLights = true;
+ mLights = true;
mainWindowList[i]->setForegroundBrush(Qt::NoBrush);
}
mLightsButton->setIcon(icon.pixmap());
@@ -398,7 +400,7 @@
if (!mCustomViewPortSize) {
mViewPortOriginalSize = window->size();
QSizeF newSize = mViewPortOriginalSize;
- newSize.scale(mViewPortOriginalSize.width(),mViewPortOriginalSize.height()-150,Qt::IgnoreAspectRatio);
+ newSize.scale(mViewPortOriginalSize.width(), mViewPortOriginalSize.height() - 150, Qt::IgnoreAspectRatio);
HbMainWindowPrivate::d_ptr(window)->setViewportSize(newSize);
mCustomViewPortSize = true;
mViewPortSizeButton->setText(tr("&Set original ViewPortSize"));
--- a/src/hbcore/gui/hbsplash.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbsplash.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -40,7 +40,7 @@
/*!
\class HbSplash
-
+
\brief Class with utility functions for accessing splash screens.
\internal
@@ -64,8 +64,7 @@
return QString("prt");
}
-struct Params
-{
+struct Params {
int *w;
int *h;
int *bpl;
@@ -113,7 +112,7 @@
w = *headerPtr++;
h = *headerPtr++;
bpl = *headerPtr++;
- fmt = (QImage::Format) *headerPtr++;
+ fmt = (QImage::Format) * headerPtr++;
params.extra = *headerPtr;
if (fmt != QImage::Format_ARGB32_Premultiplied) {
qWarning("[hbsplash] Image format for %s is not ARGB32_PRE (is %d instead)",
@@ -257,9 +256,9 @@
}
bool HbSplashSrvClient::getSplashFileHandle(RFile &f,
- const QString &ori,
- const QString &appId,
- const QString &screenId)
+ const QString &ori,
+ const QString &appId,
+ const QString &screenId)
{
TPtrC oriDes(static_cast<const TUint16 *>(ori.utf16()), ori.length());
TPtrC appIdDes(static_cast<const TUint16 *>(appId.utf16()), appId.length());
@@ -272,9 +271,9 @@
}
uchar *HbSplashSrvClient::getSplashFromBitmap(const QString &ori,
- const QString &appId,
- const QString &screenId,
- Params ¶ms)
+ const QString &appId,
+ const QString &screenId,
+ Params ¶ms)
{
TPtrC oriDes(static_cast<const TUint16 *>(ori.utf16()), ori.length());
TPtrC appIdDes(static_cast<const TUint16 *>(appId.utf16()), appId.length());
@@ -334,6 +333,7 @@
if (appIdStr.isEmpty()) {
RProcess process;
appIdStr = QString::number(process.SecureId().iId, 16);
+ process.Close();
}
uchar *data = 0;
--- a/src/hbcore/gui/hbsplashdefs_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbsplashdefs_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -50,4 +50,8 @@
#endif // Q_OS_SYMBIAN
+enum HbSplashStoredExtraFlags {
+ HbSplashNonStandardStatusBar = 1
+};
+
#endif // HBSPLASHDEFS_P_H
--- a/src/hbcore/gui/hbsplashscreen.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbsplashscreen.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -211,7 +211,7 @@
if (!mContents.isNull()) {
qDebug("[hbsplash] splash screen initialized");
#ifdef Q_OS_SYMBIAN
- showFullScreen();
+ showFullScreen(); // krazy:exclude=qmethods
#else
show();
#endif
--- a/src/hbcore/gui/hbstackedwidget.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbstackedwidget.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -32,14 +32,14 @@
@hbcore
\class HbStackedWidget
\brief HbStackedWidget manages geometries of stacked layout contents.
-
+
HbStackedLayout is a simple container that allows client add several widgets
- and then select one widget to be shown. This widget will manage visibility
- and focus in addition to size and position.
+ and then select one widget to be shown. This widget will manage visibility
+ and focus in addition to size and position.
Example code:
\snippet{stackedwidgetsample.cpp,1}
-
+
\sa HbStackedLayout
*/
@@ -52,7 +52,7 @@
HbStackedWidgetPrivate() : mCurrentIndex(-1), mLayout(0) {}
void setCurrentIndex(int index, QGraphicsWidget *prev, bool hideOld = true, bool showNew = true);
-
+
int mCurrentIndex;
HbStackedLayout *mLayout;
};
@@ -71,10 +71,11 @@
}
QGraphicsWidget *next = q->widgetAt(index);
- if (next == prev)
+ if (next == prev) {
return;
+ }
- QGraphicsWidget* focused = 0;
+ QGraphicsWidget *focused = 0;
if (prev) {
focused = prev->focusWidget();
// Set previous widget invisible. Focus will be reset after this statement.
@@ -105,7 +106,7 @@
d->q_ptr = this;
HbStackedLayout *layout = new HbStackedLayout;
- setLayout( layout );
+ setLayout(layout);
d->mLayout = layout;
}
@@ -163,13 +164,13 @@
{
Q_D(HbStackedWidget);
int addedIndex = d->mLayout->insertItem(index, widget); // this will usually reparent 'widget'
- if ( addedIndex != -1 ) {
+ if (addedIndex != -1) {
// Need to store current index, since it might change
// during "widgetAdded" signal (someone might call back
// e.g. "setCurrentIndex".
int currentIndex = d->mCurrentIndex;
emit widgetAdded(addedIndex);
- if ( currentIndex == d->mCurrentIndex ) {
+ if (currentIndex == d->mCurrentIndex) {
// Current index not touched from outside.
if (d->mCurrentIndex < 0) {
setCurrentIndex(addedIndex);
@@ -203,23 +204,23 @@
{
Q_D(HbStackedWidget);
int index = indexOf(widget);
- if ( index == -1 ) {
+ if (index == -1) {
return;
}
d->mLayout->removeAt(index);
- if ( index == d->mCurrentIndex ) {
+ if (index == d->mCurrentIndex) {
d->mCurrentIndex = -1;
int c = count();
- if ( c > 0 ) {
- int newIndex = (index == c) ? index-1 : index;
+ if (c > 0) {
+ int newIndex = (index == c) ? index - 1 : index;
d->setCurrentIndex(newIndex, widget);
} else {
// The last widget was removed.
widget->setVisible(false);
- emit currentChanged( -1 );
+ emit currentChanged(-1);
}
- } else if ( index <= d->mCurrentIndex ) {
+ } else if (index <= d->mCurrentIndex) {
d->mCurrentIndex--;
emit currentChanged(d->mCurrentIndex);
}
@@ -241,7 +242,7 @@
QGraphicsWidget *HbStackedWidget::removeAt(int index)
{
QGraphicsWidget *widget = widgetAt(index);
- if ( widget ) {
+ if (widget) {
removeWidget(widget);
}
return widget;
@@ -275,7 +276,7 @@
QGraphicsWidget *HbStackedWidget::widgetAt(int index) const
{
Q_D(const HbStackedWidget);
- return static_cast<QGraphicsWidget*>(d->mLayout->itemAt(index));
+ return static_cast<QGraphicsWidget *>(d->mLayout->itemAt(index));
}
/*!
@@ -315,14 +316,14 @@
\param index position of the new current widget.
*/
- /*!
- \brief Sets current widget from specified index.
+/*!
+ \brief Sets current widget from specified index.
- This method will set the widget at given \a index visible and
- the previous widget invisible.
+ This method will set the widget at given \a index visible and
+ the previous widget invisible.
- \param index position of desired widget.
- */
+ \param index position of desired widget.
+*/
void HbStackedWidget::setCurrentIndex(int index)
{
Q_D(HbStackedWidget);
--- a/src/hbcore/gui/hbtestabilitysignal.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbtestabilitysignal.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -27,9 +27,9 @@
HbTestabilitySignal_p::HbTestabilitySignal_p(QObject *parent)
: QObject(parent), testabilitySignal(false),
- enabledChangeObserver(0), observerParam(0)
+ enabledChangeObserver(0), observerParam(0)
{
- setObjectName("HbTestabilitySignal");
+ setObjectName("HbTestabilitySignal");
}
HbTestabilitySignal_p::~HbTestabilitySignal_p()
@@ -38,18 +38,18 @@
void HbTestabilitySignal_p::enableSignal(bool enabled)
{
- testabilitySignal = enabled;
- if (enabledChangeObserver) {
- enabledChangeObserver(enabled, observerParam);
- }
+ testabilitySignal = enabled;
+ if (enabledChangeObserver) {
+ enabledChangeObserver(enabled, observerParam);
+ }
}
bool HbTestabilitySignal_p::signalEnabled() const
{
- return testabilitySignal;
+ return testabilitySignal;
}
-void HbTestabilitySignal_p::notifySignalEnabled(void (*observer)(bool, void*), void *param)
+void HbTestabilitySignal_p::notifySignalEnabled(void (*observer)(bool, void *), void *param)
{
enabledChangeObserver = observer;
observerParam = param;
--- a/src/hbcore/gui/hbtestabilitysignal_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbtestabilitysignal_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -35,18 +35,18 @@
Q_OBJECT
public:
- HbTestabilitySignal_p(QObject *parent = 0);
- ~HbTestabilitySignal_p();
- void enableSignal(bool enabled = false);
- bool signalEnabled() const;
- void notifySignalEnabled(void (*observer)(bool, void*), void *param);
-
+ HbTestabilitySignal_p(QObject *parent = 0);
+ ~HbTestabilitySignal_p();
+ void enableSignal(bool enabled = false);
+ bool signalEnabled() const;
+ void notifySignalEnabled(void (*observer)(bool, void *), void *param);
+
signals:
- void propertyChanges(QGraphicsItem::GraphicsItemChange change, const QVariant &value);
+ void propertyChanges(QGraphicsItem::GraphicsItemChange change, const QVariant &value);
private:
- bool testabilitySignal;
- void (*enabledChangeObserver)(bool, void*);
+ bool testabilitySignal;
+ void (*enabledChangeObserver)(bool, void *);
void *observerParam;
friend class HbWidget;
--- a/src/hbcore/gui/hbtoolbar.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbtoolbar.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -341,6 +341,13 @@
HbWidget::hideEvent(event);
}
+QRectF HbToolBar::boundingRect() const
+{
+ QRectF orginalRect(HbWidget::boundingRect());
+ orginalRect.setTop(orginalRect.top() + 1.0);
+ return orginalRect;
+}
+
/*!
\reimp
*/
@@ -387,4 +394,13 @@
}
}
+void HbToolBar::polish(HbStyleParameters ¶ms)
+{
+ Q_D(HbToolBar);
+ HbWidget::polish(params);
+ if (d->mDoLayoutPending) {
+ d->doLayout();
+ }
+}
+
#include "moc_hbtoolbar.cpp"
--- a/src/hbcore/gui/hbtoolbar.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbtoolbar.h Fri Jun 11 13:58:22 2010 +0300
@@ -60,6 +60,8 @@
enum { Type = Hb::ItemType_ToolBar };
int type() const { return Type; }
+ QRectF boundingRect() const;
+
public slots:
void setOrientation(Qt::Orientation orientation);
@@ -72,6 +74,7 @@
void resizeEvent( QGraphicsSceneResizeEvent *event );
void hideEvent(QHideEvent *event);
bool event( QEvent *event );
+ virtual void polish(HbStyleParameters ¶ms);
private:
Q_DECLARE_PRIVATE_D( d_ptr, HbToolBar )
--- a/src/hbcore/gui/hbtoolbar_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbtoolbar_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -52,6 +52,10 @@
bool HbToolBarPrivate::effectsLoaded = false;
#endif
+//If minimum button size cannot be calculated
+//more button will appear after default button count is exceeded
+static const int DEFAULT_TOOLBUTTON_COUNT = 5;
+
HbToolBarPrivate::HbToolBarPrivate() :
mLayout(0),
mPressedDownButton(0),
@@ -90,6 +94,7 @@
void HbToolBarPrivate::init()
{
Q_Q(HbToolBar);
+ q->setFlag(QGraphicsItem::ItemHasNoContents, true);
q->grabGesture(Qt::PanGesture);
}
@@ -172,7 +177,7 @@
void HbToolBarPrivate::calculateMaximumButtons() {
Q_Q(HbToolBar);
- maxToolBarButtons = 2;
+ maxToolBarButtons = DEFAULT_TOOLBUTTON_COUNT;
if (!minimumToolButtonSize.isEmpty()) {
if (mOrientation == Qt::Horizontal) {
if ((q->size().width() > 0) && (q->size().width() > minimumToolButtonSize.width()))
@@ -361,16 +366,17 @@
//event is recieved by toolbar.
//we emit visibilitychanged signal here if this is the firstAction added in cases
//after toolbar is polished and visible.
-void HbToolBarPrivate::createToolButton(QAction *Action, bool update)
+void HbToolBarPrivate::createToolButton(QAction *newAction, bool update)
{
Q_Q(HbToolBar);
- if(!Action)
+ if(!newAction)
return;
- HbAction* action = qobject_cast<HbAction*>(Action);
+
+ HbAction* action = qobject_cast<HbAction*>(newAction);
if (action) {
// Find out index where to insert button
- int index = q->actions().indexOf(Action);
+ int index = q->actions().indexOf(newAction);
// Lets give the action manager possibility to calculate position for the action
if (action->commandRole() != HbAction::NoRole) {
@@ -620,7 +626,7 @@
HbToolButton *button = 0;
for (int i = 0; i < mToolButtons.count(); i++) {
button = mToolButtons.at(i);
- if (button->action() == event->action()) {
+ if (button && button->action() == event->action()) {
mToolButtons.removeAt(i);
// Emit signal when the only action is removed
if (mToolButtons.count() == 0) {
@@ -636,20 +642,21 @@
QMetaObject::invokeMethod(&core, "visibilityChanged", Qt::QueuedConnection);
return;
}
+ int index = mVisibleToolButtons.indexOf(button);
+ if (index != -1){
+ mVisibleToolButtons.removeAt(index);
+ if (mVisibleToolButtons.isEmpty()){
+ q->setLayout(0);
+ mLayout = 0;
+ }
+ else
+ actionRemoved(index,button);
+ }
+ delete button;
+
break;
}
}
- int index = mVisibleToolButtons.indexOf(button);
- if (index != -1){
- mVisibleToolButtons.removeAt(index);
- if (mVisibleToolButtons.isEmpty()){
- q->setLayout(0);
- mLayout = 0;
- }
- else
- actionRemoved(index,button);
- }
- delete button;
}
void HbToolBarPrivate::updateButtonStyle(HbToolButton *button,bool notInExtension)
--- a/src/hbcore/gui/hbview.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbview.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -43,25 +43,25 @@
/*!
@stable
@hbcore
- \class HbView
- \brief The HbView class defines one screen of user interface content.
-
+ \class HbView
+ \brief The HbView class defines one screen of user interface content.
+
The screen area of a mobile device is small, so an application's user interface is often composed of a set of separate screens of content or "views". Each view can contain a number of widgets. A view can also contain a title, an icon (not used at present), a menu and a toolbar. These additional components are called decorators and together they make up the "chrome" of the interface.
-
+
An application will have a number of views to present different kinds of information to the user. You can add multiple views to the \link HbMainWindow main window \endlink of your application and then manage them through the main window object. When a view is activated, the main window handles the updating of the view contents, i.e. the title, icon, menu and toolbar. The view object itself handles the visibility of the toolbar, but the main window will repaint it whenever the view is activated.
\image html hbview_wireframes.png "Wireframes of two different views in a messaging application"
-
+
\section _usecases_hbview Using the HbView class
In general, the actual widgets, menu and toolbar that make up the content of a view will be designed with a UI layout tool. This means you do not need to use code to place each widget into the layout but instead load the layout from a file with HbDocumentLoader. Once the view is populated with widgets, you can manipulate them and connect their signals to methods in your application.
See the HbMainWindow class for information about switching between different views.
- \subsection _uc_001_hbview Hiding and showing the chrome
+ \subsection _uc_001_hbview Hiding and showing the chrome
The chrome, (i.e. title, menu and toolbar of the view) can be hidden to allow your application to fill the whole screen. Also, individual components of the chrome can be hidden if desired.
- \code
+ \code
// Hide all the chrome items
myView.setContentFullScreen(true)
@@ -118,12 +118,13 @@
Defines policy for showing the HbTitleBar in the current HbView.
*/
/*!
- \var HbView::ViewFlagNone
+ \var HbView::ViewFlagNone
Titlebar and statusbar is shown with the default attributes.
*/
/*!
\var HbView::ViewTitleBarMinimizable
- When this flag is set, there will be an indication in the titlebar showing the possibility to minimize the titlebar, e.g. swipe it off the screen.
+ When this flag is set, there will be an indication in the titlebar showing the possibility to
+ minimize the titlebar, e.g. swipe it off the screen.
*/
/*!
\var HbView::ViewTitleBarMinimized
@@ -131,33 +132,46 @@
*/
/*!
\var HbView::ViewTitleBarHidden
- Do not show the title bar at all. The title bar handle is not shown and it is not possible to maximize the title bar.
+ Do not show the title bar at all.
+ The title bar handle is not shown and it is not possible to maximize the title bar.
*/
/*!
\var HbView::ViewTitleBarTransparent
- Show normal style title bar but make it transparent. This flag is normally used in combination with TitleBarFloating flag.
+ Show normal style title bar but make it transparent.
+ This flag is normally used in combination with TitleBarFloating flag.
*/
/*!
\var HbView::ViewTitleBarFloating
- Show the title bar floating on top of the underlying content. Setting this flag also make the application area start from the top of the screen. This flag is normally used in combination with TitleBarTransparent flag.
+ Show the title bar floating on top of the underlying content.
+ Setting this flag also make the application area start from the top of the screen.
+ This flag is normally used in combination with TitleBarTransparent flag.
*/
/*!
\var HbView::ViewStatusBarHidden
- Do not show the statusbar at all. This flag is normally used in combination with the ViewTitleBarHidden flag.
+ Do not show the statusbar at all.
+ This flag is normally used in combination with the ViewTitleBarHidden flag.
*/
/*!
\var HbView::ViewStatusBarTransparent
- Show the statusbar with normal content but transparent. This flag is normally used in combination with ViewStatusBarFloating flag.
+ Show the statusbar with normal content but transparent.
+ This flag is normally used in combination with ViewStatusBarFloating flag.
*/
/*!
\var HbView::ViewStatusBarFloating
- Show the statusbar on top of the underlying content. Setting this flag also changes the application area to start from the top of the screen. This flag is normally used in combination with the ViewStatusBarTransparent flag.
+ Show the statusbar on top of the underlying content.
+ Setting this flag also changes the application area to start from the top of the screen.
+ This flag is normally used in combination with the ViewStatusBarTransparent flag.
+*/
+/*!
+ \var HbView::ViewDisableRelayout
+ This flag disables relayoting of the view when hiding the title and/or status bar.
+ This flag is normally used in combination with ViewTitleBarHidden and/or ViewStatusBarHiddenflag.
*/
/*!
\enum HbView::ActionContainer
Defines the default container when you add actions to a view.
-
+
\sa navigationAction()
*/
/*!
@@ -177,7 +191,7 @@
\fn void HbView::titleChanged(const QString &title)
This signal is emitted when the title is replaced by a different title.
-
+
\sa setTitle()
*/
@@ -185,7 +199,7 @@
\fn void HbView::iconChanged(const HbIcon &icon)
This signal is emitted when the icon is replaced by a different icon.
-
+
\sa setIcon()
*/
@@ -193,31 +207,31 @@
\fn void HbView::toolBarChanged()
This signal is emitted when toolbar is replaced by a different toolbar.
-
+
\sa setToolBar()
*/
/*!
\fn void HbView::visibleItemsChanged()
-
+
This signal is emitted when items in the chrome (e.g. toolbar, menu) are made visible or hidden.
-
+
\sa visibleItems()
*/
/*!
\fn void HbView::contentFullScreenChanged()
-
+
This signal is emitted when the view is set to occupy the whole screen.
-
+
\sa setContentFullScreen()
*/
/*!
\fn void HbView::dockWidgetChanged()
-
+
This signal is emitted when the dock widget is replaced by a different dock widget.
-
+
\sa setDockWidget()
*/
@@ -229,9 +243,9 @@
\internal
*/
HbViewPrivate::HbViewPrivate()
- : mLayout(0),
- menu(0),
- toolBar(0),
+ : mLayout(0),
+ menu(0),
+ toolBar(0),
dockWidget(0),
widget(0),
mVisibleItems(Hb::AllItems),
@@ -266,11 +280,11 @@
/*!
\internal
*/
-HbView::HbView( HbViewPrivate &dd, QGraphicsItem *parent ):
+HbView::HbView(HbViewPrivate &dd, QGraphicsItem *parent):
HbWidget(dd, parent)
{
Q_D(HbView);
- d->q_ptr = this;
+ d->q_ptr = this;
}
/*!
@@ -371,7 +385,7 @@
{
Q_D(HbView);
if (d->menu != menu) {
- if(d->menu) {
+ if (d->menu) {
d->menu->deleteLater();
}
d->menu = menu;
@@ -389,9 +403,9 @@
}
/*!
- Returns the toolbar for the view. If the view does not already have a toolbar, an
- empty toolbar is created and returned to the caller but the toolBarChanged()
- signal is not emitted.
+ Returns the toolbar for the view. If the view does not already have a toolbar, an
+ empty toolbar is created and returned to the caller but the toolBarChanged()
+ signal is not emitted.
Ownership is not transferred.
@@ -430,15 +444,15 @@
Removes the toolbar from the view and returns it to the caller.
Ownership of the toolbar is transferred to the caller.
-\note This function is particularly useful if you want to switch to a
+\note This function is particularly useful if you want to switch to a
different view and keep the same toolbar.
\sa setToolBar()
*/
-HbToolBar* HbView::takeToolBar()
+HbToolBar *HbView::takeToolBar()
{
Q_D(HbView);
- HbToolBar* toolBar = d->toolBar;
+ HbToolBar *toolBar = d->toolBar;
d->toolBar = 0;
// Reset the ownership
@@ -512,23 +526,23 @@
if (widget) {
if (!d->mLayout) {
d->mLayout = new HbStackedLayout;
- d->mLayout->setContentsMargins( 0.0, 0.0, 0.0, 0.0 );
- d->mLayout->setMinimumSize( 0.0, 0.0 );
- setLayout( d->mLayout );
+ d->mLayout->setContentsMargins(0.0, 0.0, 0.0, 0.0);
+ d->mLayout->setMinimumSize(0.0, 0.0);
+ setLayout(d->mLayout);
} else {
Q_ASSERT(d->mLayout->count() == 1);
- d->mLayout->removeAt( 0 );
+ d->mLayout->removeAt(0);
}
- d->mLayout->addItem( widget );
+ d->mLayout->addItem(widget);
} else {
if (d->mLayout) {
// "setLayout( 0 )" deletes the existing layout.
- setLayout( 0 );
+ setLayout(0);
d->mLayout = 0;
}
}
delete d->widget;
- d->widget = widget;
+ d->widget = widget;
}
}
@@ -536,19 +550,21 @@
Removes the widget that makes up the view and returns the widget to the caller.
Ownership of the widget is transferred to the caller.
-\note This function is particularly useful if you want to use
+\note This function is particularly useful if you want to use
different widgets in a view without deleting them.
+\note The widget is not removed from the scene.
+
\sa widget() setWidget()
*/
QGraphicsWidget *HbView::takeWidget()
{
Q_D(HbView);
QGraphicsWidget *widget = d->widget;
- if ( d->mLayout ) {
- d->mLayout->removeAt( 0 );
+ if (d->mLayout) {
+ d->mLayout->removeAt(0);
// "setLayout( 0 )" deletes the existing layout.
- setLayout( 0 );
+ setLayout(0);
d->mLayout = 0;
}
d->widget = 0;
@@ -563,9 +579,9 @@
Makes the given scene items visible in this view. Changes are visible
instantly if the view is active, otherwise they will be shown the next time the
view is activated.
-
+
The flag values in \a items override the corresponding settings in HbMainWindow.
-
+
\sa hideItems() setItemVisible() isItemVisible() unsetVisibleItems() visibleItems() isContentFullScreen() setContentFullScreen()
*/
void HbView::showItems(Hb::SceneItems items)
@@ -590,8 +606,8 @@
view is activated.
The flag values in \a items override the corresponding settings in HbMainWindow.
-
-
+
+
\sa showItems() setItemVisible() isItemVisible() unsetVisibleItems() visibleItems() isContentFullScreen() setContentFullScreen()
*/
void HbView::hideItems(Hb::SceneItems items)
@@ -614,7 +630,7 @@
Returns the scene items that are visible in this view.
\sa isItemVisible() setItemVisible() hideItems() showItems() unsetVisibleItems() isContentFullScreen() setContentFullScreen()
-
+
*/
Hb::SceneItems HbView::visibleItems() const
{
@@ -630,7 +646,7 @@
Returns \c true if \a item is set to be visible, otherwise returns \c false.
\sa setItemVisible() hideItems() showItems() unsetVisibleItems() visibleItems() isContentFullScreen() setContentFullScreen()
-
+
*/
bool HbView::isItemVisible(Hb::SceneItem item) const
{
@@ -642,11 +658,11 @@
Shows or hides the given scene item for the view. If \a visible is \c true,
then the given \a item is shown. If \a visible is \c false, then
the given \a item is hidden.
- Changes are visible instantly if the view is active, otherwise they will be shown the next time the
- view is activated.
+ Changes are visible instantly if the view is active, otherwise they will be shown the next time the
+ view is activated.
This overrides the corresponding scene item settings in HbMainWindow.
-
+
\sa isItemVisible() hideItems() showItems() unsetVisibleItems() visibleItems() isContentFullScreen() setContentFullScreen()
*/
void HbView::setItemVisible(Hb::SceneItem item, bool visible)
@@ -670,10 +686,10 @@
}
/*!
- Makes the view content fill the whole screen area. The decorators that make up the chrome (such as
+ Makes the view content fill the whole screen area. The decorators that make up the chrome (such as
signal bar, title pane etc.) can still be shown on top of view content.
- Changes are visible instantly if the view is active, otherwise they will
- be shown the next time the view is activated.
+ Changes are visible instantly if the view is active, otherwise they will
+ be shown the next time the view is activated.
\sa isContentFullScreen() setItemVisible() isItemVisible() hideItems() showItems() visibleItems()
*/
@@ -763,26 +779,27 @@
}
// Statusbar-visibility
- if ( statusBar->isVisible() ){
- d->mVisibleItems |= Hb::StatusBarItem;
+ if (d->mViewFlags & HbView::ViewStatusBarHidden) {
+ d->mVisibleItems &= ~Hb::StatusBarItem;
d->mVisibleItemsSet = true;
} else {
- d->mVisibleItems &= ~Hb::StatusBarItem;
+ d->mVisibleItems |= Hb::StatusBarItem;
d->mVisibleItemsSet = true;
}
// Titlebar-visibility
- if (titleBar->isVisible()){
- d->mVisibleItems |= Hb::TitleBarItem;
+ if (d->mViewFlags & HbView::ViewTitleBarHidden) {
+ d->mVisibleItems &= ~Hb::TitleBarItem;
d->mVisibleItemsSet = true;
- }else{
- d->mVisibleItems &= ~Hb::TitleBarItem;
+ } else {
+ d->mVisibleItems |= Hb::TitleBarItem;
d->mVisibleItemsSet = true;
}
// Repolish the screen if needed
- int visibilityFlags = HbView::ViewTitleBarMinimized | HbView::ViewTitleBarFloating
- | HbView::ViewTitleBarMinimizable | HbView::ViewStatusBarHidden | HbView::ViewStatusBarFloating;
+ int visibilityFlags = HbView::ViewTitleBarMinimized | HbView::ViewTitleBarFloating
+ | HbView::ViewTitleBarMinimizable | HbView::ViewStatusBarHidden | HbView::ViewStatusBarFloating
+ | HbView::ViewTitleBarHidden | HbView::ViewDisableRelayout;
if ((d->mViewFlags & visibilityFlags) != (originalFlags & visibilityFlags)) {
HbMainWindowPrivate::d_ptr(mainWindow())->mClippingItem->decoratorVisibilityChanged();
}
@@ -804,7 +821,7 @@
setViewFlags(d->mViewFlags &~ HbView::ViewTitleBarHidden);
} else {
setViewFlags(d->mViewFlags | HbView::ViewTitleBarHidden);
- }
+ }
}
/*!
@@ -829,13 +846,13 @@
\overload
- This adds the \a action to the list of actions in the view. You specify a preferred container
- in the UI where you would like the action to be added, e.g. the options menu or the toolbar.
- However, if you choose the toolbar as the preferred container but no more buttons can fit in the
- the toolbar, then the action might be moved to the options menu or it might displace another item in the toolbar.
- The result depends on the prioties of the actions already in the toolbar compared with the priority of
+ This adds the \a action to the list of actions in the view. You specify a preferred container
+ in the UI where you would like the action to be added, e.g. the options menu or the toolbar.
+ However, if you choose the toolbar as the preferred container but no more buttons can fit in the
+ the toolbar, then the action might be moved to the options menu or it might displace another item in the toolbar.
+ The result depends on the prioties of the actions already in the toolbar compared with the priority of
the action you are adding.
-
+
Ownership of the \a action is not transferred.
*/
void HbView::addAction(HbAction *action, ActionContainer preferredActionContainer)
@@ -858,10 +875,9 @@
QActionEvent *actionEvent = static_cast<QActionEvent *>(event);
HbAction *hbAction = qobject_cast<HbAction *>(actionEvent->action());
// Forward command to action manager
- d->actionManager->removeAction(hbAction);
+ d->actionManager->removeAction(hbAction);
return true;
- }
- else if (event->type() == QEvent::ActionAdded) {
+ } else if (event->type() == QEvent::ActionAdded) {
// Create action manager if needed
if (!d->actionManager) {
d->actionManager = new HbViewActionManager(this);
@@ -869,7 +885,7 @@
QActionEvent *actionEvent = static_cast<QActionEvent *>(event);
HbAction *hbAction = qobject_cast<HbAction *>(actionEvent->action());
// Forward command to action manager
- d->actionManager->addAction(hbAction, d->preferredActionContainer);
+ d->actionManager->addAction(hbAction, d->preferredActionContainer);
// Clear the variable after used
d->preferredActionContainer = HbView::NotSpecified;
return true;
@@ -880,22 +896,23 @@
/*!
\reimp
*/
-void HbView::changeEvent(QEvent *event){
-
+void HbView::changeEvent(QEvent *event)
+{
+
// We're listening for layout direction changes, because the screen needs to be
// repolished, if the layout direction changes and the titlebar is minimizable.
// We have to listen to the event here(and not in the titlebar), cause the layout
// direction change event is delivered to the titlebar (cause it does not mirror)
if (event->type() == QEvent::LayoutDirectionChange
- && isVisible()
- && (viewFlags() & ViewTitleBarMinimizable)){
- HbMainWindow *mw = mainWindow();
- if (mw && mw->currentView() == this){
+ && isVisible()
+ && (viewFlags() & ViewTitleBarMinimizable)) {
+ HbMainWindow *mw = mainWindow();
+ if (mw && mw->currentView() == this) {
HbMainWindowPrivate::d_ptr(mw)->mClippingItem->decoratorVisibilityChanged();
}
}
- HbWidget::changeEvent( event );
+ HbWidget::changeEvent(event);
}
/*!
@@ -907,10 +924,10 @@
\sa setMenu()
*/
-HbMenu* HbView::takeMenu()
+HbMenu *HbView::takeMenu()
{
Q_D(HbView);
- HbMenu* menu = d->menu;
+ HbMenu *menu = d->menu;
d->menu = 0;
// Reset the ownership
@@ -928,10 +945,10 @@
#ifdef HB_EFFECTS
/*
- Handles effect finished event for title bar animation
+ Handles effect finished event for title bar animation
*/
void HbView::titleBarEffectFinished(const HbEffect::EffectStatus &status)
-{
+{
Q_D(HbView);
HbMainWindow *mw = mainWindow();
@@ -949,6 +966,7 @@
if (titleBar) {
if (status.effectEvent == "disappear") {
titleBar->setVisible(false);
+ titleBar->resetTransform();
} else {
titleBar->setVisible(true);
}
@@ -957,10 +975,10 @@
}
/*
- Handles the effect finished event for title bar animation
+ Handles the effect finished event for title bar animation
*/
void HbView::statusBarEffectFinished(const HbEffect::EffectStatus &status)
-{
+{
HbMainWindow *mw = mainWindow();
HbStatusBar *statusBar = HbMainWindowPrivate::d_ptr(mw)->mStatusBar;
@@ -971,9 +989,10 @@
statusBar->propertiesChanged();
HbMainWindowPrivate::d_ptr(mw)->mClippingItem->decoratorVisibilityChanged();
- if (mw) {
+ if (mw) {
if (status.effectEvent == "disappear") {
statusBar->setVisible(false);
+ statusBar->resetTransform();
} else {
statusBar->setVisible(true);
}
@@ -987,7 +1006,7 @@
If setNavigationAction() has not been called for this view, then the
default action will be returned.
-
+
\sa setNavigationAction()
*/
HbAction *HbView::navigationAction() const
--- a/src/hbcore/gui/hbview.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbview.h Fri Jun 11 13:58:22 2010 +0300
@@ -50,17 +50,17 @@
public:
- enum HbViewFlag
- {
+ enum HbViewFlag {
ViewFlagNone = 0,
- ViewTitleBarMinimizable = 0x01,
- ViewTitleBarMinimized = 0x02,
- ViewTitleBarHidden = 0x04,
+ ViewTitleBarMinimizable = 0x01,
+ ViewTitleBarMinimized = 0x02,
+ ViewTitleBarHidden = 0x04,
ViewTitleBarTransparent = 0x08,
ViewTitleBarFloating = 0x10,
ViewStatusBarHidden = 0x20,
ViewStatusBarTransparent = 0x40,
- ViewStatusBarFloating = 0x80
+ ViewStatusBarFloating = 0x80,
+ ViewDisableRelayout = 0x100
};
Q_DECLARE_FLAGS(HbViewFlags, HbViewFlag)
@@ -74,11 +74,11 @@
HbMenu *menu() const;
void setMenu(HbMenu *menu);
- HbMenu* takeMenu();
+ HbMenu *takeMenu();
HbToolBar *toolBar() const;
void setToolBar(HbToolBar *toolBar);
- HbToolBar* takeToolBar();
+ HbToolBar *takeToolBar();
HbDockWidget *dockWidget() const;
void setDockWidget(HbDockWidget *dockWidget);
@@ -99,9 +99,11 @@
void setStatusBarVisible(bool visible);
enum { Type = Hb::ItemType_View };
- int type() const { return Type; }
+ int type() const {
+ return Type;
+ }
- enum ActionContainer{
+ enum ActionContainer {
NotSpecified,
OptionsMenu,
ToolBar
@@ -126,7 +128,7 @@
void dockWidgetChanged();
protected:
- HbView( HbViewPrivate &dd, QGraphicsItem *parent );
+ HbView(HbViewPrivate &dd, QGraphicsItem *parent);
bool event(QEvent *event);
void changeEvent(QEvent *event);
--- a/src/hbcore/gui/hbviewactionmanager.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbviewactionmanager.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -36,22 +36,22 @@
@hbcore
\class HbViewActionManager
\brief HbViewActionManager is the class that decides switch to container
- the action is placed (options menu or toolbar).
+ the action is placed (options menu or toolbar).
Decision is based the UI commands distribution guide that is read
automatically.
\internal
*/
-/*!
+/*!
Constructor.
*/
HbViewActionManager::HbViewActionManager(HbView *view) :
- QObject(view), view(view), toolBarMaxCount(99),
+ QObject(view), view(view), toolBarMaxCount(99),
defaultContainer(HbView::OptionsMenu), orientation(Qt::Vertical)
{
if (view) {
- HbMainWindow* mainWin = view->mainWindow();
+ HbMainWindow *mainWin = view->mainWindow();
if (mainWin) {
connect(mainWin, SIGNAL(orientationChanged(Qt::Orientation)),
this, SLOT(orientationChanged(Qt::Orientation)));
@@ -62,7 +62,7 @@
createTemplate();
}
-/*!
+/*!
Destructor.
*/
HbViewActionManager::~HbViewActionManager()
@@ -70,7 +70,7 @@
}
-/*!
+/*!
The function adds \a action to either menu's or toolbar's list of actions.
The ownership of \a action is not transferred.
@@ -85,15 +85,14 @@
if (preferredContainer == HbView::NotSpecified) {
container = actualContainer(action, preferredContainer);
}
-
+
// Add action to right container
if (container == HbView::OptionsMenu) {
- view->menu()->addAction(action);
- }
- else if (container == HbView::ToolBar) {
+ view->menu()->addAction(action);
+ } else if (container == HbView::ToolBar) {
view->toolBar()->addAction(action);
if (view->toolBar()->actions().count() > toolBarMaxCount) {
- moveActionToMenu();
+ moveActionToMenu();
}
}
@@ -104,7 +103,7 @@
/*!
The function removes \a action either menu's or toolbar's list of actions.
-
+
The ownership of \a action is not transferred.
*/
void HbViewActionManager::removeAction(QAction *action)
@@ -113,14 +112,14 @@
}
/*!
- The function replaces an old \a action either menu's or
+ The function replaces an old \a action either menu's or
toolbar's list of actions.
-
+
The ownership of \a action is transferred to the caller.
*/
void HbViewActionManager::replaceAction(QAction *oldAction, QAction *newAction)
{
- QMap<QAction*, Placement>::const_iterator i =
+ QMap<QAction *, Placement>::const_iterator i =
distributedActions.find(oldAction);
if (i != distributedActions.end()) {
HbViewActionManager::Placement placement = i.value();
@@ -130,8 +129,7 @@
if (placement.container == HbView::OptionsMenu) {
view->menu()->insertAction(oldAction, newAction);
view->menu()->removeAction(oldAction);
- }
- else if (placement.container == HbView::ToolBar) {
+ } else if (placement.container == HbView::ToolBar) {
view->toolBar()->insertAction(oldAction, newAction);
view->toolBar()->removeAction(oldAction);
}
@@ -171,13 +169,11 @@
{
if (containerString == "ToolBar") {
defaultContainer = HbView::ToolBar;
- }
- else if (containerString == "OptionsMenu") {
+ } else if (containerString == "OptionsMenu") {
defaultContainer = HbView::OptionsMenu;
+ } else {
+ defaultContainer = HbView::NotSpecified;
}
- else {
- defaultContainer = HbView::NotSpecified;
- }
}
/*!
@@ -187,7 +183,7 @@
*/
void HbViewActionManager::addGuideItem(const GuideItem &guideItem)
{
- distributionGuide.append(guideItem);
+ distributionGuide.append(guideItem);
}
/*!
@@ -204,7 +200,7 @@
createTemplate();
// Remove actions from containers
- QMapIterator<QAction*, Placement> i(distributedActions);
+ QMapIterator<QAction *, Placement> i(distributedActions);
while (i.hasNext()) {
i.next();
removeAction(i.key(), false);
@@ -223,31 +219,29 @@
QString path(":/actionmanager/");
if (orientation == Qt::Vertical) {
file.setFileName(path + "distribution_guide_vertical.xml");
- }
- else {
+ } else {
file.setFileName(path + "distribution_guide_horizontal.xml");
}
-
+
if (!file.open(QIODevice::ReadOnly)) {
qWarning("HbViewActionManager::createTemplate: opening file failed");
- }
- else {
+ } else {
HbActionManagerXmlParser reader(this);
if (!reader.read(&file)) {
qWarning("HbViewActionManager::createTemplate: reading file failed");
- }
+ }
}
}
HbView::ActionContainer HbViewActionManager::actualContainer(QAction *action,
- HbView::ActionContainer preferredContainer)
+ HbView::ActionContainer preferredContainer)
{
HbView::ActionContainer container(preferredContainer);
HbAction *hbAction = qobject_cast<HbAction *>(action);
// use the default container, if the downcast failed cause then
// we are not able to obtain the commandRole from the action
- if(!hbAction){
+ if (!hbAction) {
return defaultContainer;
}
@@ -281,7 +275,7 @@
// Add actions to menu if it does not exist already
if (view->menu()->actions().indexOf(action) < 0) {
- view->menu()->addAction(action);
+ view->menu()->addAction(action);
// Update private structure
Placement placement(HbView::OptionsMenu, HbView::ToolBar);
distributedActions.insert(action, placement);
@@ -290,18 +284,17 @@
void HbViewActionManager::removeAction(QAction *action, bool removeFromMap)
{
- QMap<QAction*, Placement>::const_iterator i =
+ QMap<QAction *, Placement>::const_iterator i =
distributedActions.find(action);
if (i != distributedActions.end()) {
// Remove from the container
HbViewActionManager::Placement placement = i.value();
if (placement.container == HbView::OptionsMenu) {
- view->menu()->removeAction(action);
- }
- else if (placement.container == HbView::ToolBar) {
+ view->menu()->removeAction(action);
+ } else if (placement.container == HbView::ToolBar) {
view->toolBar()->removeAction(action);
}
-
+
if (removeFromMap) {
// Remove from private structure
distributedActions.remove(action);
--- a/src/hbcore/gui/hbviewactionmanager_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbviewactionmanager_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -36,22 +36,19 @@
public:
- class Placement
+ class Placement
{
public:
- Placement(HbView::ActionContainer container,
+ Placement(HbView::ActionContainer container,
HbView::ActionContainer preferredContainer) :
- container(container), preferredContainer(preferredContainer)
- {
+ container(container), preferredContainer(preferredContainer) {
}
Placement(const QString &containerString) :
- container(HbView::NotSpecified), preferredContainer(HbView::NotSpecified)
- {
+ container(HbView::NotSpecified), preferredContainer(HbView::NotSpecified) {
if (containerString == "ToolBar") {
container = HbView::ToolBar;
preferredContainer = HbView::ToolBar;
- }
- else {
+ } else {
container = HbView::OptionsMenu;
preferredContainer = HbView::OptionsMenu;
}
@@ -60,25 +57,22 @@
HbView::ActionContainer preferredContainer;
};
- class GuideItem
+ class GuideItem
{
public:
- GuideItem()
- {
+ GuideItem() {
}
GuideItem(HbActionManager::TemplateItem templateItem, Placement placement) :
- templateItem(templateItem)
- {
+ templateItem(templateItem) {
placements.append(placement);
}
- bool operator==(const GuideItem &other) const
- { return (templateItem == other.templateItem); }
- void setTemplateItem(HbActionManager::TemplateItem item)
- {
+ bool operator==(const GuideItem &other) const {
+ return (templateItem == other.templateItem);
+ }
+ void setTemplateItem(HbActionManager::TemplateItem item) {
templateItem = item;
}
- void addPlacement(Placement placement)
- {
+ void addPlacement(Placement placement) {
placements.append(placement);
}
HbActionManager::TemplateItem templateItem;
@@ -98,15 +92,15 @@
void addGuideItem(const GuideItem &guideItem);
public slots:
- void orientationChanged(Qt::Orientation orientation);
+ void orientationChanged(Qt::Orientation orientation);
private:
void createTemplate();
HbView::ActionContainer actualContainer(QAction *action,
- HbView::ActionContainer preferredContainer);
- void moveActionToMenu();
+ HbView::ActionContainer preferredContainer);
+ void moveActionToMenu();
void removeAction(QAction *action, bool removeFromMap);
- QList<QAction *> containerActions(HbView::ActionContainer container);
+ QList<QAction *> containerActions(HbView::ActionContainer container);
Q_DISABLE_COPY(HbViewActionManager)
@@ -116,7 +110,7 @@
HbView::ActionContainer defaultContainer;
Qt::Orientation orientation;
QList<GuideItem> distributionGuide;
- QMap<QAction*, Placement> distributedActions;
+ QMap<QAction *, Placement> distributedActions;
};
#endif // HBVIEWACTIONMANAGER_H
--- a/src/hbcore/hbcore.pro Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/hbcore.pro Fri Jun 11 13:58:22 2010 +0300
@@ -73,7 +73,7 @@
CONVENIENCE_HEADERS += $${HB_BUILD_DIR}/include/hbcore/hbcore.h
CONVENIENCE_HEADERS += $$files($${HB_BUILD_DIR}/include/hbcore/Hb*)
-HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS $$CONVENIENCE_HEADERS
+HEADERS += $$PUBLIC_HEADERS $$RESTRICTED_HEADERS $$PRIVATE_HEADERS $$CONVENIENCE_HEADERS
# installation
!local {
@@ -83,12 +83,13 @@
pubheaders.files = $$PUBLIC_HEADERS
pubheaders.path = $${HB_INCLUDE_DIR}/hbcore
- privheaders.files = $$PRIVATE_HEADERS
- privheaders.path = $${HB_INCLUDE_DIR}/hbcore/private
+ restheaders.files = $$RESTRICTED_HEADERS
+ restheaders.path = $${HB_INCLUDE_DIR}/hbcore/restricted
+
convheaders.files = $$CONVENIENCE_HEADERS
convheaders.path = $${HB_INCLUDE_DIR}/hbcore
- INSTALLS += target pubheaders privheaders convheaders
+ INSTALLS += target pubheaders restheaders convheaders
win32:INSTALLS += dlltarget
}
--- a/src/hbcore/i18n/hbextendedlocale.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/i18n/hbextendedlocale.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -444,7 +444,7 @@
TLocalePos position = _symbianLocale.GetLocale()->AmPmSymbolPosition();
if ( position == ELocaleBefore ) {
return HbExtendedLocale::Before;
- } else if ( position == ELocaleAfter ) {
+ } else { // if ( position == ELocaleAfter ) {
return HbExtendedLocale::After;
}
#else
--- a/src/hbcore/i18n/i18n.pri Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/i18n/i18n.pri Fri Jun 11 13:58:22 2010 +0300
@@ -1,4 +1,3 @@
-#
#############################################################################
##
## Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
@@ -23,7 +22,6 @@
## Nokia at developer.feedback@nokia.com.
##
#############################################################################
-#
INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD
--- a/src/hbcore/image/hbbadgeicon.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbbadgeicon.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -23,9 +23,9 @@
**
****************************************************************************/
+#include "hbbadgeicon_p.h"
#include "hbicon.h"
#include "hbbadgeiconinfo_p.h"
-#include "hbbadgeicon_p.h"
#include <QPainter>
/*!
@@ -79,12 +79,11 @@
int size = mBadgeIcons.size();
if (size == 0) {
mBadgeIcons.append(info);
- }
- else {
+ } else {
bool added = false;
//Find a spot to insert the badgeinfo in the list.
- for (int i = size - 1; i >= 0; i--){
- if (mBadgeIcons[i].zValue() > zValue){
+ for (int i = size - 1; i >= 0; i--) {
+ if (mBadgeIcons[i].zValue() > zValue) {
mBadgeIcons.insert(i + 1, info);
added = true;
break;
@@ -147,7 +146,7 @@
Paint all badges in z-order.
*/
void HbBadgeIcon::paint(QPainter *painter,
- const QRectF& rect,
+ const QRectF &rect,
QIcon::Mode mode,
QIcon::State state,
bool mirror)
@@ -170,18 +169,18 @@
}
// ... and then draw at the specified location.
aIcon.icon().paint(painter,
- rect,
- Qt::KeepAspectRatio,
- absAlign,
- mode,
- state);
+ rect,
+ Qt::KeepAspectRatio,
+ absAlign,
+ mode,
+ state);
}
}
/*!
\internal
*/
-void HbBadgeIcon::externalize(QDataStream& stream)
+void HbBadgeIcon::externalize(QDataStream &stream)
{
int size = mBadgeIcons.size();
// Write out how many badges we'll save first
@@ -199,11 +198,11 @@
/*!
\Internal
*/
-void HbBadgeIcon::internalize(QDataStream& stream)
+void HbBadgeIcon::internalize(QDataStream &stream)
{
int howManyBadges;
stream >> howManyBadges;
- for (int i = 0; i<howManyBadges; ++i) {
+ for (int i = 0; i < howManyBadges; ++i) {
qint32 align;
qint32 zValue;
HbIcon icon;
--- a/src/hbcore/image/hbbadgeicon_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbbadgeicon_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -26,11 +26,11 @@
#ifndef HBBADGEICON_P_H
#define HBBADGEICON_P_H
+#include "hbbadgeiconinfo_p.h"
+#include "hbicon.h"
#include <QList>
#include <QIcon>
-#include "hbbadgeiconinfo_p.h"
-
class HbBadgeIcon
{
public:
@@ -39,26 +39,26 @@
public:
void addBadge(Qt::Alignment alignment,
- const HbIcon& badge,
- int zValue=0);
- bool removeBadge(const HbIcon& badge);
+ const HbIcon &badge,
+ int zValue = 0);
+ bool removeBadge(const HbIcon &badge);
void removeAllBadges();
bool isBadged() const;
const QList<HbBadgeIconInfo> badges() const;
- void paint( QPainter *painter,
- const QRectF& rect,
- QIcon::Mode mode,
- QIcon::State state,
- bool mirror);
- void externalize(QDataStream& stream);
- void internalize(QDataStream& stream);
+ void paint(QPainter *painter,
+ const QRectF &rect,
+ QIcon::Mode mode,
+ QIcon::State state,
+ bool mirror);
+ void externalize(QDataStream &stream);
+ void internalize(QDataStream &stream);
private:
- QRectF badgeLocation(const HbBadgeIconInfo& iconInfo,
- const QRectF& parentRect,
+ QRectF badgeLocation(const HbBadgeIconInfo &iconInfo,
+ const QRectF &parentRect,
bool mirror);
QList<HbBadgeIconInfo> mBadgeIcons;
};
--- a/src/hbcore/image/hbbadgeiconinfo.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbbadgeiconinfo.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -23,21 +23,19 @@
**
****************************************************************************/
+#include "hbbadgeiconinfo_p.h"
#include "hbicon.h"
-#include "hbbadgeiconinfo_p.h"
#include "hbbadgeicon_p.h"
#include <QPainter>
-
#include <QDebug>
-
-HbBadgeIconInfo::HbBadgeIconInfo(const HbIcon& badge,
+HbBadgeIconInfo::HbBadgeIconInfo(const HbIcon &badge,
Qt::Alignment alignment,
- int zValue): mIcon(badge),mAlignment(alignment),mZValue(zValue)
+ int zValue): mIcon(badge), mAlignment(alignment), mZValue(zValue)
{
}
-HbBadgeIconInfo::HbBadgeIconInfo(const HbBadgeIconInfo& other)
+HbBadgeIconInfo::HbBadgeIconInfo(const HbBadgeIconInfo &other)
{
*this = other;
}
@@ -46,18 +44,17 @@
{
}
-bool HbBadgeIconInfo::operator==(const HbBadgeIconInfo &other)
+bool HbBadgeIconInfo::operator==(const HbBadgeIconInfo &other) const
{
return !(*this != other);
}
-bool HbBadgeIconInfo::operator!=(const HbBadgeIconInfo &other)
+bool HbBadgeIconInfo::operator!=(const HbBadgeIconInfo &other) const
{
if ((icon() != other.icon()) ||
- (zValue() != other.zValue()) ||
- (alignment() != other.alignment())
- )
- {
+ (zValue() != other.zValue()) ||
+ (alignment() != other.alignment())
+ ) {
return true;
}
@@ -69,7 +66,7 @@
return mIcon;
}
-void HbBadgeIconInfo::setIcon(const HbIcon& icon)
+void HbBadgeIconInfo::setIcon(const HbIcon &icon)
{
mIcon = icon;
}
@@ -93,4 +90,3 @@
{
mAlignment = align;
}
-
--- a/src/hbcore/image/hbbadgeiconinfo_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbbadgeiconinfo_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -26,25 +26,26 @@
#ifndef HBBADGEICONINFO_P_H
#define HBBADGEICONINFO_P_H
+#include <hbglobal.h>
#include <qnamespace.h>
-
+#include <hbicon.h>
class HbBadgeIconInfoPrivate;
-class HbIcon;
-class HbBadgeIconInfo {
+class HbBadgeIconInfo
+{
public:
- HbBadgeIconInfo( const HbIcon& badge,
- Qt::Alignment alignment = Qt::AlignCenter,
- int zValue=0);
- HbBadgeIconInfo(const HbBadgeIconInfo& other);
+ HbBadgeIconInfo(const HbIcon &badge,
+ Qt::Alignment alignment = Qt::AlignCenter,
+ int zValue = 0);
+ HbBadgeIconInfo(const HbBadgeIconInfo &other);
~HbBadgeIconInfo();
- bool operator==(const HbBadgeIconInfo &other);
- bool operator!=(const HbBadgeIconInfo &other);
+ bool operator==(const HbBadgeIconInfo &other) const;
+ bool operator!=(const HbBadgeIconInfo &other) const;
HbIcon icon() const;
- void setIcon(const HbIcon&);
+ void setIcon(const HbIcon &);
int zValue() const;
void setZValue(int);
Qt::Alignment alignment() const;
--- a/src/hbcore/image/hbeglstate_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbeglstate_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -34,8 +34,6 @@
#include "hbnvgiconimpl_p.h"
#include "hbnvgenginepool_p.h"
-class HbNvgIconImpl;
-
class HbEglStates: public QObject
{
Q_OBJECT
@@ -74,15 +72,15 @@
return init;
}
- void deref(HbEglStates *& instance)
+ void deref(HbEglStates *&instance)
{
if (instance && --(instance->refCount) == 0) {
}
}
- void removeVGImage(VGImage * image);
+ void removeVGImage(VGImage *image);
- void addVGImage(VGImage * image)
+ void addVGImage(VGImage *image)
{
if (image) {
imageList.insert(image);
@@ -108,16 +106,16 @@
EGLContext c = 0,
EGLConfig cfg = 0 );
- int refCount;
- int init;
- typedef QSet<VGImage*> ImageList;
+ int refCount;
+ int init;
+ typedef QSet<VGImage*> ImageList;
typedef ImageList::iterator ImageListIter;
- ImageList imageList;
- QMutex mutex;
+ ImageList imageList;
+ QMutex mutex;
};
-/* HbEglStateRestorer
+/*! HbEglStateRestorer
*
* Saves the EGL state passed in the constructor.
* This class will help in saving the state even in the case of exception.
@@ -132,9 +130,10 @@
: display(d),
currentReadSurface(rs),
currentWriteSurface(ds),
- eglContext(c)
+ eglContext(c),
+ restored(0)
{
- restored = 0;
+
}
void restore();
@@ -153,5 +152,4 @@
int restored;
};
-#endif
-
+#endif /* HBEGLSTATE_P_H */
--- a/src/hbcore/image/hbframebackground.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbframebackground.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -28,16 +28,16 @@
#include <QVariant>
/*!
- @stable
+ @stable
@hbcore
\class HbFrameBackground
\brief HbFrameBackground stores the frame data.
- This class is a data container for frame related data. It stores data that defines the
+ This class is a data container for frame related data. It stores data that defines the
frame background into single object that can be stored into QVariant.
*/
-// Must be initialized dynamically because QIcon cannot be constructed
+// Must be initialized dynamically because QIcon cannot be constructed
// when static variables are constructed.
static HbFrameBackgroundPrivate *shared_null = 0;
@@ -62,7 +62,7 @@
HbFrameBackground::HbFrameBackground()
{
// Construct shared_null if not done yet.
- if ( !shared_null ) {
+ if (!shared_null) {
shared_null = new HbFrameBackgroundPrivate;
}
d = shared_null;
@@ -78,7 +78,7 @@
/*!
* Copy constructs a new frame background using the \a other frame background.
*/
-HbFrameBackground::HbFrameBackground( const HbFrameBackground &other ) :
+HbFrameBackground::HbFrameBackground(const HbFrameBackground &other) :
d(other.d)
{
}
@@ -92,9 +92,9 @@
/*!
* Assigns the \a other frame background to this frame background and returns a reference to
-* this frame background. Copy-on-write semantics is used, so this only does a shallow copy.
+* this frame background. Copy-on-write semantics is used, so this only does a shallow copy.
*/
-HbFrameBackground &HbFrameBackground::operator=( const HbFrameBackground &other )
+HbFrameBackground &HbFrameBackground::operator=(const HbFrameBackground &other)
{
if (&other != this) {
d = other.d;
@@ -103,20 +103,20 @@
}
/*!
-* Equality operator.
+* Equality operator.
*/
-bool HbFrameBackground::operator==( const HbFrameBackground &other ) const
+bool HbFrameBackground::operator==(const HbFrameBackground &other) const
{
- return !( *this != other );
+ return !(*this != other);
}
/*!
-* Inequality operator.
+* Inequality operator.
*/
-bool HbFrameBackground::operator!=( const HbFrameBackground &other ) const
+bool HbFrameBackground::operator!=(const HbFrameBackground &other) const
{
if (d->frameGraphicsName != other.d->frameGraphicsName
- || d->frameGraphicsName.isNull() != other.d->frameGraphicsName.isNull()) {
+ || d->frameGraphicsName.isNull() != other.d->frameGraphicsName.isNull()) {
return true;
}
@@ -154,12 +154,12 @@
// Remove possible file extension
QString nameWithoutExt = frameGraphicsName;
int index = nameWithoutExt.lastIndexOf(QChar('.'));
- if (index>0) {
+ if (index > 0) {
nameWithoutExt.resize(index);
}
if (d->frameGraphicsName != nameWithoutExt
- || d->frameGraphicsName.isNull() != nameWithoutExt.isNull()) {
+ || d->frameGraphicsName.isNull() != nameWithoutExt.isNull()) {
d.detach();
d->frameGraphicsName = nameWithoutExt;
}
--- a/src/hbcore/image/hbframebackground.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbframebackground.h Fri Jun 11 13:58:22 2010 +0300
@@ -44,11 +44,11 @@
HbFrameBackground(const QString &frameGraphicsName, HbFrameDrawer::FrameType type);
~HbFrameBackground();
- HbFrameBackground( const HbFrameBackground &other );
- HbFrameBackground &operator=( const HbFrameBackground &other );
+ HbFrameBackground(const HbFrameBackground &other);
+ HbFrameBackground &operator=(const HbFrameBackground &other);
- bool operator==( const HbFrameBackground &other ) const;
- bool operator!=( const HbFrameBackground &other ) const;
+ bool operator==(const HbFrameBackground &other) const;
+ bool operator!=(const HbFrameBackground &other) const;
bool isNull() const;
@@ -65,6 +65,6 @@
QExplicitlySharedDataPointer<HbFrameBackgroundPrivate> d;
};
-Q_DECLARE_METATYPE( HbFrameBackground )
+Q_DECLARE_METATYPE(HbFrameBackground)
#endif // HBFRAMEBACKGROUND_H
--- a/src/hbcore/image/hbframedrawer.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbframedrawer.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -25,11 +25,12 @@
#include "hbframedrawer.h"
#include "hbframedrawer_p.h"
#include "hbimagetraces_p.h"
+#include "hbmaskableiconimpl_p.h"
#include <hbinstance.h>
#include <hbiconimpl_p.h>
#include <hbiconloader_p.h>
-#include "hbmaskableiconimpl_p.h"
+
#include <QPainter>
#include <QIcon>
@@ -38,7 +39,7 @@
#include <QBitmap>
/*!
- @stable
+ @stable
@hbcore
\class HbFrameDrawer
\brief HbFrameDrawer draws frames graphics.
@@ -47,11 +48,11 @@
Frame graphics mean graphics that consist of either 3 or 9 parts that are positioned
and scaled followingly.
-
+
A 9-piece frame consists of a 3x3 grid, where the corner parts have a fixed size and
the other parts are scaled.
-
- A 3-piece frame consists of 3 parts tiled either horizontally of vertically. The side
+
+ A 3-piece frame consists of 3 parts tiled either horizontally or vertically. The side
parts preserve their aspect ratio and the center part is scaled to fill the remaining space.
For convenience, frame drawer can also draw the frame with a single graphic.
@@ -60,7 +61,7 @@
takes care that there are no visible gaps between the frame parts when the whole frame
is painted to the display even if the frame bounding rectangle uses floating point accuracy.
- Filenames for 9-piece frame graphics are defined according to the following.
+ Filenames for 9-piece frame graphics are defined according to the following convention.
- top left <name>_tl.<ext>
- top <name>_t.<ext>
@@ -72,13 +73,13 @@
- bottom <name>_b.<ext>
- bottom right <name>_br.<ext>
- Filenames for 3-piece horizontal frame graphics are defined according to the following.
+ Filenames for 3-piece horizontal frame graphics are defined according to the following convention.
- left <name>_l.<ext>
- center <name>_c.<ext>
- right <name>_r.<ext>
- Filenames for 3-piece vertical frame graphics are defined according to the following.
+ Filenames for 3-piece vertical frame graphics are defined according to the following convention.
- top <name>_t.<ext>
- center <name>_c.<ext>
@@ -93,7 +94,7 @@
See class HbIcon for information of supported icon formats and file locations.
- The frame drawer stores the whole generated frame graphics in a pixmap for
+ The frame drawer stores the entire generated frame graphics in a pixmap for
improving the speed of the paint operations. Therefore, the frame drawer instance should not
be re-created each time the frame needs to be rendered.
@@ -114,7 +115,7 @@
\b OnePiece The frame consist of a single graphic piece, which is scaled to the frame's bounding rectangle.
\b ThreePiecesHorizontal The frame consists of three graphic pieces that are tiled horizontally.
- As default, the side parts preserve their aspect ratio and the center part is scaled to fill the remaining space.
+ By default, the side parts preserve their aspect ratio and the center part is scaled to fill the remaining space.
Filenames for 3-piece horizontal frame graphics are defined according to the following.
- left <name>_l.<ext>
@@ -122,14 +123,14 @@
- right <name>_r.<ext>
\b ThreePiecesVertical The frame consists of three graphic pieces that are tiled vertically.
- As default, the side parts preserve their aspect ratio and the center part is scaled to fill the remaining space.
+ By default, the side parts preserve their aspect ratio and the center part is scaled to fill the remaining space.
Filenames for 3-piece vertical frame graphics are defined according to the following.
- top <name>_t.<ext>
- center <name>_c.<ext>
- bottom <name>_b.<ext>
- \b NinePieces The frame consists of a 3x3 grid of graphic pieces, where as default the corner
+ \b NinePieces The frame consists of a 3x3 grid of graphic pieces, where by default the corner
parts have a fixed size and the other parts are scaled.
Filenames for 9-piece frame graphics are defined according to the following.
@@ -168,10 +169,10 @@
maskChanged(false),
clipPath(QPainterPath())
{
- borderWidths[0]=0.0;
- borderWidths[1]=0.0;
- borderWidths[2]=0.0;
- borderWidths[3]=0.0;
+ borderWidths[0] = 0.0;
+ borderWidths[1] = 0.0;
+ borderWidths[2] = 0.0;
+ borderWidths[3] = 0.0;
//Register the HbFrameDrawerPrivate Instance to HbIconLoader
HbIconLoader::global()->storeFrameDrawerInfo(this);
}
@@ -187,7 +188,7 @@
frameParts(0),
mirroring(HbIcon::Default),
defaultMirroring(Unknown),
- flags( 0 ),
+ flags(0),
layoutDirection(Qt::LeftToRight),
graphicsItem(0),
color(),
@@ -195,14 +196,14 @@
maskChanged(false),
clipPath(QPainterPath())
{
- borderWidths[0]=0.0;
- borderWidths[1]=0.0;
- borderWidths[2]=0.0;
- borderWidths[3]=0.0;
+ borderWidths[0] = 0.0;
+ borderWidths[1] = 0.0;
+ borderWidths[2] = 0.0;
+ borderWidths[3] = 0.0;
// Remove possible file extension
int index = this->frameGraphicsName.lastIndexOf(QChar('.'));
- if (index>0) {
+ if (index > 0) {
this->frameGraphicsName.resize(index);
}
//Register the HbFrameDrawerPrivate Instance to HbIconLoader
@@ -221,18 +222,18 @@
frameParts(other.frameParts),
mirroring(other.mirroring),
defaultMirroring(other.defaultMirroring),
- flags( other.flags ),
- layoutDirection( other.layoutDirection ),
- graphicsItem( other.graphicsItem ),
+ flags(other.flags),
+ layoutDirection(other.layoutDirection),
+ graphicsItem(other.graphicsItem),
color(other.color),
icon(0),
maskChanged(false),
clipPath(QPainterPath())
{
- borderWidths[0]=other.borderWidths[0];
- borderWidths[1]=other.borderWidths[1];
- borderWidths[2]=other.borderWidths[2];
- borderWidths[3]=other.borderWidths[3];
+ borderWidths[0] = other.borderWidths[0];
+ borderWidths[1] = other.borderWidths[1];
+ borderWidths[2] = other.borderWidths[2];
+ borderWidths[3] = other.borderWidths[3];
//Register the HbFrameDrawerPrivate Instance to HbIconLoader
HbIconLoader::global()->storeFrameDrawerInfo(this);
}
@@ -255,7 +256,7 @@
if (!frameParts) {
checkFrameParts();
}
- if ((!icon ) && (!fallbackMaskableIconList.count()) ) {
+ if ((!icon) && (!fallbackMaskableIconList.count())) {
createFrameIcon();
}
}
@@ -267,7 +268,7 @@
*/
bool HbFrameDrawerPrivate::testBorderApiProtectionFlag() const
{
- return flags & HbFrameDrawerPrivate::BorderWidthSetByApi;
+ return flags & HbFrameDrawerPrivate::BorderWidthSetByApi;
}
/*!
@@ -278,11 +279,11 @@
*/
void HbFrameDrawerPrivate::setBorderApiProtectionFlag(bool on)
{
- if(on){
- flags |= HbFrameDrawerPrivate::BorderWidthSetByApi;
- }else{
- flags &= ~HbFrameDrawerPrivate::BorderWidthSetByApi;
- }
+ if (on) {
+ flags |= HbFrameDrawerPrivate::BorderWidthSetByApi;
+ } else {
+ flags &= ~HbFrameDrawerPrivate::BorderWidthSetByApi;
+ }
}
/*!
@@ -314,46 +315,46 @@
// If the suffix list has been set explicitly, return that if it contains enough suffixes.
if (!suffixList.isEmpty()) {
switch (type) {
- case HbFrameDrawer::ThreePiecesHorizontal: // fall through
- case HbFrameDrawer::ThreePiecesVertical:
- if (suffixList.count() >= 3) {
- return suffixList;
- }
- break;
+ case HbFrameDrawer::ThreePiecesHorizontal: // fall through
+ case HbFrameDrawer::ThreePiecesVertical:
+ if (suffixList.count() >= 3) {
+ return suffixList;
+ }
+ break;
- case HbFrameDrawer::NinePieces:
- if (suffixList.count() >= 9) {
- return suffixList;
- }
- break;
-
- default:
+ case HbFrameDrawer::NinePieces:
+ if (suffixList.count() >= 9) {
return suffixList;
+ }
+ break;
+
+ default:
+ return suffixList;
}
- }
+ }
// Otherwise, return default suffix list.
QStringList list;
switch (type) {
- case HbFrameDrawer::ThreePiecesHorizontal:
- list << "_l" << "_c" << "_r";
- break;
- case HbFrameDrawer::ThreePiecesVertical:
- list << "_t" << "_c" << "_b";
- break;
- case HbFrameDrawer::NinePieces:
- list << "_tl" << "_t" << "_tr" << "_l" << "_c" << "_r" << "_bl" << "_b" << "_br";
- break;
- default:
- break;
+ case HbFrameDrawer::ThreePiecesHorizontal:
+ list << "_l" << "_c" << "_r";
+ break;
+ case HbFrameDrawer::ThreePiecesVertical:
+ list << "_t" << "_c" << "_b";
+ break;
+ case HbFrameDrawer::NinePieces:
+ list << "_tl" << "_t" << "_tr" << "_l" << "_c" << "_r" << "_bl" << "_b" << "_br";
+ break;
+ default:
+ break;
}
return list;
}
/*!
-* Creates a consolidated HbIconImpl (Icon) with the available piece information
+* Creates a consolidated HbIconImpl (Icon) with the available piece information
* If failed to create the same, then creates HbIconImpls for the pieces.
* \internal
*/
@@ -367,15 +368,15 @@
// Create the frame icon and add it in the icon cache
HbIconLoader *loader = HbIconLoader::global();
-
+
//If it's one-piece frame-item, it's loaded using HbIconLoader::loadIcon()
if (frameParts == 1) {
- HbIconImpl * iconImpl = loader->loadIcon(frameGraphicsName, HbIconLoader::AnyType,
- HbIconLoader::AnyPurpose,
- frameIconSize,
- Qt::IgnoreAspectRatio,
- QIcon::Normal,
- iconLoaderOptions());
+ HbIconImpl *iconImpl = loader->loadIcon(frameGraphicsName, HbIconLoader::AnyType,
+ HbIconLoader::AnyPurpose,
+ frameIconSize,
+ Qt::IgnoreAspectRatio,
+ QIcon::Normal,
+ iconLoaderOptions());
if (iconImpl) {
icon = new HbMaskableIconImpl(iconImpl);
}
@@ -387,19 +388,19 @@
for (int i = 0; i < nameListCount; i++) {
multiPieceFileNames.append(frameGraphicsName + list[i]);
if (data.pixmapSizes[i].isEmpty()) {
- data.pixmapSizes[i] = QSize(0,0);
+ data.pixmapSizes[i] = QSize(0, 0);
}
}
QVector<HbIconImpl *> listOfIcons;
-
+
//For multi-piece frame-items, HbIocnLoader::loadMultipieceIcon is used
//This function returns the consolidate (stitched) icon created on the themeserver.
//If the consolidated icon-creation on themeserver fails, then server returns a list
//of individual frame-items.
- HbIconImpl * iconImpl = loader->loadMultiPieceIcon(multiPieceFileNames, data, frameIconSize,
- Qt::IgnoreAspectRatio, QIcon::Normal, iconLoaderOptions(),
- listOfIcons, color);
+ HbIconImpl *iconImpl = loader->loadMultiPieceIcon(multiPieceFileNames, data, frameIconSize,
+ Qt::IgnoreAspectRatio, QIcon::Normal, iconLoaderOptions(),
+ listOfIcons, color);
if (iconImpl) {
icon = new HbMaskableIconImpl(iconImpl);
@@ -409,7 +410,7 @@
fallbackMaskableIconList.append(new HbMaskableIconImpl(listOfIcons[i]));
}
}
-
+
}
}
@@ -436,18 +437,18 @@
if (!mask.isNull() && maskChanged) {
icon->setMask(mask);
- }
+ }
//paint the stitched icon
icon->paint(painter, centeredRect, Qt::AlignHCenter, clipPath);
- if ( icon->isCreatedOnServer() ) {
+ if (icon->isCreatedOnServer()) {
iconType = icon->iconImpl()->iconData().type;
}
- #ifdef HB_FRAME_DRAWER_TRACES
+#ifdef HB_FRAME_DRAWER_TRACES
qDebug() << "FRAMENAME: " << frameGraphicsName << "Drawn at: "
- << centeredRect.topLeft().x() << "," << centeredRect.topLeft().y() << " | "
- << centeredRect.bottomRight().x() << "," << centeredRect.bottomRight().y();
- #endif
+ << centeredRect.topLeft().x() << "," << centeredRect.topLeft().y() << " | "
+ << centeredRect.bottomRight().x() << "," << centeredRect.bottomRight().y();
+#endif
} else {
for (int i = 0; i < fileNameSuffixList().count(); i++) {
if (i < fallbackMaskableIconList.count() && fallbackMaskableIconList[i]) {
@@ -469,14 +470,14 @@
}
if (!multiPartSizeData.targets[i].isEmpty()) {
fallbackMaskableIconList[i]->paint(painter,
- QRect(position, multiPartSizeData.pixmapSizes[i]),
- Qt::AlignHCenter, clipPath);
+ QRect(position, multiPartSizeData.pixmapSizes[i]),
+ Qt::AlignHCenter, clipPath);
}
}
}
- if ( fallbackMaskableIconList[0]->iconImpl()
- && fallbackMaskableIconList[0]->iconImpl()->isCreatedOnServer() ) {
- if ( fallbackMaskableIconList[0]->iconImpl()->iconData().type != INVALID_FORMAT ) {
+ if (fallbackMaskableIconList[0]->iconImpl()
+ && fallbackMaskableIconList[0]->iconImpl()->isCreatedOnServer()) {
+ if (fallbackMaskableIconList[0]->iconImpl()->iconData().type != INVALID_FORMAT) {
// store the icon type
iconType = fallbackMaskableIconList[0]->iconImpl()->iconData().type;
}
@@ -488,7 +489,7 @@
/*!
\internal
*/
-bool HbFrameDrawerPrivate::fillWholeRect() const
+bool HbFrameDrawerPrivate::fillWholeRect() const
{
return flags & HbFrameDrawerPrivate::FillWholeRect;
}
@@ -498,7 +499,7 @@
* - frame bounding rectangle
* - frame inner rectangle (optional)
* - default sizes of the frame corner (9-piece) or side (3-piece) graphics.
-*
+*
* Note! Integer pixel sizes are used in this function to avoid one pixel gaps between the frame parts.
* \internal
*/
@@ -537,7 +538,7 @@
if (borderWidths[0] == 0 && borderWidths[2] == 0) {
QSizeF leftSize = defaultSize(suffixList.at(0)); // index 0 is leftmost frame part
QSizeF rightSize = defaultSize(suffixList.at(2)); // index 2 is rightmost frame part
-
+
if (fillWholeRect()) {
leftSize.scale(rect.size(), Qt::KeepAspectRatio);
rightSize.scale(rect.size(), Qt::KeepAspectRatio);
@@ -573,15 +574,15 @@
if (fullWidth >= leftWidth + rightWidth) {
data.targets[0] = QRect(0, 0, leftWidth, fullHeight);
data.targets[1] = QRect(leftWidth, 0, centerWidth, fullHeight);
- data.targets[2] = QRect(fullWidth-rightWidth, 0, rightWidth, fullHeight);
+ data.targets[2] = QRect(fullWidth - rightWidth, 0, rightWidth, fullHeight);
data.pixmapSizes[0] = QSize(leftWidth, fullHeight);
data.pixmapSizes[1] = QSize(centerWidth, fullHeight);
data.pixmapSizes[2] = QSize(rightWidth, fullHeight);
- data.sources[0] = QRect(QPoint(0,0), data.pixmapSizes[0]);
- data.sources[1] = QRect(QPoint(0,0), data.pixmapSizes[1]);
- data.sources[2] = QRect(QPoint(0,0), data.pixmapSizes[2]);
+ data.sources[0] = QRect(QPoint(0, 0), data.pixmapSizes[0]);
+ data.sources[1] = QRect(QPoint(0, 0), data.pixmapSizes[1]);
+ data.sources[2] = QRect(QPoint(0, 0), data.pixmapSizes[2]);
} else {
// Only sides fit
int totalSideWidth = leftWidth + rightWidth;
@@ -606,7 +607,7 @@
if (borderWidths[1] == 0 && borderWidths[3] == 0) {
QSizeF topSize = defaultSize(suffixList.at(0)); // index 0 is top frame part
QSizeF bottomSize = defaultSize(suffixList.at(2)); // index 2 is bottom frame part
-
+
if (fillWholeRect()) {
topSize.scale(rect.size(), Qt::KeepAspectRatio);
bottomSize.scale(rect.size(), Qt::KeepAspectRatio);
@@ -647,9 +648,9 @@
data.pixmapSizes[1] = QSize(fullWidth, centerHeight);
data.pixmapSizes[2] = QSize(fullWidth, bottomHeight);
- data.sources[0] = QRect(QPoint(0,0), data.pixmapSizes[0]);
- data.sources[1] = QRect(QPoint(0,0), data.pixmapSizes[1]);
- data.sources[2] = QRect(QPoint(0,0), data.pixmapSizes[2]);
+ data.sources[0] = QRect(QPoint(0, 0), data.pixmapSizes[0]);
+ data.sources[1] = QRect(QPoint(0, 0), data.pixmapSizes[1]);
+ data.sources[2] = QRect(QPoint(0, 0), data.pixmapSizes[2]);
} else {
// Only sides fit
int totalSideHeight = topHeight + bottomHeight;
@@ -657,9 +658,9 @@
data.targets[1] = QRect();
data.targets[2] = QRect(0, data.targets[0].height(), fullWidth, fullHeight - data.targets[0].height());
- data.pixmapSizes[0] = QSize(fullWidth,data.targets[0].height());
+ data.pixmapSizes[0] = QSize(fullWidth, data.targets[0].height());
data.pixmapSizes[1] = QSize();
- data.pixmapSizes[2] = QSize(fullWidth,data.targets[2].height());
+ data.pixmapSizes[2] = QSize(fullWidth, data.targets[2].height());
data.sources[0] = data.targets[0];
data.sources[1] = QRect();
@@ -681,7 +682,7 @@
// Do all 9 pieces fit?
if (fullWidth >= tlSize.width() + brSize.width() &&
- fullHeight >= tlSize.height() + brSize.height()) {
+ fullHeight >= tlSize.height() + brSize.height()) {
int centerWidth = fullWidth - tlSize.width() - brSize.width();
int centerHeight = fullHeight - tlSize.height() - brSize.height();
@@ -706,15 +707,15 @@
data.pixmapSizes[7] = data.targets[7].size();
data.pixmapSizes[8] = data.targets[8].size();
- data.sources[0] = QRect(QPoint(0,0), data.pixmapSizes[0]);
- data.sources[1] = QRect(QPoint(0,0), data.pixmapSizes[1]);
- data.sources[2] = QRect(QPoint(0,0), data.pixmapSizes[2]);
- data.sources[3] = QRect(QPoint(0,0), data.pixmapSizes[3]);
- data.sources[4] = QRect(QPoint(0,0), data.pixmapSizes[4]);
- data.sources[5] = QRect(QPoint(0,0), data.pixmapSizes[5]);
- data.sources[6] = QRect(QPoint(0,0), data.pixmapSizes[6]);
- data.sources[7] = QRect(QPoint(0,0), data.pixmapSizes[7]);
- data.sources[8] = QRect(QPoint(0,0), data.pixmapSizes[8]);
+ data.sources[0] = QRect(QPoint(0, 0), data.pixmapSizes[0]);
+ data.sources[1] = QRect(QPoint(0, 0), data.pixmapSizes[1]);
+ data.sources[2] = QRect(QPoint(0, 0), data.pixmapSizes[2]);
+ data.sources[3] = QRect(QPoint(0, 0), data.pixmapSizes[3]);
+ data.sources[4] = QRect(QPoint(0, 0), data.pixmapSizes[4]);
+ data.sources[5] = QRect(QPoint(0, 0), data.pixmapSizes[5]);
+ data.sources[6] = QRect(QPoint(0, 0), data.pixmapSizes[6]);
+ data.sources[7] = QRect(QPoint(0, 0), data.pixmapSizes[7]);
+ data.sources[8] = QRect(QPoint(0, 0), data.pixmapSizes[8]);
} else {
// All 9 pieces do not fit.
@@ -735,8 +736,8 @@
}
calculateShrinkedNinePieceCorners(
- data, tlSize, brSize,
- QSize(fullWidth, fullHeight), QPoint(splitPointX, splitPointY));
+ data, tlSize, brSize,
+ QSize(fullWidth, fullHeight), QPoint(splitPointX, splitPointY));
// Left and right get drawn if corners height does not cover the total height
if (!splitPointY) {
@@ -770,16 +771,16 @@
data.pixmapSizes[8] = data.targets[8].size();
data.sources[0] = data.targets[0];
- data.sources[1] = QRect(QPoint(0,0), data.pixmapSizes[1]);
- data.sources[2] = QRect(QPoint(0,0), data.pixmapSizes[2]);
+ data.sources[1] = QRect(QPoint(0, 0), data.pixmapSizes[1]);
+ data.sources[2] = QRect(QPoint(0, 0), data.pixmapSizes[2]);
data.sources[2].setBottomLeft(QPoint(data.pixmapSizes[2].width() - data.targets[2].width(), data.targets[2].height() - 1));
- data.sources[3] = QRect(QPoint(0,0), data.pixmapSizes[3]);
+ data.sources[3] = QRect(QPoint(0, 0), data.pixmapSizes[3]);
data.sources[4] = QRect(); // center is always empty
- data.sources[5] = QRect(QPoint(0,0), data.pixmapSizes[5]);
- data.sources[6] = QRect(QPoint(0,0), data.pixmapSizes[6]);
+ data.sources[5] = QRect(QPoint(0, 0), data.pixmapSizes[5]);
+ data.sources[6] = QRect(QPoint(0, 0), data.pixmapSizes[6]);
data.sources[6].setTopRight(QPoint(data.targets[6].width() - 1, data.pixmapSizes[6].height() - data.targets[6].height()));
- data.sources[7] = QRect(QPoint(0,0), data.pixmapSizes[7]);
- data.sources[8] = QRect(QPoint(0,0), data.pixmapSizes[8]);
+ data.sources[7] = QRect(QPoint(0, 0), data.pixmapSizes[7]);
+ data.sources[8] = QRect(QPoint(0, 0), data.pixmapSizes[8]);
data.sources[8].setTopLeft(QPoint(data.pixmapSizes[8].width() - data.targets[8].width(), data.pixmapSizes[8].height() - data.targets[8].height()));
}
}
@@ -796,9 +797,9 @@
\internal
*/
void HbFrameDrawerPrivate::calculateShrinkedNinePieceCorners(
- HbMultiPartSizeData &data,
- const QSize& tlSize, const QSize& brSize,
- const QSize& fullSize, const QPoint& splitPoint)
+ HbMultiPartSizeData &data,
+ const QSize &tlSize, const QSize &brSize,
+ const QSize &fullSize, const QPoint &splitPoint)
{
// Make sure that corner sizes don't exceed frames full size
@@ -806,10 +807,10 @@
int topLeftWidth = splitPoint.x() ? splitPoint.x() : tlSize.width();
int topLeftHeight = splitPoint.y() ? splitPoint.y() : tlSize.height();
data.targets[0] = QRect(
- 0,
- 0,
- topLeftWidth < fullSize.width() ? topLeftWidth : fullSize.width(),
- topLeftHeight < fullSize.height() ? topLeftHeight : fullSize.height());
+ 0,
+ 0,
+ topLeftWidth < fullSize.width() ? topLeftWidth : fullSize.width(),
+ topLeftHeight < fullSize.height() ? topLeftHeight : fullSize.height());
// Top-right corner
int topRightX = splitPoint.x() ? splitPoint.x() : fullSize.width() - brSize.width();
@@ -850,7 +851,7 @@
bottomRightHeight = fullSize.height();
bottomRightY = 0;
}
- data.targets[8] = QRect( bottomRightX, bottomRightY, bottomRightWidth, bottomRightHeight);
+ data.targets[8] = QRect(bottomRightX, bottomRightY, bottomRightWidth, bottomRightHeight);
}
/*!
@@ -880,23 +881,23 @@
} else if (defaultMirroring == Disabled) {
return false;
}
- // Forced
+ // Forced
} else if (mirroring == HbIcon::Forced) {
return true;
- // Prevented
+ // Prevented
} else if (mirroring == HbIcon::Prevented) {
return false;
- // LayoutDirection
+ // LayoutDirection
} else if (mirroring == HbIcon::LayoutDirection) {
basedOnLayoutDir = true;
}
if (basedOnLayoutDir) {
Qt::LayoutDirection usedDirection = Qt::LeftToRight; // default;
- if ( flags&HbFrameDrawerPrivate::LayoutDirectionSet ) {
+ if (flags & HbFrameDrawerPrivate::LayoutDirectionSet) {
usedDirection = layoutDirection;
} else {
- usedDirection = QApplication::layoutDirection();
+ usedDirection = QApplication::layoutDirection();
}
return usedDirection == Qt::LeftToRight ? false : true;
@@ -914,9 +915,9 @@
bool HbFrameDrawerPrivate::hasBorderWidths() const
{
return borderWidths[1] > 0
- || borderWidths[2] > 0
- || borderWidths[2] > 0
- || borderWidths[3] > 0;
+ || borderWidths[2] > 0
+ || borderWidths[2] > 0
+ || borderWidths[3] > 0;
}
/*!
@@ -925,40 +926,40 @@
void HbFrameDrawerPrivate::reset(bool resetFrameCount, bool unloadedByServer)
{
unLoadIcon(unloadedByServer);
- if ( resetFrameCount ) {
+ if (resetFrameCount) {
frameParts = 0;
}
}
/*!
-* Resets the MaskableIcon
+* Resets the MaskableIcon
*/
void HbFrameDrawerPrivate::resetMaskableIcon()
{
-#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
+#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
HbIconLoader *loader = HbIconLoader::global();
- if ( icon ) {
- //consolidated icon case
- icon->decrementRefCount();
- if ( icon->refCount() == 0 && icon->isCreatedOnServer() ) {
- // remove the item from cache and delete the icon
- loader->removeItemInCache( icon->iconImpl() );
- icon->dispose();
- }
- icon = 0;
- } else {
+ if (icon) {
+ //consolidated icon case
+ icon->decrementRefCount();
+ if (icon->refCount() == 0 && icon->isCreatedOnServer()) {
+ // remove the item from cache and delete the icon
+ loader->removeItemInCache(icon->iconImpl());
+ icon->dispose();
+ }
+ icon = 0;
+ } else {
int count = fallbackMaskableIconList.count();
- if ( count ) {
+ if (count) {
// for each item in fallbackMaskableIconList - decrement the reference count and
// remove the item in cache, dispose if needed.
- foreach ( HbMaskableIconImpl* impl, fallbackMaskableIconList ) {
- impl->decrementRefCount();
- if ( impl->refCount() == 0 && impl->isCreatedOnServer() ) {
- loader->removeItemInCache( impl->iconImpl() );
- impl->dispose();
- }
- }
- fallbackMaskableIconList.clear();
+ foreach(HbMaskableIconImpl * impl, fallbackMaskableIconList) {
+ impl->decrementRefCount();
+ if (impl->refCount() == 0 && impl->isCreatedOnServer()) {
+ loader->removeItemInCache(impl->iconImpl());
+ impl->dispose();
+ }
+ }
+ fallbackMaskableIconList.clear();
}
}
frameParts = 0;
@@ -1006,7 +1007,7 @@
id.append("_0");
}
- for (int i = 0;i < 4; i++) {
+ for (int i = 0; i < 4; i++) {
QString boundary;
id.append("_");
id.append(boundary.setNum(borderWidths[i]));
@@ -1014,7 +1015,7 @@
}
for (int i = 0; i < suffixList.count(); i++) {
- id.append( suffixList[i] );
+ id.append(suffixList[i]);
}
return id;
@@ -1026,7 +1027,7 @@
if (icon) {
//If a consolidated (stitched) icon was created on the themeserver, then
//HbIconLoader::unloadIcon() is used to unload it.
- loader->unLoadIcon(icon->iconImpl(),unloadedByServer);
+ loader->unLoadIcon(icon->iconImpl(), unloadedByServer);
icon->dispose();
icon = 0;
}
@@ -1035,7 +1036,7 @@
QVector<HbIconImpl *> fallbackIconList;
int count = fallbackMaskableIconList.count();
for (int i = 0; i < count ; i++) {
- if ( fallbackMaskableIconList.at(i) ) {
+ if (fallbackMaskableIconList.at(i)) {
fallbackIconList.append(fallbackMaskableIconList.at(i)->iconImpl());
}
}
@@ -1044,24 +1045,24 @@
//If a consolidated (stitched) icon-creation on themeserver fails, unload-request for all individual
//frame-items are batched together in a single IPC, which is initiated in HbIconLoader::unLoadMultiIcon().
loader->unLoadMultiIcon(fallbackIconList);
- for (int i=0; i < count ; i++) {
- if ( fallbackMaskableIconList.at(i) ) {
+ for (int i = 0; i < count ; i++) {
+ if (fallbackMaskableIconList.at(i)) {
fallbackMaskableIconList.at(i)->dispose();
}
}
- }
+ }
fallbackIconList.clear(); // vector of HbIconImpl*
fallbackMaskableIconList.clear(); // vector of HbMaskableIconImpl*
}
-void HbFrameDrawerPrivate::themeChange( const QStringList &updatedFiles)
+void HbFrameDrawerPrivate::themeChange(const QStringList &updatedFiles)
{
bool unloadIcons = false;
if (updatedFiles.count() == 0 || (icon && updatedFiles.contains(icon->iconFileName()))) {
unloadIcons = true;
} else {
HbMaskableIconImpl *fallbackIcon;
- foreach (fallbackIcon, fallbackMaskableIconList) {
+ foreach(fallbackIcon, fallbackMaskableIconList) {
if (fallbackIcon && updatedFiles.contains(fallbackIcon->iconFileName())) {
unloadIcons = true;
break;
@@ -1079,8 +1080,8 @@
HbFrameDrawer::HbFrameDrawer(bool cacheFlag)
{
d = new HbFrameDrawerPrivate();
- if ( !cacheFlag ) {
- d->flags &= HbFrameDrawerPrivate::DoNotCache;
+ if (!cacheFlag) {
+ d->flags &= HbFrameDrawerPrivate::DoNotCache;
}
}
@@ -1089,15 +1090,15 @@
HbFrameDrawer::HbFrameDrawer(const QString &frameGraphicsName, FrameType type, bool cacheFlag)
{
d = new HbFrameDrawerPrivate(frameGraphicsName, type);
- if ( !cacheFlag ) {
+ if (!cacheFlag) {
d->flags &= HbFrameDrawerPrivate::DoNotCache;
- }
+ }
}
/*!
* Copy constructs a new frame drawer using the \a other frame drawer.
* This is very fast.
-* Copy-on-write semantics is used, so this only does a shallow copy.
+* Copy-on-write semantics is used, so this only does a shallow copy.
*/
HbFrameDrawer::HbFrameDrawer(const HbFrameDrawer &other) :
d(other.d)
@@ -1106,7 +1107,7 @@
/*!
* Assigns the \a other frame drawer to this frame drawer and returns a reference to
-* this frame drawer. Copy-on-write semantics is used, so this only does a shallow copy.
+* this frame drawer. Copy-on-write semantics is used, so this only does a shallow copy.
*/
HbFrameDrawer &HbFrameDrawer::operator=(const HbFrameDrawer &other)
{
@@ -1152,7 +1153,7 @@
// Remove possible file extension
QString nameWithoutExt = frameGraphicsName;
int index = nameWithoutExt.lastIndexOf(QChar('.'));
- if (index>0) {
+ if (index > 0) {
nameWithoutExt.resize(index);
}
@@ -1164,7 +1165,7 @@
d->defaultMirroring = HbFrameDrawerPrivate::Unknown;
// if graphicsItem is set, request redraw
- if ( d->graphicsItem ) {
+ if (d->graphicsItem) {
d->graphicsItem->update();
}
}
@@ -1216,7 +1217,7 @@
* - Left part width = (default size of the left part graphics scaled to the bounding rectangle).width
* - Right part width = (default size of the right part graphics scaled to the bounding rectangle).width
* - Center part width = remaining width
-*
+*
* Frame type \b ThreePiecesVertical:
*
* - Top part height = (default size of the top part graphics scaled to the bounding rectangle).height
@@ -1232,16 +1233,16 @@
*/
void HbFrameDrawer::setBorderWidths(const qreal left, const qreal top, const qreal right, const qreal bottom)
{
- d->setBorderApiProtectionFlag(true);
- if ( left != d->borderWidths[0] || top != d->borderWidths[1] ||
- right != d->borderWidths[2] || bottom != d->borderWidths[3] ) {
+ d->setBorderApiProtectionFlag(true);
+ if (left != d->borderWidths[0] || top != d->borderWidths[1] ||
+ right != d->borderWidths[2] || bottom != d->borderWidths[3]) {
// Negative values are converted to zero.
d->borderWidths[0] = qMax((qreal)0.0, left);
d->borderWidths[1] = qMax((qreal)0.0, top);
d->borderWidths[2] = qMax((qreal)0.0, right);
d->borderWidths[3] = qMax((qreal)0.0, bottom);
// borderWidths changed, clear frame icon
- d->reset( false );
+ d->reset(false);
}
}
@@ -1254,7 +1255,7 @@
*/
void HbFrameDrawer::setBorderWidths(const qreal horizontal, const qreal vertical)
{
- setBorderWidths( horizontal, vertical, horizontal, vertical );
+ setBorderWidths(horizontal, vertical, horizontal, vertical);
}
/*!
@@ -1266,7 +1267,7 @@
*/
void HbFrameDrawer::setBorderWidth(const qreal width)
{
- setBorderWidths( width, width, width, width );
+ setBorderWidths(width, width, width, width);
}
@@ -1288,7 +1289,7 @@
if (rect != d->rect) {
d->rect = rect;
// Rect changed, clear frame icon
- d->reset( false );
+ d->reset(false);
}
}
@@ -1297,7 +1298,7 @@
*/
void HbFrameDrawer::paint(QPainter *painter, const QRectF &rect) const
{
- const_cast<HbFrameDrawer*>(this)->setRect( rect );
+ const_cast<HbFrameDrawer *>(this)->setRect(rect);
if (d->frameGraphicsName.isEmpty() || d->type == HbFrameDrawer::Undefined || d->rect.isEmpty()) {
return;
@@ -1306,11 +1307,14 @@
// Lazy graphics rasterizing is used.
// Rasterize the frame parts now if that has not been done yet.
if (d->icon && (rect.toRect().size() != d->prevRect.size())) {
- d->reset();
- }
-
+ d->reset();
+ }
+
// update the rendering mode
- HbIconLoader::global()->updateRenderingMode(painter->paintEngine()->type());
+ QPaintEngine *paintEngine = painter->paintEngine();
+ if (paintEngine) {
+ HbIconLoader::global()->updateRenderingMode(paintEngine->type());
+ }
d->prepareFrameIcon();
d->prevRect = rect.toRect();
// Paint the frame
@@ -1346,15 +1350,15 @@
*/
void HbFrameDrawer::setFillWholeRect(bool fill)
{
- if ( (fill && !d->fillWholeRect()) || (!fill && d->fillWholeRect()) ) {
- if ( fill ) {
+ if ((fill && !d->fillWholeRect()) || (!fill && d->fillWholeRect())) {
+ if (fill) {
d->flags |= HbFrameDrawerPrivate::FillWholeRect;
} else {
d->flags &= ~HbFrameDrawerPrivate::FillWholeRect;
}
// Fill mode changed, clear frame Icon
- d->reset( false );
+ d->reset(false);
}
}
@@ -1374,7 +1378,7 @@
if (mode != d->mirroring) {
d->mirroring = mode;
// Mirroring changed, clear frame Icon
- d->reset( false );
+ d->reset(false);
}
}
@@ -1444,13 +1448,13 @@
}
}
-/*!
-* Sets the mask to be applied with the the entire frame icon.
+/*!
+* Sets the mask to be applied with the entire frame icon.
* If the mask is also a frame item, use another frame drawer to draw it.
* Mask should be of the same size as returned by frameSize().
* To unset the mask, set it to a null pixmap.
-*
-* \warning Currently this method makes use of pixmap() routine in case of NVG icons.
+*
+* \warning Currently this method makes use of pixmap() routine in case of NVG icons.
* pixmap() slows down the hardware accelerated rendering.
* \sa frameSize(), mask()
*/
@@ -1460,9 +1464,9 @@
d->maskChanged = true;
}
-/*!
+/*!
* Sets the \a clipPath to be applied with the entire frame icon.
-*
+*
*/
void HbFrameDrawer::setClipPath(const QPainterPath &clipPath)
{
@@ -1471,7 +1475,7 @@
/*!
* Returns the clippath set on the frame drawer.
-* As default, returns a empty QPainterPath.
+* By default, returns a empty QPainterPath.
* \sa setClipPath()
*/
@@ -1480,13 +1484,13 @@
return d->clipPath;
}
-/*!
-* Sets the mask to be applied with the the entire frame icon.
+/*!
+* Sets the mask to be applied with the entire frame icon.
* If the mask is also a frame item, use another frame drawer to draw it.
* Mask should be of the same size as returned by frameSize().
* To unset the mask, set it to a null bitmap.
*
- \warning Currently this method makes use of pixmap() routine in case of NVG icons.
+ \warning Currently this method makes use of pixmap() routine in case of NVG icons.
* pixmap() slows down the hardware accelerated rendering.
*
*\sa frameSize(), mask()
@@ -1499,7 +1503,7 @@
/*!
* Returns the mask set on the frame drawer.
-* As default, returns a null pixmap.
+* By default, returns a null pixmap.
* \sa setMask()
*/
@@ -1511,7 +1515,7 @@
/*!
* Returns the mask set on the frame drawer.
-* As default, returns a null bitmap.
+* By default, returns a null bitmap.
* \sa setMask()
*/
QBitmap HbFrameDrawer::maskBitmap() const
@@ -1519,7 +1523,7 @@
return d->mask;
}
/*!
- * Returns the size of the entire frame icon.
+ * Returns the size of the entire frame icon.
* Use this method to retrieve the correct size for a mask pixmap that can be set with method setMask().
* If the frame graphics name, bounding rectangle or frame type have not been set, this method returns
* an empty size.
@@ -1564,27 +1568,27 @@
*
* Valid only when the mirroring mode is HbIcon::LayoutDirection.
*/
-void HbFrameDrawer::setLayoutDirection( Qt::LayoutDirection direction )
+void HbFrameDrawer::setLayoutDirection(Qt::LayoutDirection direction)
{
d->flags |= HbFrameDrawerPrivate::LayoutDirectionSet;
- if ( d->layoutDirection != direction ) {
+ if (d->layoutDirection != direction) {
d->layoutDirection = direction;
-
- if ( ( d->mirroring == HbIcon::Default
- && d->defaultMirroring == HbFrameDrawerPrivate::Enabled ) ||
- d->mirroring == HbIcon::LayoutDirection) {
- d->reset( false );
+ if ((d->mirroring == HbIcon::Default
+ && d->defaultMirroring == HbFrameDrawerPrivate::Enabled) ||
+ d->mirroring == HbIcon::LayoutDirection) {
+
+ d->reset(false);
}
}
}
/*!
* Sets the \a item which is needs to be redrawn when the frame drawer
-* needs re-paint.
+* needs re-paint.
*/
-void HbFrameDrawer::setGraphicsItem( QGraphicsItem *item )
+void HbFrameDrawer::setGraphicsItem(QGraphicsItem *item)
{
d->graphicsItem = item;
}
--- a/src/hbcore/image/hbframedrawer.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbframedrawer.h Fri Jun 11 13:58:22 2010 +0300
@@ -43,8 +43,7 @@
{
public:
- enum FrameType
- {
+ enum FrameType {
Undefined = 0,
OnePiece,
ThreePiecesHorizontal,
@@ -79,10 +78,10 @@
QStringList fileNameSuffixList() const;
void setFileNameSuffixList(const QStringList &list);
- void setMask(const QPixmap &mask);
+ void setMask(const QPixmap &mask);
void setMask(const QBitmap &mask);
- QPixmap mask() const;
- QBitmap maskBitmap() const;
+ QPixmap mask() const;
+ QBitmap maskBitmap() const;
void setClipPath(const QPainterPath &clipPath);
QPainterPath clipPath() const;
@@ -92,10 +91,10 @@
void themeChanged();
void setLayoutDirection(Qt::LayoutDirection direction);
- void setGraphicsItem( QGraphicsItem *item );
-
+ void setGraphicsItem(QGraphicsItem *item);
+
void paint(QPainter *painter, const QRectF &rect) const;
-
+
protected:
QRectF rect() const;
void setRect(const QRectF &rect);
--- a/src/hbcore/image/hbframedrawer_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbframedrawer_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -58,7 +58,7 @@
void paint(QPainter *painter);
void reset(bool resetFrameCount = true, bool unloadedByServer = false);
- void resetMaskableIcon();
+ void resetMaskableIcon();
bool fillWholeRect() const;
QString multiPartIconId() const;
HbIconLoader::IconLoaderOptions iconLoaderOptions();
@@ -68,15 +68,15 @@
private:
void calculateShrinkedNinePieceCorners(
- HbMultiPartSizeData &data,
- const QSize& tlSize, const QSize& brSize,
- const QSize& fullSize, const QPoint& splitPoint);
+ HbMultiPartSizeData &data,
+ const QSize &tlSize, const QSize &brSize,
+ const QSize &fullSize, const QPoint &splitPoint);
QSizeF defaultSize(const QString &framePartSuffix);
bool isMirrored();
bool hasBorderWidths() const;
// disabled
- HbFrameDrawerPrivate& operator=(const HbFrameDrawerPrivate &other);
- HbIconFormatType iconType;
+ HbFrameDrawerPrivate &operator=(const HbFrameDrawerPrivate &other);
+ HbIconFormatType iconType;
public:
QString frameGraphicsName;
HbFrameDrawer::FrameType type;
@@ -88,28 +88,26 @@
// - 0 if frame part files not checked
// - 1 if not all frame parts exist and fall back to 1 piece frame
// - frame part count otherwise
- int frameParts;
+ int frameParts;
HbIcon::MirroringMode mirroring;
- enum DefaultMirroring
- {
+ enum DefaultMirroring {
Unknown = 0,
Enabled = 1,
Disabled = 2
};
DefaultMirroring defaultMirroring;
- enum internalFlags
- {
+ enum internalFlags {
LayoutDirectionSet = 0x01,
FillWholeRect = 0x02,
- BorderWidthSetByApi = 0x04,
- DoNotCache = 0x08,
+ BorderWidthSetByApi = 0x04,
+ DoNotCache = 0x08,
ResolutionCorrected = 0x10,
NoAutoStartAnimation = 0x20
};
- int flags;
+ int flags;
Qt::LayoutDirection layoutDirection;
--- a/src/hbcore/image/hbframedrawerpool.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbframedrawerpool.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -44,8 +44,7 @@
\internal
*/
-struct HbFrameDrawerPoolKey
-{
+struct HbFrameDrawerPoolKey {
public:
HbFrameDrawerPoolKey(const QString &name,
HbFrameDrawer::FrameType type,
@@ -56,8 +55,8 @@
QSizeF frameSize;
bool operator==(const HbFrameDrawerPoolKey &other) const {
return other.frameGraphicsName == frameGraphicsName
- && other.frameGraphicsType == frameGraphicsType
- && other.frameSize == frameSize;
+ && other.frameGraphicsType == frameGraphicsType
+ && other.frameSize == frameSize;
}
};
@@ -66,8 +65,7 @@
\internal
*/
-struct HbFrameDrawerPoolValue
-{
+struct HbFrameDrawerPoolValue {
HbFrameDrawerPoolValue()
: frameDrawer(0), refCount(0) { }
HbFrameDrawerPoolValue(HbFrameDrawer *drawer)
@@ -85,7 +83,7 @@
Q_GLOBAL_STATIC(HbFrameDrawerPoolData, poolData)
/*! Returns a new or an existing HbFrameDrawer instance. Ownership of the
- pointer is NOT transfered to the caller. The returned pointer must never be
+ pointer is NOT transferred to the caller. The returned pointer must never be
destroyed with delete, use release() instead.
\a frameSize is optional, if the default constructed QSizeF is
@@ -127,7 +125,8 @@
{
bool inPool = false;
HbFrameDrawerPoolData *pool = poolData();
- foreach (const HbFrameDrawerPoolKey &key, pool->keys()) {
+ QList<HbFrameDrawerPoolKey> keys = pool->keys();
+ foreach(const HbFrameDrawerPoolKey & key, keys) {
HbFrameDrawerPoolValue value = pool->value(key);
if (value.frameDrawer == frameDrawer) {
if (!--value.refCount) {
--- a/src/hbcore/image/hbicon.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbicon.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -68,14 +68,14 @@
The icon can be resized with method HbIcon::setSize.
When resizing, by default the aspect ratio of the icon is preserved.
- To change this, define the aspect ratio mode parameter in the method HbIcon::paint().
+ To change this, define the aspect ratio mode parameter in the method HbIcon::paint().
An icon itself can be a combination of existing icons; in this case the main icon is
"badged" with smaller icons to form a distinct icon. You can badge icons in this way
with the HbIcon::addBadge method, specifying the location where the badge should be drawn
- and a second HbIcon to draw at the indicated location. To prevent possible recursion ,
+ and a second HbIcon to draw at the indicated location. To prevent possible recursion ,
you can't badge an icon with a badge icon that is itself badged, however.
-
+
Scaled instances of the icons are shared by the framework
to decrease memory consumption.
@@ -101,7 +101,7 @@
This can be disabled with flag HbIcon::NoAutoStartAnimation.
An example of how to define a frame-by-frame animation and construct an icon using it.
-
+
\dontinclude ultimatecodesnippet/ultimatecodesnippet.cpp
\skip frame-by-frame
\until }
@@ -115,14 +115,14 @@
not need to be cached for being able to load it faster next time.
\b ResolutionCorrected \b (0x02) This flag is useful for making icon sizes automatically
- adapt to different screen resolutions (DPI values) and zoom factors used in the user
+ adapt to different screen resolutions (DPI values) and zoom factors used in the user
interface. The current display resolution (DPI value) and zoom factor are taken
in consideration when defining the default size of the icon. This affects on what default
size is reported for the icon and also in which size the icon is rendered if its size is
not set explicitly. The default DPI value is 144 and the default zoom factor 1.0.
When this flag is set, the corrected default size of icon is defined as:
- Corrected default size = original default size * current DPI value / default DPI
+ Corrected default size = original default size * current DPI value / default DPI
value * current zoom factor
\note Currently this flag has an effect on vector icons only.
@@ -170,7 +170,7 @@
in a right-to-left layout.
*/
-// Must be initialized dynamically because QIcon cannot be constructed
+// Must be initialized dynamically because QIcon cannot be constructed
// when static variables are constructed.
static HbIconPrivate *shared_null = 0;
@@ -181,7 +181,7 @@
\internal
*/
HbIconPrivate::HbIconPrivate() :
- engine( new HbIconEngine(QString()) ),
+ engine(new HbIconEngine(QString())),
qicon(engine),
badgeInfo(0)
{
@@ -191,7 +191,7 @@
/*!
\internal
*/
-HbIconPrivate::HbIconPrivate( const QIcon &qicon ) :
+HbIconPrivate::HbIconPrivate(const QIcon &qicon) :
engine(0),
qicon(qicon),
badgeInfo(0)
@@ -201,8 +201,8 @@
/*!
\internal
*/
-HbIconPrivate::HbIconPrivate( const QString &iconName ) :
- engine( new HbIconEngine(iconName) ),
+HbIconPrivate::HbIconPrivate(const QString &iconName) :
+ engine(new HbIconEngine(iconName)),
qicon(engine),
badgeInfo(0)
{
@@ -211,25 +211,25 @@
/*!
\internal
*/
-HbIconPrivate::HbIconPrivate( const HbIconPrivate &other ) :
- QSharedData( other ),
- size( other.size ),
+HbIconPrivate::HbIconPrivate(const HbIconPrivate &other) :
+ QSharedData(other),
+ size(other.size),
engine(0),
qicon(),
badgeInfo(0)
{
- if ( other.engine ) {
- engine = new HbIconEngine( *other.engine );
- // Have to instantiate a temporary QIcon because
+ if (other.engine) {
+ engine = new HbIconEngine(*other.engine);
+ // Have to instantiate a temporary QIcon because
// QIcon's copy constructor shares the engine.
QIcon temp(engine);
qicon = temp;
} else {
// Copy constructed from qicon - so just copy the qicon.
qicon = other.qicon;
- if ( other.badgeInfo ) {
+ if (other.badgeInfo) {
badgeInfo = new HbBadgeIcon(*other.badgeInfo);
- }
+ }
}
}
@@ -267,9 +267,9 @@
*/
void HbIconPrivate::removeAllBadges()
{
- if ( engine ) {
+ if (engine) {
engine->removeAllBadges();
- } else if ( badgeInfo ) {
+ } else if (badgeInfo) {
badgeInfo->removeAllBadges();
}
}
@@ -279,11 +279,11 @@
*/
bool HbIconPrivate::isBadged() const
{
- if ( engine ) {
+ if (engine) {
return engine->isBadged();
- } else if ( badgeInfo ) {
+ } else if (badgeInfo) {
return badgeInfo->isBadged();
- }
+ }
return false;
}
@@ -344,15 +344,15 @@
\internal
*/
bool HbIconPrivate::addBadge(Qt::Alignment align,
- const HbIcon& icon,
- int z)
+ const HbIcon &icon,
+ int z)
{
- if ( icon.isBadged() ) {
+ if (icon.isBadged()) {
return false;
- } else if ( engine ) {
+ } else if (engine) {
engine->addBadge(align, icon, z);
} else {
- if ( !badgeInfo ) {
+ if (!badgeInfo) {
badgeInfo = new HbBadgeIcon();
}
badgeInfo->addBadge(align, icon, z);
@@ -363,13 +363,13 @@
/*!
\internal
*/
-bool HbIconPrivate::removeBadge(const HbIcon& badge)
+bool HbIconPrivate::removeBadge(const HbIcon &badge)
{
bool result = false;
- if ( engine ) {
+ if (engine) {
result = engine->removeBadge(badge);
- } else if ( badgeInfo ) {
+ } else if (badgeInfo) {
result = badgeInfo->removeBadge(badge);
}
@@ -382,7 +382,7 @@
HbIcon::HbIcon()
{
// Construct shared_null if not done yet.
- if ( !shared_null ) {
+ if (!shared_null) {
shared_null = new HbIconPrivate;
}
d = shared_null;
@@ -390,7 +390,7 @@
/*! Constructs a new icon with the icon name \a iconName.
*/
-HbIcon::HbIcon( const QString &iconName )
+HbIcon::HbIcon(const QString &iconName)
{
d = new HbIconPrivate(iconName);
}
@@ -407,7 +407,7 @@
* - Colorization and mirroring support are not available.
* This method should only be used if absolute necessary, as this is not ideal for hardware accelerated environment.
*/
-HbIcon::HbIcon( const QIcon &icon )
+HbIcon::HbIcon(const QIcon &icon)
{
d = new HbIconPrivate(icon);
}
@@ -416,8 +416,8 @@
* Copy constructs a new icon using the \a other icon.
* Copy-on-write semantics is used, so this only does a shallow copy.
*/
-HbIcon::HbIcon( const HbIcon &other ) :
- d( other.d )
+HbIcon::HbIcon(const HbIcon &other) :
+ d(other.d)
{
}
@@ -425,9 +425,9 @@
* Assigns the \a other icon to this icon and returns a reference to
* this icon. Copy-on-write semantics is used, so this only does a shallow copy.
*/
-HbIcon &HbIcon::operator=( const HbIcon &other )
+HbIcon &HbIcon::operator=(const HbIcon &other)
{
- if ( &other != this ) {
+ if (&other != this) {
d = other.d;
}
return *this;
@@ -463,7 +463,7 @@
void HbIcon::clear()
{
// A NULL icon is always cleared - save some time not detaching from it
- if ( d.constData() != shared_null ) {
+ if (d.constData() != shared_null) {
d.detach();
d->clear();
}
@@ -489,7 +489,7 @@
QPixmap HbIcon::pixmap()
{
if (d->engine) {
- return d->engine->pixmap( d->size.toSize(), QIcon::Normal, QIcon::Off );
+ return d->engine->pixmap(d->size.toSize(), QIcon::Normal, QIcon::Off);
}
return QPixmap();
@@ -504,7 +504,7 @@
* is not set. This does not apply to theme elements, for them the color is
* always taken into account when the logical graphics name indicates that it is
* a mono icon.
-*
+*
* Note that if a widget defines a color for its icon primitive (as most standard
* widgets do) then the style will take care of colorizing with the correct color
* from the theme whenever the theme changes. Therefore mono icons shown in such
@@ -515,9 +515,9 @@
* However it is possible to override this theme-specific color with a custom one
* by calling this function.
*
-* \warning Currently this method makes use of pixmap() routine in case of NVG icons.
-* pixmap() slows down the hardware accelerated rendering.
-*
+* \warning Currently this method makes use of pixmap() routine in case of NVG icons.
+* pixmap() slows down the hardware accelerated rendering.
+*
* \sa HbIcon::color(), HbIcon::Colorized
*/
void HbIcon::setColor(const QColor &color)
@@ -562,7 +562,7 @@
* This icon name is used if there is no name set separately for the specified icon mode and state.
* \sa HbIcon::iconName()
*/
-void HbIcon::setIconName( const QString &iconName )
+void HbIcon::setIconName(const QString &iconName)
{
if (d->engine && d->engine->iconName() != iconName) {
d.detach();
@@ -573,7 +573,7 @@
d.detach();
d->engine = new HbIconEngine(iconName);
d->engine->setSize(d->size);
- // Have to instantiate a temporary QIcon because
+ // Have to instantiate a temporary QIcon because
// QIcon's assignment operator shares the engine.
QIcon temp(d->engine);
d->qicon = temp;
@@ -586,13 +586,13 @@
* the icon name set without these parameters is returned.
* \sa HbIcon::setIconName()
*/
-QString HbIcon::iconName( QIcon::Mode mode, QIcon::State state ) const
+QString HbIcon::iconName(QIcon::Mode mode, QIcon::State state) const
{
QString ret;
if (d->engine) {
- ret = d->engine->iconName( mode, state );
- if ( ret.isEmpty() ) {
+ ret = d->engine->iconName(mode, state);
+ if (ret.isEmpty()) {
ret = d->engine->iconName();
}
}
@@ -606,9 +606,9 @@
* the given mode and state.
* \sa HbIcon::iconName()
*/
-void HbIcon::setIconName( const QString &iconName, QIcon::Mode mode, QIcon::State state )
+void HbIcon::setIconName(const QString &iconName, QIcon::Mode mode, QIcon::State state)
{
- if ( d->engine && d->engine->iconName(mode, state) != iconName) {
+ if (d->engine && d->engine->iconName(mode, state) != iconName) {
d.detach();
d->engine->setIconName(iconName, mode, state);
}
@@ -617,50 +617,50 @@
/*! Paints the icon in the given \a painter with the specified drawing parameters.
* \note If the constructor HbIcon::HbIcon(const QIcon &icon) is used, the parameter
* \a aspectRatioMode is ignored and Qt::KeepAspectRatio is used. Also in that case the icon
-* is not scaled exactly to the given size but the best size match returned by the QIcon
+* is not scaled exactly to the given size but the best size match returned by the QIcon
* instance is used.
*/
-void HbIcon::paint( QPainter *painter,
- const QRectF &rect,
- Qt::AspectRatioMode aspectRatioMode,
- Qt::Alignment alignment,
- QIcon::Mode mode,
- QIcon::State state) const
+void HbIcon::paint(QPainter *painter,
+ const QRectF &rect,
+ Qt::AspectRatioMode aspectRatioMode,
+ Qt::Alignment alignment,
+ QIcon::Mode mode,
+ QIcon::State state) const
{
- if ( !rect.isEmpty() && d.constData() != shared_null ) {
- if ( d->engine ) {
- d->engine->paint( painter, rect, aspectRatioMode, alignment, mode, state );
+ if (!rect.isEmpty() && d.constData() != shared_null) {
+ if (d->engine) {
+ d->engine->paint(painter, rect, aspectRatioMode, alignment, mode, state);
} else {
- // This HbIcon was copy constructed from QIcon and
+ // This HbIcon was copy constructed from QIcon and
// we cannot use HbIconEngine for painting.
QSizeF size = this->size();
- if ( !size.isValid() ) {
+ if (!size.isValid()) {
// If size is not set, have to use rect size because QIcon
// does not provide defaultSize information.
size = rect.size();
}
-
- QPixmap pixmap = d->qicon.pixmap( size.toSize(), mode, state );
+
+ QPixmap pixmap = d->qicon.pixmap(size.toSize(), mode, state);
QSizeF pixmapSize = pixmap.size();
// Adjust the alignment
- QPointF topLeft = rect.topLeft();
+ QPointF topLeft = rect.topLeft();
- if ( alignment & Qt::AlignRight ) {
- topLeft.setX( rect.right() - pixmapSize.width() );
- } else if ( alignment & Qt::AlignHCenter ) {
- topLeft.setX( topLeft.x() + (rect.width() - pixmapSize.width()) / 2 );
+ if (alignment & Qt::AlignRight) {
+ topLeft.setX(rect.right() - pixmapSize.width());
+ } else if (alignment & Qt::AlignHCenter) {
+ topLeft.setX(topLeft.x() + (rect.width() - pixmapSize.width()) / 2);
}
- if ( alignment & Qt::AlignBottom ) {
- topLeft.setY( rect.bottom() - pixmapSize.height() );
- } else if ( alignment & Qt::AlignVCenter ) {
- topLeft.setY( topLeft.y() + (rect.height() - pixmapSize.height()) / 2 );
+ if (alignment & Qt::AlignBottom) {
+ topLeft.setY(rect.bottom() - pixmapSize.height());
+ } else if (alignment & Qt::AlignVCenter) {
+ topLeft.setY(topLeft.y() + (rect.height() - pixmapSize.height()) / 2);
}
- painter->drawPixmap( topLeft, pixmap, pixmap.rect() );
+ painter->drawPixmap(topLeft, pixmap, pixmap.rect());
// Draw the badges on this icon
- if ( d->badgeInfo ) {
+ if (d->badgeInfo) {
d->badgeInfo->paint(painter, rect, mode, state, false);
}
}
@@ -675,7 +675,7 @@
if ((static_cast<int>(flags()) & HbIcon::ResolutionCorrected)) {
if (d->size.isValid()) {
return d->size;
- } else {
+ } else {
QSizeF defSize(defaultSize());
HbIconLoader::global()->applyResolutionCorrection(defSize);
return defSize;
@@ -684,14 +684,14 @@
return d->size;
}
return defaultSize();
-}
+}
/*! Returns the default size of the icon.
*/
QSizeF HbIcon::defaultSize() const
{
// Default constructed icon?
- if ( d.constData() == shared_null ) {
+ if (d.constData() == shared_null) {
return QSizeF();
}
@@ -713,29 +713,29 @@
/*! Sets the \a height of the icon. Its width is computed using the aspect ratio of the icon.
*/
-void HbIcon::setHeight( qreal height )
+void HbIcon::setHeight(qreal height)
{
QSizeF size = defaultSize();
- if ( size.height() > 0 ) {
+ if (size.height() > 0) {
qreal ar = size.width() / size.height();
- setSize( QSizeF( ar * height , height) );
+ setSize(QSizeF(ar * height , height));
}
}
/*! Sets the \a width of the icon. Its height is computed using the aspect ratio of the icon.
*/
-void HbIcon::setWidth( qreal width )
+void HbIcon::setWidth(qreal width)
{
QSizeF size = defaultSize();
- if ( size.width() > 0 ) {
+ if (size.width() > 0) {
qreal ar = size.height() / size.width();
- setSize( QSizeF( width, ar * width ) );
+ setSize(QSizeF(width, ar * width));
}
}
/*! Returns the width of the icon.
*/
-qreal HbIcon::width() const
+qreal HbIcon::width() const
{
return size().width();
}
@@ -762,10 +762,10 @@
/*! Sets the mirroring \a mode for the icon.
* \sa HbIcon::mirroringMode()
*/
-void HbIcon::setMirroringMode( HbIcon::MirroringMode mode )
+void HbIcon::setMirroringMode(HbIcon::MirroringMode mode)
{
if (d->engine) {
- if ( mode != d->engine->mirroringMode() ) {
+ if (mode != d->engine->mirroringMode()) {
d.detach();
d->engine->setMirroringMode(mode);
}
@@ -780,7 +780,7 @@
if (d->engine) {
return d->engine->flags();
} else {
- return ( HbIcon::Flags )0;
+ return (HbIcon::Flags)0;
}
}
@@ -799,9 +799,9 @@
/*! Sets the size for the icon. Without calling this method, the icon uses its default size.
* \sa HbIcon::size(), HbIcon::defaultSize()
*/
-void HbIcon::setSize( const QSizeF &size )
+void HbIcon::setSize(const QSizeF &size)
{
- if ( size != d->size ) {
+ if (size != d->size) {
d.detach();
d->size = size;
@@ -823,71 +823,71 @@
* Returns a reference to a QIcon instance representing this icon.
* \note The returned reference is valid only for the life time of this HbIcon instance.
*/
-QIcon & HbIcon::qicon() const
+QIcon &HbIcon::qicon() const
{
return d->qicon;
}
/*!
* Equality operator. It compares the icon names for all the state and mode combinations.
-* It also compares the badges, the color and the mirroring mode of the icon. The sizes
+* It also compares the badges, the color and the mirroring mode of the icon. The sizes
* set for the icons are not used for the comparison.
*/
-bool HbIcon::operator==( const HbIcon &other ) const
+bool HbIcon::operator==(const HbIcon &other) const
{
- return !( *this != other );
+ return !(*this != other);
}
/*!
* Inequality operator. It compares the icon names for all the state and mode combinations.
-* It also compares the badges, the color and the mirroring mode of the icon. The sizes
+* It also compares the badges, the color and the mirroring mode of the icon. The sizes
* set for the icons are not used for the comparison.
*/
-bool HbIcon::operator!=( const HbIcon &other ) const
+bool HbIcon::operator!=(const HbIcon &other) const
{
// NULL icons are equal
- if ( isNull() && other.isNull() ) {
- if ( d->badgeInfo && other.d->badgeInfo ) {
- if ( d->badgeInfo->badges() != other.d->badgeInfo->badges() ) {
+ if (isNull() && other.isNull()) {
+ if (d->badgeInfo && other.d->badgeInfo) {
+ if (d->badgeInfo->badges() != other.d->badgeInfo->badges()) {
return true;
}
}
return false;
}
-
+
const HbIconEngine *engine1 = d->engine;
const HbIconEngine *engine2 = other.d->engine;
// If both icons do not have engines, they are unequal.
// An icon does not have an engine if it is constructed with a QIcon.
- if ( !engine1 || !engine2 ) {
- return true;
+ if (!engine1 || !engine2) {
+ return true;
}
- if ( engine1->iconName() != engine2->iconName() ||
- engine1->iconName( QIcon::Normal, QIcon::Off ) != engine2->iconName( QIcon::Normal, QIcon::Off ) ||
- engine1->iconName( QIcon::Normal, QIcon::On ) != engine2->iconName( QIcon::Normal, QIcon::On ) ||
- engine1->iconName( QIcon::Disabled, QIcon::Off ) != engine2->iconName( QIcon::Disabled, QIcon::Off ) ||
- engine1->iconName( QIcon::Disabled, QIcon::On ) != engine2->iconName( QIcon::Disabled, QIcon::On ) ||
- engine1->iconName( QIcon::Active, QIcon::Off ) != engine2->iconName( QIcon::Active, QIcon::Off ) ||
- engine1->iconName( QIcon::Active, QIcon::On ) != engine2->iconName( QIcon::Active, QIcon::On ) ||
- engine1->iconName( QIcon::Selected, QIcon::Off ) != engine2->iconName( QIcon::Selected, QIcon::Off ) ||
- engine1->iconName( QIcon::Selected, QIcon::On ) != engine2->iconName( QIcon::Selected, QIcon::On ) ) {
+ if (engine1->iconName() != engine2->iconName() ||
+ engine1->iconName(QIcon::Normal, QIcon::Off) != engine2->iconName(QIcon::Normal, QIcon::Off) ||
+ engine1->iconName(QIcon::Normal, QIcon::On) != engine2->iconName(QIcon::Normal, QIcon::On) ||
+ engine1->iconName(QIcon::Disabled, QIcon::Off) != engine2->iconName(QIcon::Disabled, QIcon::Off) ||
+ engine1->iconName(QIcon::Disabled, QIcon::On) != engine2->iconName(QIcon::Disabled, QIcon::On) ||
+ engine1->iconName(QIcon::Active, QIcon::Off) != engine2->iconName(QIcon::Active, QIcon::Off) ||
+ engine1->iconName(QIcon::Active, QIcon::On) != engine2->iconName(QIcon::Active, QIcon::On) ||
+ engine1->iconName(QIcon::Selected, QIcon::Off) != engine2->iconName(QIcon::Selected, QIcon::Off) ||
+ engine1->iconName(QIcon::Selected, QIcon::On) != engine2->iconName(QIcon::Selected, QIcon::On)) {
return true;
}
// If they have different badges, they are unequal
- if ( engine1->badges() != engine2->badges() ) {
+ if (engine1->badges() != engine2->badges()) {
return true;
}
- if ( engine1->color() != engine2->color() ){
+ if (engine1->color() != engine2->color()) {
return true;
}
// two icons are considered different if their mirroring modes are different
- if ( engine1->mirroringMode() != engine2->mirroringMode() ){
+ if (engine1->mirroringMode() != engine2->mirroringMode()) {
return true;
}
@@ -899,9 +899,9 @@
* are drawn relative to the alignment you specify with the
* z-order you provide.
*/
-bool HbIcon::addBadge( Qt::Alignment alignment,
- const HbIcon& badge,
- int z )
+bool HbIcon::addBadge(Qt::Alignment alignment,
+ const HbIcon &badge,
+ int z)
{
d.detach();
return d->addBadge(alignment, badge, z);
@@ -910,10 +910,10 @@
/*!
* Removes badge icon(s) from the icon.
*/
-bool HbIcon::removeBadge( const HbIcon& badge )
+bool HbIcon::removeBadge(const HbIcon &badge)
{
d.detach();
- return d->removeBadge( badge );
+ return d->removeBadge(badge);
}
/*!
--- a/src/hbcore/image/hbicon.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbicon.h Fri Jun 11 13:58:22 2010 +0300
@@ -100,20 +100,20 @@
void setFlags(Flags flags);
void paint(QPainter *painter,
- const QRectF &rect,
- Qt::AspectRatioMode aspectRatioMode = Qt::KeepAspectRatio,
- Qt::Alignment alignment = Qt::AlignCenter,
- QIcon::Mode mode = QIcon::Normal,
- QIcon::State state = QIcon::Off) const;
+ const QRectF &rect,
+ Qt::AspectRatioMode aspectRatioMode = Qt::KeepAspectRatio,
+ Qt::Alignment alignment = Qt::AlignCenter,
+ QIcon::Mode mode = QIcon::Normal,
+ QIcon::State state = QIcon::Off) const;
operator QVariant() const;
QIcon &qicon() const;
bool addBadge(Qt::Alignment alignment,
- const HbIcon& badge,
- int z=0);
- bool removeBadge(const HbIcon& badge);
+ const HbIcon &badge,
+ int z = 0);
+ bool removeBadge(const HbIcon &badge);
void removeAllBadges();
private:
--- a/src/hbcore/image/hbicon_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbicon_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -36,17 +36,17 @@
{
public:
HbIconPrivate();
- HbIconPrivate( const QIcon &qicon );
- HbIconPrivate( const QString &iconName );
- HbIconPrivate( const HbIconPrivate &other );
+ HbIconPrivate(const QIcon &qicon);
+ HbIconPrivate(const QString &iconName);
+ HbIconPrivate(const HbIconPrivate &other);
~HbIconPrivate();
void clear();
void clearStoredIconContent();
bool addBadge(Qt::Alignment alignment,
- const HbIcon& badge,
- int z=0);
- bool removeBadge(const HbIcon& badge);
+ const HbIcon &badge,
+ int z = 0);
+ bool removeBadge(const HbIcon &badge);
void removeAllBadges();
bool isBadged() const;
void setThemedColor(const QColor &color);
@@ -54,17 +54,22 @@
private:
// disabled
- HbIconPrivate & operator=( const HbIconPrivate &other );
+ HbIconPrivate &operator=(const HbIconPrivate &other);
public:
- static HbIconPrivate *d_ptr(HbIcon *icon) { return icon->d.data(); }
- static HbIconPrivate *d_ptr_detached(HbIcon *icon) { icon->d.detach(); return icon->d.data(); }
-
+ static HbIconPrivate *d_ptr(HbIcon *icon) {
+ return icon->d.data();
+ }
+ static HbIconPrivate *d_ptr_detached(HbIcon *icon) {
+ icon->d.detach();
+ return icon->d.data();
+ }
+
QSizeF size;
HbIconEngine *engine; // this is 0 if HbIcon was copy constructed from QIcon.
QIcon qicon;
- HbBadgeIcon* badgeInfo;
+ HbBadgeIcon *badgeInfo;
};
QDataStream &operator<<(QDataStream &stream, const HbIconPrivate &icon);
--- a/src/hbcore/image/hbiconanimation.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbiconanimation.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -56,7 +56,7 @@
mView(0),
mPaused(false),
mPausedDueToBackground(false)
- {
+{
Q_ASSERT(!(animator->d->animation));
// Set the animation in the animator, it takes ownership of this object.
animator->d->animation = this;
@@ -64,7 +64,7 @@
#ifdef HB_ICON_TRACES
qDebug() << "HbIconAnimation created: " << mIconName;
#endif
- }
+}
HbIconAnimation::~HbIconAnimation()
{
@@ -98,7 +98,7 @@
{
return mColor;
}
-
+
void HbIconAnimation::setColor(const QColor &color)
{
mColor = color;
@@ -278,7 +278,7 @@
// Apply mirroring if required
if (mMirrored) {
QTransform t;
- t.scale(-1,1);
+ t.scale(-1, 1);
canvasPixmap = canvasPixmap.transformed(t);
}
@@ -381,7 +381,7 @@
delete mImageRenderer;
mImageRenderer = 0;
mImageRenderer = new QImageReader(mIconFileName, mType == MNG ? "MNG" : "GIF");
-
+
// New image reader starts from the first frame. Handle animation update.
notifyAnimationStarted();
handleAnimationUpdated();
@@ -417,7 +417,7 @@
// Inform client to update display
emit animationUpdated();
-
+
notifyAnimationStopped();
}
@@ -448,7 +448,7 @@
// Apply mirroring if required
if (mMirrored) {
QTransform t;
- t.scale(-1,1);
+ t.scale(-1, 1);
canvasPixmap = canvasPixmap.transformed(t);
}
@@ -507,11 +507,11 @@
}
HbIconAnimationFrameSet::HbIconAnimationFrameSet(
- HbIconAnimator *animator, const QString &iconName,const QList<FrameData> &frames) :
- HbIconAnimation(animator, iconName),
- mFrames(frames),
- mCurrentFrameIndex(0),
- mTimerEntry(0)
+ HbIconAnimator *animator, const QString &iconName, const QList<FrameData> &frames) :
+ HbIconAnimation(animator, iconName),
+ mFrames(frames),
+ mCurrentFrameIndex(0),
+ mTimerEntry(0)
{
// Do not start the timer or initiate any signal emission here.
// Do it in start() instead, since mFresh is true by default.
@@ -623,7 +623,7 @@
if (jumpData.execCount < jumpData.repeatCount) {
++jumpData.execCount;
// Before returning, the exec counts of all previous jumps in
- // this frame must be resetted, because they were caused by
+ // this frame must be reset, because they were caused by
// <loop> elements that were embedded into the <loop> that
// generated this jump.
for (int j = 0; j < i; ++j) {
@@ -631,7 +631,7 @@
}
// And similarly, all jumps in frames that fall between the
// target (incl.) and the current frame (excl.) must be
- // resetted. Note that jumping forward is not supported and such
+ // reset. Note that jumping forward is not supported and such
// jumps are never generated by the animation xml parser.
for (int j = jumpData.targetFrameIndex; j < mCurrentFrameIndex; ++j) {
resetJumpCount(mFrames[j]);
--- a/src/hbcore/image/hbiconanimation_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbiconanimation_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -88,7 +88,7 @@
void setMirrored(bool mirrored);
QColor color() const;
- void setColor(const QColor &color);
+ void setColor(const QColor &color);
bool resolutionCorrected() const;
void setResolutionCorrected(bool corrected);
@@ -96,33 +96,27 @@
HbIconAnimationDefinition::PlayMode playMode() const;
void setPlayMode(HbIconAnimationDefinition::PlayMode playMode);
- inline HbView *view() const
- {
+ inline HbView *view() const {
return mView;
}
- inline void setView(HbView *view)
- {
+ inline void setView(HbView *view) {
mView = view;
}
- inline HbIconAnimator *animator() const
- {
+ inline HbIconAnimator *animator() const {
return mAnimator;
}
- inline bool paused() const
- {
+ inline bool paused() const {
return mPaused;
}
- inline bool pausedDueToBackground() const
- {
+ inline bool pausedDueToBackground() const {
return mPausedDueToBackground;
}
- inline void setPausedDueToBackground(bool status)
- {
+ inline void setPausedDueToBackground(bool status) {
mPausedDueToBackground = status;
}
@@ -161,7 +155,7 @@
// dptr to the global animation manager instance
HbIconAnimationManagerPrivate *mAnimMgrD;
- QColor mColor;
+ QColor mColor;
HbIconAnimator *mAnimator;
HbView *mView;
@@ -239,17 +233,16 @@
QPixmap pixmap;
int duration; // in milliseconds
QList<JumpData> jumps;
- void assignJumps(const QList<HbIconAnimationDefinition::AnimationFrame::Jump> &jlist)
- {
- jumps.clear();
- for (int i = 0, ie = jlist.count(); i != ie; ++i) {
- JumpData jd;
- jd.targetFrameIndex = jlist.at(i).targetFrameIndex;
- jd.repeatCount = jlist.at(i).repeatCount;
- jd.execCount = 0;
- jumps.append(jd);
- }
+ void assignJumps(const QList<HbIconAnimationDefinition::AnimationFrame::Jump> &jlist) {
+ jumps.clear();
+ for (int i = 0, ie = jlist.count(); i != ie; ++i) {
+ JumpData jd;
+ jd.targetFrameIndex = jlist.at(i).targetFrameIndex;
+ jd.repeatCount = jlist.at(i).repeatCount;
+ jd.execCount = 0;
+ jumps.append(jd);
}
+ }
};
HbIconAnimationFrameSet(HbIconAnimator *animator, const QString &iconName, const QList<FrameData> &frames);
@@ -277,7 +270,7 @@
int mCurrentFrameIndex;
bool mMirrored;
-
+
HbTimerSignalEntry *mTimerEntry;
};
--- a/src/hbcore/image/hbiconanimationmanager.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbiconanimationmanager.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -33,7 +33,6 @@
#include "hbiconanimator.h"
#include "hbiconanimator_p.h"
#include "hbtheme.h"
-#include "hbimagetraces_p.h"
#include "hbiconanimation_p.h"
#include "hbimagetraces_p.h"
@@ -65,14 +64,20 @@
bool HbIconAnimationManagerPrivate::addDefinitionFile(const QString &definitionFileName)
{
// Stop right away if the file has already been added.
- foreach (const QString &iconName, animations.keys()) {
+ QList<QString> keys = animations.keys();
+ foreach(const QString & iconName, keys) {
if (animations.operator[](iconName).definitionFileName == definitionFileName) {
return true;
}
}
// Check if there is a file with the given name in the current theme.
- QString pathInTheme = HbIconLoader::global()->findSharedResource(definitionFileName, Hb::AnimationResource);
+ // Attach the .axml suffix if needed, just for the theme lookup.
+ QString fileNameWithSuffix = definitionFileName;
+ if (!fileNameWithSuffix.contains('.')) {
+ fileNameWithSuffix.append(QLatin1String(".axml"));
+ }
+ QString pathInTheme = HbIconLoader::global()->findSharedResource(fileNameWithSuffix, Hb::AnimationResource);
#ifdef HB_ICON_TRACES
qDebug() << definitionFileName << " => " << pathInTheme;
#endif
@@ -83,7 +88,7 @@
// Parse the filename and add entries in the hash table, first try the themeserver.
bool ret = parser.parseDefinitionFileShared(definitionFileName,
- animations, *realFileName);
+ animations, *realFileName);
if (!ret) {
// If themeserver did not return anything then try the file locally.
ret = parser.parseDefinitionFile(definitionFileName,
@@ -153,12 +158,12 @@
void HbIconAnimationManagerPrivate::handleAnimationResume()
{
// resume all paused animations
- foreach (HbIconAnimation *anim, playingAnims) {
+ foreach(HbIconAnimation * anim, playingAnims) {
if (anim->pausedDueToBackground()) {
- #ifdef HB_ICON_TRACES
+#ifdef HB_ICON_TRACES
qDebug() << "Foreground gained - resuming animation:" << anim->iconName();
- #endif
+#endif
anim->resume();
}
@@ -171,13 +176,13 @@
void HbIconAnimationManagerPrivate::handleAnimationPause()
{
// pause all playing animations
- foreach (HbIconAnimation *anim, playingAnims) {
+ foreach(HbIconAnimation * anim, playingAnims) {
if (!anim->paused()) {
-
- #ifdef HB_ICON_TRACES
+
+#ifdef HB_ICON_TRACES
qDebug() << "Foreground lost - pausing animation:" << anim->iconName();
- #endif
-
+#endif
+
anim->pause();
anim->setPausedDueToBackground(true);
}
@@ -190,7 +195,7 @@
void HbIconAnimationManagerPrivate::handleThemeChanged()
{
// The theme is being changed, stop all on-going animations.
- foreach (HbIconAnimation *anim, playingAnims) {
+ foreach(HbIconAnimation * anim, playingAnims) {
anim->stop();
}
}
@@ -204,7 +209,8 @@
// animation definitions (or at least try to reload; some defs may now be
// missing if they were present in the previous theme but not in the new
// one).
- foreach (const QString &iconName, animations.keys()) {
+ QList<QString> keys = animations.keys();
+ foreach(const QString & iconName, keys) {
// Do not remove animations that were not created from files.
if (!animations.operator[](iconName).definitionFileName.isEmpty()) {
animations.remove(iconName);
@@ -220,7 +226,7 @@
//
// 3. Theme changes to another theme that _does_ contain somethingFromTheme.
//
- foreach (const QString &name, allDefNames) {
+ foreach(const QString & name, allDefNames) {
addDefinitionFile(name);
}
}
@@ -228,18 +234,18 @@
void HbIconAnimationManagerPrivate::handleViewChanged(HbView *view)
{
// Pause all playing animations which do not belong to the new view, resume the ones belonging to it
- foreach (HbIconAnimation *anim, playingAnims) {
+ foreach(HbIconAnimation * anim, playingAnims) {
// If the view of the animation is not resolved, do nothing
if (anim->view()) {
if (anim->view() == view) {
- #ifdef HB_ICON_TRACES
+#ifdef HB_ICON_TRACES
qDebug() << "View activated - resuming animation:" << anim->iconName();
- #endif
+#endif
anim->resume();
} else {
- #ifdef HB_ICON_TRACES
+#ifdef HB_ICON_TRACES
qDebug() << "View deactivated - pausing animation:" << anim->iconName();
- #endif
+#endif
anim->pause();
}
}
@@ -261,8 +267,8 @@
// Connect to view change signals if not done yet
if (!viewChangeConnected) {
QList<HbMainWindow *> windowList = hbInstance->allMainWindows();
- Q_FOREACH(const HbMainWindow *window, windowList) {
- connect(window, SIGNAL(currentViewChanged(HbView*)), SLOT(handleViewChanged(HbView*)));
+ Q_FOREACH(const HbMainWindow * window, windowList) {
+ connect(window, SIGNAL(currentViewChanged(HbView *)), SLOT(handleViewChanged(HbView *)));
}
viewChangeConnected = true;
}
@@ -282,7 +288,7 @@
if (scene) {
// Resolve the main window having the same scene that the item belongs to
QList<HbMainWindow *> windowList = hbInstance->allMainWindows();
- Q_FOREACH(const HbMainWindow *window, windowList) {
+ Q_FOREACH(const HbMainWindow * window, windowList) {
if (window->scene() == scene) {
anim->setView(window->currentView());
break;
@@ -390,7 +396,7 @@
* </animations>
*
* \endcode
-*
+*
* The frame names e.g. "anim1_frame1" in the example above correspond to the icon name
* parameters passed in HbIcon constructor when the animation frame icons are loaded.
*
--- a/src/hbcore/image/hbiconanimationmanager.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbiconanimationmanager.h Fri Jun 11 13:58:22 2010 +0300
@@ -42,7 +42,7 @@
static HbIconAnimationManager *global();
bool addDefinitionFile(const QString &definitionFileName);
-
+
void addDefinition(
const QString &iconName,
const HbIconAnimationDefinition &definition);
--- a/src/hbcore/image/hbiconanimationmanager_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbiconanimationmanager_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -45,7 +45,7 @@
~HbIconAnimationManagerPrivate();
bool addDefinitionFile(const QString &definitionFileName);
-
+
void addDefinition(
const QString &iconName,
const HbIconAnimationDefinition &definition);
@@ -58,8 +58,7 @@
void animPlaying(HbIconAnimation *anim);
void animNotPlaying(HbIconAnimation *anim);
- static HbIconAnimationManagerPrivate *d_ptr(HbIconAnimationManager *mgr)
- {
+ static HbIconAnimationManagerPrivate *d_ptr(HbIconAnimationManager *mgr) {
return mgr->d;
}
@@ -68,7 +67,7 @@
void handleAnimationPause();
void handleThemeChanged();
void handleThemeChangeFinished();
- void handleViewChanged(HbView*);
+ void handleViewChanged(HbView *);
private:
Q_DISABLE_COPY(HbIconAnimationManagerPrivate)
--- a/src/hbcore/image/hbiconanimationparser.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbiconanimationparser.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -87,7 +87,7 @@
#endif
return false;
}
-
+
setDevice(&file);
bool ret = doParseFile(fileName, animations);
file.close();
@@ -107,7 +107,7 @@
if (name() == "animations") {
ret = readAnimations(fileName, animations);
}
- }
+ }
}
#ifdef HB_ICON_TRACES
@@ -165,7 +165,7 @@
QString HbIconAnimationParser::readIconData(HbIconAnimationData &data)
{
Q_ASSERT(isStartElement() && name() == "icon");
-
+
QString iconName;
int defaultDuration = 0;
QStack< QPair<int, int> > repStk;
@@ -176,7 +176,7 @@
QList<HbIconAnimationDefinition::AnimationFrame> frames = data.def.frameList();
// Read icon attributes
- foreach (const QXmlStreamAttribute &attr, attrs) {
+ foreach(const QXmlStreamAttribute & attr, attrs) {
// "name" = ...
if (attr.name().toString() == "name") {
iconName = attr.value().toString();
@@ -226,7 +226,7 @@
QXmlStreamAttributes attrs = attributes();
// Read attributes
- foreach (const QXmlStreamAttribute &attr, attrs) {
+ foreach(const QXmlStreamAttribute & attr, attrs) {
// duration attribute
if (attr.name().toString() == "duration") {
frame.duration = attr.value().toString().toInt();
@@ -246,7 +246,7 @@
// </loop>
int repeatCount = 0;
QXmlStreamAttributes attrs = attributes();
- foreach (const QXmlStreamAttribute &attr, attrs) {
+ foreach(const QXmlStreamAttribute & attr, attrs) {
if (attr.name().toString() == "count") {
repeatCount = attr.value().toString().toInt();
}
@@ -255,7 +255,7 @@
if (repeatCount > 0) {
// Target frame index for this loop's last frame will be the index of
// the frame that comes next.
- repStk.push(QPair<int, int>(frames.count(), repeatCount));
+ repStk.push(QPair<int, int>(frames.count(), repeatCount));
}
} else {
--- a/src/hbcore/image/hbiconanimationparser_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbiconanimationparser_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -43,7 +43,7 @@
bool parseDefinitionFile(const QString &fileName, AnimHash &animations, const QString &realFileName);
private:
- bool doParseFile(const QString &fileName, AnimHash &animations);
+ bool doParseFile(const QString &fileName, AnimHash &animations);
bool readAnimations(const QString &fileName, AnimHash &animations);
QString readIconData(HbIconAnimationData &data);
void readUnknownElement();
--- a/src/hbcore/image/hbiconanimator.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbiconanimator.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -44,9 +44,9 @@
\brief HbIconAnimator is the animation interface for animated icons. Class HbIconItem
uses it for built-in animation support. For more specific use cases, clients can also
create their own HbIconAnimator instance and use it for driving an icon animation.
-
+
If the icon is not animated, the animator does not do anything.
-
+
The animator provides signals for observing the start, stop and finish of the animation and the
animation progress.
*/
@@ -70,23 +70,23 @@
/*!
\fn void HbIconAnimator::animationStopped()
-
+
This signal is emitted whenever the icon animation is stopped (by calling
stopAnimation()) before the animation has finished.
-
+
\sa stopAnimation()
*/
/*!
\fn void HbIconAnimator::animationProgressed()
-
+
This signal is emitted whenever the icon animation has progressed and the
icon should be repainted to the screen.
*/
/*!
\fn void HbIconAnimator::animationFinished()
-
+
This signal is emitted whenever the icon animation is finished (and there was
no stopAnimation() call). This can be used e.g. to synchronize subsequent icon
animations. If looping is enabled then this signal is never emitted.
@@ -162,10 +162,9 @@
// Update current mirroring in the animation
d->animation->setMirrored(icon.d->engine->isMirrored());
}
- }
- else if ((static_cast<int>(icon.flags()) & HbIcon::ResolutionCorrected) !=
- (static_cast<int>(d->icon.flags()) & HbIcon::ResolutionCorrected) ||
- icon.isNull()) {
+ } else if ((static_cast<int>(icon.flags()) & HbIcon::ResolutionCorrected) !=
+ (static_cast<int>(d->icon.flags()) & HbIcon::ResolutionCorrected) ||
+ icon.isNull()) {
needToRecreateAnimation = true;
}
}
--- a/src/hbcore/image/hbiconengine.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbiconengine.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -34,10 +34,12 @@
#include "hbimagetraces_p.h"
#include "hbiconimpl_p.h"
#include "hbpixmapiconimpl_p.h"
+#include "hbbadgeicon_p.h"
+
#include <hbinstance.h>
#include <hbiconanimator.h>
#include <hbiconanimator_p.h>
-#include "hbbadgeicon_p.h"
+
#include <QObject>
#include <QPainter>
@@ -67,9 +69,9 @@
void unLoadIcon(bool unloadedByServer = false);
void addBadge(Qt::Alignment alignment,
- const HbIcon& badge,
- int z=0);
- bool removeBadge(const HbIcon& badge);
+ const HbIcon &badge,
+ int z = 0);
+ bool removeBadge(const HbIcon &badge);
void removeAllBadges();
const QList<HbBadgeIconInfo> badges() const;
bool isBadged() const;
@@ -79,8 +81,7 @@
public:
QSizeF size;
- struct IconName
- {
+ struct IconName {
QIcon::Mode mode;
QIcon::State state;
QString name;
@@ -107,8 +108,7 @@
HbIcon::Flags flags;
HbIcon::MirroringMode mirroringMode;
- enum DefaultMirroring
- {
+ enum DefaultMirroring {
Unknown = 0,
Enabled = 1,
Disabled = 2
@@ -162,8 +162,7 @@
HbIconEnginePrivate::HbIconEnginePrivate(const HbIconEnginePrivate &other) :
size(other.size),
iconNames(other.iconNames),
- // Pixmap is cleared if other object uses animation
- pixmap(other.animator ? QPixmap() : other.pixmap),
+ pixmap(other.animator ? QPixmap() : other.pixmap), // Pixmap is cleared if other object uses animation.
aspectRatioMode(other.aspectRatioMode),
mode(other.mode),
state(other.state),
@@ -173,11 +172,9 @@
flags(other.flags),
mirroringMode(other.mirroringMode),
defaultMirroring(other.defaultMirroring),
- // Animator is instance specific and not copied
- animator(0),
- color(other.color),
- // HbIconImpl is instance specific, it is recreated when icon is painted
- icon(0),
+ animator(0), // Animator is instance specific and not copied.
+ color(other.color), // No copy for themedColor, that one is an internal, instance-specific setting.
+ icon(0), // HbIconImpl is instance specific, it is recreated when icon is painted.
badgeInfo(0),
signalConnectionsSet(false),
iconType(INVALID_FORMAT)
@@ -227,6 +224,7 @@
stream >> temp;
defaultMirroring = (HbIconEnginePrivate::DefaultMirroring)temp;
stream >> color;
+ // Do not store themedColor, see the copy ctor.
badgeInfo->internalize(stream);
}
@@ -236,7 +234,7 @@
// Externalize parameters that are needed to reconstruct the icon
stream << size;
stream << iconNames.count();
- Q_FOREACH(const IconName &name, iconNames) {
+ Q_FOREACH(const IconName & name, iconNames) {
stream << (qint32)(name.mode);
stream << (qint32)(name.state);
stream << name.name;
@@ -277,9 +275,9 @@
/*!
\internal
- Initiates an IPC call to the ThemeServer to unload ( decrement ref count )
+ Initiates an IPC call to the ThemeServer to unload ( decrement ref count )
the icon if created on server side.
-
+
*/
void HbIconEnginePrivate::unLoadIcon(bool unloadedByServer)
{
@@ -320,7 +318,7 @@
if (mirroringMode == HbIcon::Default && defaultMirroring == Unknown) {
HbIconLoader *loader = HbIconLoader::global();
defaultMirroring = loader->isAutomaticallyMirrored(
- iconName(QIcon::Normal, QIcon::Off)) ? Enabled : Disabled;
+ iconName(QIcon::Normal, QIcon::Off)) ? Enabled : Disabled;
}
bool basedOnLayoutDir = false;
@@ -333,13 +331,13 @@
} else if (defaultMirroring == Disabled) {
return false;
}
- // Forced
+ // Forced
} else if (mirroringMode == HbIcon::Forced) {
return true;
- // Prevented
+ // Prevented
} else if (mirroringMode == HbIcon::Prevented) {
return false;
- // LayoutDirection
+ // LayoutDirection
} else if (mirroringMode == HbIcon::LayoutDirection) {
basedOnLayoutDir = true;
}
@@ -347,11 +345,11 @@
if (basedOnLayoutDir) {
// e.g. some unit tests do not have primary window at this point so need to do NULL checks here.
if (hbInstance) {
- QList<HbMainWindow*> allWindows = hbInstance->allMainWindows();
-
- if ( !allWindows.isEmpty() &&
- allWindows.value(0) &&
- allWindows.value(0)->layoutDirection() == Qt::RightToLeft) {
+ QList<HbMainWindow *> allWindows = hbInstance->allMainWindows();
+
+ if (!allWindows.isEmpty() &&
+ allWindows.value(0) &&
+ allWindows.value(0)->layoutDirection() == Qt::RightToLeft) {
return true;
}
return false;
@@ -388,7 +386,7 @@
{
QString ret;
- Q_FOREACH(const HbIconEnginePrivate::IconName &name, iconNames) {
+ Q_FOREACH(const HbIconEnginePrivate::IconName & name, iconNames) {
if (name.mode == mode && name.state == state) {
ret = name.name;
break;
@@ -427,7 +425,7 @@
// Even when the Colorized flag is not set certain icons from the theme must be
// colorized. These mono icons are recognized from their name. The check should not be
// done for normal files, only for logical theme graphics names.
- return name.startsWith("qtg_mono_") && !name.contains('.');
+ return name.startsWith(QLatin1String("qtg_mono_")) && !name.contains('.');
}
QColor HbIconEnginePrivate::colorToUse(const QString &iconName) const
@@ -440,8 +438,8 @@
}
void HbIconEnginePrivate::addBadge(Qt::Alignment align,
- const HbIcon& icon,
- int z)
+ const HbIcon &icon,
+ int z)
{
if (!badgeInfo) {
badgeInfo = new HbBadgeIcon();
@@ -449,7 +447,7 @@
badgeInfo->addBadge(align, icon, z);
}
-bool HbIconEnginePrivate::removeBadge(const HbIcon& badge)
+bool HbIconEnginePrivate::removeBadge(const HbIcon &badge)
{
return badgeInfo ? badgeInfo->removeBadge(badge) : false;
}
@@ -481,7 +479,7 @@
{
// Register the HbIconEngine Instance to HbIconLoader
HbIconLoader *loader = HbIconLoader::global();
- loader->storeIconEngineInfo(this);
+ loader->storeIconEngineInfo(this);
}
HbIconEngine::HbIconEngine(const QString &iconName) :
@@ -490,7 +488,7 @@
d(new HbIconEnginePrivate(iconName))
{
// Register the HbIconEngine Instance to HbIconLoader
- HbIconLoader *loader = HbIconLoader::global();
+ HbIconLoader *loader = HbIconLoader::global();
loader->storeIconEngineInfo(this);
}
@@ -626,7 +624,7 @@
// Mirroring changed, clear stored icon content
clearStoredIconContent();
}
-
+
d->mirroringMode = mode;
}
@@ -659,7 +657,7 @@
// 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.
- s = QSize(0,0);
+ s = QSize(0, 0);
}
QIcon::Mode modeForLoader = mode;
@@ -678,21 +676,21 @@
// If requested size is not the same as set in the engine, get a new pixmap from loader
if (pixelSize != size().toSize()) {
- // Clear the old icon first
+ // Clear the old icon first
d->unLoadIcon();
-
+
d->icon = loader->loadIcon(
- name,
- HbIconLoader::AnyType,
- HbIconLoader::AnyPurpose,
- s,
- Qt::KeepAspectRatio,
- modeForLoader,
- d->iconLoaderOptions(),
- 0,
- d->colorToUse(name));
-
- if (d->icon){
+ name,
+ HbIconLoader::AnyType,
+ HbIconLoader::AnyPurpose,
+ s,
+ Qt::KeepAspectRatio,
+ modeForLoader,
+ d->iconLoaderOptions(),
+ 0,
+ d->colorToUse(name));
+
+ if (d->icon) {
// Draw badges on this pixmap
QPainter painter(&d->pixmap);
if (d->badgeInfo) {
@@ -701,7 +699,7 @@
d->pixmap = d->icon->pixmap();
return d->pixmap;
}
-
+
}
// Requested size was same as set in engine, use the pixmap stored in engine
else {
@@ -712,26 +710,26 @@
// Clear the old icon first
d->unLoadIcon();
d->icon = loader->loadIcon(
- name,
- HbIconLoader::AnyType,
- HbIconLoader::AnyPurpose,
- s,
- Qt::KeepAspectRatio,
- modeForLoader,
- d->iconLoaderOptions(),
- 0,
- d->colorToUse(name));
+ name,
+ HbIconLoader::AnyType,
+ HbIconLoader::AnyPurpose,
+ s,
+ Qt::KeepAspectRatio,
+ modeForLoader,
+ d->iconLoaderOptions(),
+ 0,
+ d->colorToUse(name));
// If loading failed, store information so it is not retried.
if (!d->icon) {
- d->appendLoadFail(mode, state);
+ d->appendLoadFail(mode, state);
}
}
if (d->icon) {
d->pixmap = d->icon->pixmap();
// Draw badges on this pixmap
QPainter painter(&d->pixmap);
- if (d->badgeInfo){
+ if (d->badgeInfo) {
d->badgeInfo->paint(&painter, QRectF(QPointF(0, 0), pixelSize), mode, state, d->isMirrored());
}
return d->pixmap;
@@ -775,7 +773,7 @@
{
QString name = iconName();
if (!d->defaultSizeFailed && !d->defaultSize.isValid() && !name.isEmpty()) {
- if (d->icon){
+ if (d->icon) {
d->defaultSize = d->icon->defaultSize();
} else {
HbIconLoader *loader = HbIconLoader::global();
@@ -809,17 +807,20 @@
}
}
-void HbIconEngine::paint( QPainter *painter,
- const QRect &rect,
- QIcon::Mode mode,
- QIcon::State state )
+void HbIconEngine::paint(QPainter *painter,
+ const QRect &rect,
+ QIcon::Mode mode,
+ QIcon::State state)
{
// This method is called by QIcon and it should paint the icon with the size defined by 'rect'.
- HbIconImpl* icon = 0;
-
+ HbIconImpl *icon = 0;
+
// update the rendering mode
- HbIconLoader::global()->updateRenderingMode(painter->paintEngine()->type());
-
+ QPaintEngine *paintEngine = painter->paintEngine();
+ if (paintEngine) {
+ HbIconLoader::global()->updateRenderingMode(paintEngine->type());
+ }
+
icon = paintHelper(rect.size(), Qt::KeepAspectRatio, mode, state);
if (icon) {
icon->paint(painter, rect, Qt::AlignCenter);
@@ -833,12 +834,12 @@
}
}
-void HbIconEngine::paint( QPainter *painter,
- const QRectF &rect,
- Qt::AspectRatioMode aspectRatioMode,
- Qt::Alignment alignment,
- QIcon::Mode mode,
- QIcon::State state)
+void HbIconEngine::paint(QPainter *painter,
+ const QRectF &rect,
+ Qt::AspectRatioMode aspectRatioMode,
+ Qt::Alignment alignment,
+ QIcon::Mode mode,
+ QIcon::State state)
{
// If loading the pixmap has failed, do not retry forever
if (loadFailed(mode, state)) {
@@ -855,9 +856,9 @@
// FrameSet animations need to be reloaded if size related parameters have changed,
// so delete the current animation in that case.
HbIconAnimation *anim = animation();
- if (anim && anim->type() == HbIconAnimation::FrameSet) {
- if ( ( (!s.isEmpty() || !anim->size().isEmpty()) && s != anim->size() ) ||
- aspectRatioMode != anim->aspectRatioMode()) {
+ if (anim && anim->type() == HbIconAnimation::FrameSet) {
+ if (((!s.isEmpty() || !anim->size().isEmpty()) && s != anim->size()) ||
+ aspectRatioMode != anim->aspectRatioMode()) {
#ifdef HB_ICON_TRACES
qDebug("HbIconEngine: deleting anim");
#endif
@@ -869,7 +870,7 @@
// 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.
- s = QSizeF(0,0);
+ s = QSizeF(0, 0);
}
// If pixmap has not been loaded yet or parameters affecting to pixmap have changed,
@@ -881,9 +882,12 @@
// If icon parameters changed unload the icon first, and get the new icon
d->unLoadIcon();
// Update the rendering mode
- HbIconLoader::global()->updateRenderingMode(painter->paintEngine()->type());
+ QPaintEngine *paintEngine = painter->paintEngine();
+ if (paintEngine) {
+ HbIconLoader::global()->updateRenderingMode(paintEngine->type());
+ }
d->icon = paintHelper(s, aspectRatioMode, mode, state);
- if ( d->icon && d->icon->isCreatedOnServer() ) {
+ if (d->icon && d->icon->isCreatedOnServer()) {
d->iconType = d->icon->iconData().type;
}
}
@@ -907,7 +911,7 @@
void HbIconEngine::setAnimator(HbIconAnimator *animator)
{
d->animator = animator;
- // Reconnect animation signals
+ // Reconnect animation signals
HbIconAnimation *anim = animation();
if (anim) {
@@ -919,7 +923,7 @@
}
}
-HbIconImpl* HbIconEngine::paintHelper(
+HbIconImpl *HbIconEngine::paintHelper(
const QSizeF &size,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
@@ -932,7 +936,7 @@
QString name = iconName(mode, state);
QIcon::Mode modeForLoader = mode;
- HbIconImpl *icon = NULL;
+ HbIconImpl *icon = 0;
if (name.isEmpty()) {
// Icon name not defined for this mode and state, use default icon name
name = iconName(QIcon::Normal, QIcon::Off);
@@ -962,15 +966,15 @@
HbIconLoader *loader = HbIconLoader::global();
icon = loader->loadIcon(
- name,
- HbIconLoader::AnyType,
- HbIconLoader::AnyPurpose,
- size,
- aspectRatioMode,
- modeForLoader,
- d->iconLoaderOptions(),
- d->animator,
- d->colorToUse(name));
+ 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) {
@@ -1003,7 +1007,7 @@
This function is called when some parameters change so that the content has
to be reloaded, and in low-graphics-memory situations to get rid of all
cached image data for the icon.
-
+
The goal in the OOGM case is to destroy all unnecessary QPixmaps which will in turn
lead to freeing graphics memory (in case we are running on the OpenVG paint engine).
The data will be reloaded (well, at least tried to be reloaded) when the icon is
@@ -1065,7 +1069,7 @@
{
// Theme has changed, clear stored icon content
// Server side icon cache is already cleared when theme is changed
- if (updatedFiles.count() == 0 || (d->icon && updatedFiles.contains(d->icon->iconFileName())) ) {
+ if (updatedFiles.count() == 0 || (d->icon && updatedFiles.contains(d->icon->iconFileName()))) {
clearStoredIconContent(UnloadedByServer);
}
}
@@ -1073,7 +1077,7 @@
void HbIconEngine::handleLayoutDirectionChanged()
{
if ((d->mirroringMode == HbIcon::Default && d->defaultMirroring == HbIconEnginePrivate::Enabled) ||
- d->mirroringMode == HbIcon::LayoutDirection) {
+ d->mirroringMode == HbIcon::LayoutDirection) {
// This icon is automatically mirrored based on layout direction.
// Clear the stored icon content and its default size because the layout direction just changed.
@@ -1141,7 +1145,7 @@
anim->setSize(size());
anim->setAspectRatioMode(d->aspectRatioMode);
anim->setMode(d->mode);
- // Get the current frame as pixmap from the animation
+ // Get the current frame as pixmap from the animation
return anim->currentFrame();
} else {
return QPixmap();
@@ -1150,15 +1154,15 @@
/*!
* Removes the item in the cache if the ref. count is 0 and does delete on
- * HbIconImpl and Resets the IconImpl.
+ * HbIconImpl and Resets the IconImpl.
*/
void HbIconEngine::resetIconImpl() const
- {
+{
#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
- if ( (d->iconType == SGIMAGE) || (d->iconType == NVG) ) {
- if ( d->icon ) {
+ if ((d->iconType == SGIMAGE) || (d->iconType == NVG)) {
+ if (d->icon) {
d->icon->decrementRefCount();
- if ( d->icon->refCount() == 0 && d->icon->isCreatedOnServer() ) {
+ if (d->icon->refCount() == 0 && d->icon->isCreatedOnServer()) {
HbIconLoader *loader = HbIconLoader::global();
loader->removeItemInCache(d->icon);
d->icon->dispose();
@@ -1167,16 +1171,16 @@
}
}
#endif
- }
+}
void HbIconEngine::addBadge(Qt::Alignment align,
- const HbIcon& icon,
- int z)
+ const HbIcon &icon,
+ int z)
{
d->addBadge(align, icon, z);
}
-bool HbIconEngine::removeBadge(const HbIcon& badge)
+bool HbIconEngine::removeBadge(const HbIcon &badge)
{
return d->removeBadge(badge);
}
--- a/src/hbcore/image/hbiconengine_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbiconengine_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -98,18 +98,18 @@
void setAnimator(HbIconAnimator *animator);
bool isMirrored() const;
void addBadge(Qt::Alignment alignment,
- const HbIcon& badge,
- int z=0);
- bool removeBadge(const HbIcon& badge);
+ const HbIcon &badge,
+ int z = 0);
+ bool removeBadge(const HbIcon &badge);
void removeAllBadges();
const QList<HbBadgeIconInfo> badges() const;
- HbIconFormatType iconFormatType() const;
+ HbIconFormatType iconFormatType() const;
private:
void ensureSignalConnections();
QPixmap getPixmapFromAnimation() const;
-
- HbIconImpl* paintHelper(const QSizeF &size,
+
+ HbIconImpl *paintHelper(const QSizeF &size,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode,
QIcon::State);
--- a/src/hbcore/image/hbiconimpl_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbiconimpl_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -40,132 +40,115 @@
public:
HbIconImpl()
- : iconRefCount(1)
+ : createdOnServer(false),
+ iconRefCount(1)
{
- createdOnServer = false;
+
}
- HbIconImpl(const HbSharedIconInfo& iconData,
- const QString& name,
- const QSizeF& keySize,
+ HbIconImpl(const HbSharedIconInfo &iconData,
+ const QString &name,
+ const QSizeF &keySize,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
HbRenderingMode renderMode):
- sharedIconData(iconData),
- fileName(name),
- cacheKeySize(keySize),
- aspectRatioMode(aspectRatioMode),
- mode(mode),
- mirrored(mirrored),
- defaultIconSize(QSize(0,0)),
- createdOnServer(true),
- iconRefCount(1),
- multiPieceIcon(false),
- renderMode(renderMode)
-
+ sharedIconData(iconData),
+ fileName(name),
+ cacheKeySize(keySize),
+ aspectRatioMode(aspectRatioMode),
+ mode(mode),
+ mirrored(mirrored),
+ defaultIconSize(QSize(0, 0)),
+ createdOnServer(true),
+ iconRefCount(1),
+ multiPieceIcon(false),
+ renderMode(renderMode)
+
{
}
virtual QPixmap pixmap() = 0;
- virtual void paint(QPainter* painter,
- const QRectF &childRect,
- Qt::Alignment alignment,
- const QPainterPath &clipPath = QPainterPath(),
- HbMaskableIconImpl * maskIconData = 0) = 0;
+ virtual void paint(QPainter *painter,
+ const QRectF &childRect,
+ Qt::Alignment alignment,
+ const QPainterPath &clipPath = QPainterPath(),
+ HbMaskableIconImpl *maskIconData = 0) = 0;
virtual QSize defaultSize() const = 0;
virtual QSize size() = 0;
- void setColor(const QColor &color)
- {
- this->iconColor = color;
+ void setColor(const QColor &color) {
+ this->iconColor = color;
}
- QColor color()
- {
+ QColor color() {
return iconColor;
}
- void setMultiPieceIcon(bool value = true)
- {
+ void setMultiPieceIcon(bool value = true) {
multiPieceIcon = value;
}
- bool isMultiPieceIcon()
- {
+ bool isMultiPieceIcon() {
return multiPieceIcon;
}
- HbSharedIconInfo iconData() const
- {
+ HbSharedIconInfo iconData() const {
return sharedIconData;
}
- QString iconFileName() const
- {
+ QString iconFileName() const {
return fileName;
}
- QSizeF keySize() const
- {
+ QSizeF keySize() const {
return cacheKeySize;
}
- Qt::AspectRatioMode iconAspectRatioMode() const
- {
+ Qt::AspectRatioMode iconAspectRatioMode() const {
return aspectRatioMode;
}
- QIcon::Mode iconMode() const
- {
+ QIcon::Mode iconMode() const {
return mode;
}
- bool isMirrored() const
- {
+ bool isMirrored() const {
return mirrored;
}
- bool isCreatedOnServer() const
- {
+ bool isCreatedOnServer() const {
return createdOnServer;
}
- void incrementRefCount()
- {
+ void incrementRefCount() {
this->iconRefCount++;
}
- uint refCount()
- {
+ uint refCount() {
return this->iconRefCount;
}
- void decrementRefCount()
- {
+ void decrementRefCount() {
this->iconRefCount--;
}
- void dispose()
- {
+ void dispose() {
if (iconRefCount == 0) {
delete this;
}
}
- virtual void destroyMaskedData(HbIconMaskedData *data)
- {
+ virtual void destroyMaskedData(HbIconMaskedData *data) {
Q_UNUSED(data);
}
-
- HbRenderingMode iconRenderingMode() const
- {
+
+ HbRenderingMode iconRenderingMode() const {
return renderMode;
}
protected:
- virtual ~HbIconImpl()
- {
+ virtual ~HbIconImpl() {
}
HbSharedIconInfo sharedIconData;
--- a/src/hbcore/image/hbiconimplcreator_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbiconimplcreator_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -40,14 +40,25 @@
\internal
*/
-HbIconImpl *HbIconImplCreator::createIconImpl(HbSharedIconInfo& iconImplInfo,
- HbIconLoadingParams ¶ms )
+HbIconImpl *HbIconImplCreator::createIconImpl(HbSharedIconInfo &iconImplInfo,
+ HbIconLoadingParams ¶ms)
{
- HbIconImpl* iconImpl = 0;
- switch(iconImplInfo.type){
- case NVG:
+ HbIconImpl *iconImpl = 0;
+ switch (iconImplInfo.type) {
+ case NVG:
#ifdef HB_NVG_CS_ICON
- iconImpl = new HbNvgIconImpl(iconImplInfo,
+ iconImpl = new HbNvgIconImpl(iconImplInfo,
+ params.iconFileName,
+ params.size,
+ params.aspectRatioMode,
+ params.mode,
+ (params.mirrored && !params.mirroredIconFound),
+ params.renderMode);
+#endif
+ break;
+ case SGIMAGE:
+#ifdef HB_SGIMAGE_ICON
+ iconImpl = new HbSgimageIconImpl(iconImplInfo,
params.iconFileName,
params.size,
params.aspectRatioMode,
@@ -55,34 +66,23 @@
(params.mirrored && !params.mirroredIconFound),
params.renderMode);
#endif
- break;
- case SGIMAGE:
-#ifdef HB_SGIMAGE_ICON
- iconImpl = new HbSgimageIconImpl(iconImplInfo,
- params.iconFileName,
- params.size,
- params.aspectRatioMode,
- params.mode,
- (params.mirrored && !params.mirroredIconFound),
- params.renderMode);
-#endif
- break;
- case OTHER_SUPPORTED_FORMATS:
- iconImpl = new HbPixmapIconImpl(iconImplInfo,
- params.iconFileName,
- params.size,
- params.aspectRatioMode,
- params.mode,
- (params.mirrored && !params.mirroredIconFound),
- params.renderMode);
- break;
- default:
- break;
+ break;
+ case OTHER_SUPPORTED_FORMATS:
+ iconImpl = new HbPixmapIconImpl(iconImplInfo,
+ params.iconFileName,
+ params.size,
+ params.aspectRatioMode,
+ params.mode,
+ (params.mirrored && !params.mirroredIconFound),
+ params.renderMode);
+ break;
+ default:
+ break;
}
-
- if (iconImpl && params.color.isValid()){
- iconImpl->setColor(params.color);
- }
+
+ if (iconImpl && params.color.isValid()) {
+ iconImpl->setColor(params.color);
+ }
return iconImpl;
}
--- a/src/hbcore/image/hbiconloader.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbiconloader.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -23,25 +23,9 @@
**
****************************************************************************/
-#include <hbiconloader_p.h>
-#include "hbthemecommon_p.h"
-
-#include <QDir>
-#include <QCoreApplication>
-#include <QDebug>
-#include <QPicture>
-#include <QPainter>
-#include <QStyleOption>
-#include <QApplication> //krazy:exclude=qclasses
-#include <QtAlgorithms>
-#include <QTime>
-#include <QSvgRenderer>
-#include <QImageReader>
-#include <QHash>
-
+#include "hbiconloader_p.h"
#include "hbframedrawer_p.h"
#include "hbicontheme_p.h"
-#include "hbstandarddirs_p.h"
#include "hblayoutdirectionnotifier_p.h"
#include "hbinstance.h"
#include "hbiconanimation_p.h"
@@ -60,6 +44,19 @@
#include "hbthemeindex_p.h"
#include "hbthemecommon_p.h"
#include "hbiconimplcreator_p.h"
+#include "hbstandarddirs_p.h"
+#include <QDir>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QPicture>
+#include <QPainter>
+#include <QStyleOption>
+#include <QApplication> //krazy:exclude=qclasses
+#include <QtAlgorithms>
+#include <QTime>
+#include <QSvgRenderer>
+#include <QImageReader>
+#include <QHash>
#ifdef HB_NVG_CS_ICON
#include "hbeglstate_p.h"
@@ -133,10 +130,10 @@
QIcon::Mode mode,
bool mirrored,
const QColor &color,
- HbRenderingMode renderMode);
+ HbRenderingMode renderMode );
#endif
-public: // data
+public:
QString storedTheme;
int sourceResolution;
@@ -151,7 +148,7 @@
HbIconSource *lastIconSource;
-private: // data
+private:
enum {
Unknown = 0,
NotMirrored = 1,
@@ -190,18 +187,18 @@
QString HbIconLoaderPrivate::removeIconNameSuffix(const QString &iconName)
{
QString loweredIconName = iconName.toLower();
- if (loweredIconName.endsWith(".svg")
- || loweredIconName.endsWith(".png")
- || loweredIconName.endsWith(".mng")
- || loweredIconName.endsWith(".gif")
- || loweredIconName.endsWith(".xpm")
- || loweredIconName.endsWith(".jpg")
- || loweredIconName.endsWith(".nvg")) {
+ if (loweredIconName.endsWith(QLatin1String(".svg"))
+ || loweredIconName.endsWith(QLatin1String(".png"))
+ || loweredIconName.endsWith(QLatin1String(".mng"))
+ || loweredIconName.endsWith(QLatin1String(".gif"))
+ || loweredIconName.endsWith(QLatin1String(".xpm"))
+ || loweredIconName.endsWith(QLatin1String(".jpg"))
+ || loweredIconName.endsWith(QLatin1String(".nvg"))) {
return iconName.left(iconName.length() - 4);
}
- if (loweredIconName.endsWith(".svgz")
- || loweredIconName.endsWith(".qpic")) {
+ if (loweredIconName.endsWith(QLatin1String(".svgz"))
+ || loweredIconName.endsWith(QLatin1String(".qpic"))) {
return iconName.left(iconName.length() - 5);
}
@@ -233,9 +230,7 @@
mirroredIconFound = false;
QString iconPath;
- if (QDir::isRelativePath(resourceName)) {
-
-#ifdef Q_OS_SYMBIAN
+ if (HbThemeUtils::isLogicalName(resourceName)) {
// Try to get themed icon information from theme index
HbThemeIndexResource resource(resourceName);
if (resource.isValid()) {
@@ -244,30 +239,12 @@
} else {
return resource.fullFileName();
}
- }
-#endif // Q_OS_SYMBIAN
-
- // If there was no theme index, search the icon in theme icon dirs (slow)
- foreach (const QString &dir, HbThemePrivate::instance()->iconDirectories()) {
- if (mirrored) {
- // If icon is mirrored, try to find the icon in a separate "mirrored" folder used for mirrored icons
- iconPath = HbStandardDirs::findResource( dir + "mirrored" + '/' + resourceName, Hb::IconResource );
- if( !iconPath.isEmpty() ) {
- mirroredIconFound = true;
- break;
- }
- }
-
- iconPath = HbStandardDirs::findResource( dir + resourceName, Hb::IconResource );
-
- // If the file was found in this dir, return the filename.
- if ( !iconPath.isEmpty() ) {
- break;
- }
+ } else {
+ // Logical name not found in theme index - return empty string
+ return QString();
}
} else {
- // Absolute path. Do not scan through different theme directories.
- QString iconNameCopy(resourceName);
+ // Not a logical name. Check from file system.
if (mirrored) {
// If icon is mirrored, try to find the icon in a separate "mirrored" folder used for mirrored icons
@@ -294,6 +271,8 @@
}
return iconPath;
+}
+
/*
From Freedesktop.org:
@@ -427,19 +406,15 @@
}
*/
-}
bool HbIconLoaderPrivate::isAutomaticallyMirrored(const QString &iconName)
{
- Q_UNUSED(iconName);
// only place to get mirroring information is from themeindex
-#ifdef Q_OS_SYMBIAN
- // Try to get themed icon information from theme index
- HbThemeIndexResource resource(iconName);
- if (resource.isValid()) {
- return resource.isAutomaticallyMirrored();
- }
-#endif
+ // Try to get themed icon information from theme index
+ HbThemeIndexResource resource(iconName);
+ if (resource.isValid()) {
+ return resource.isAutomaticallyMirrored();
+ }
return false;
}
@@ -466,9 +441,13 @@
}
#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)
+QByteArray HbIconLoaderPrivate::createCacheKeyFrom( const QString &iconName,
+ const QSizeF &size,
+ Qt::AspectRatioMode aspectRatioMode,
+ QIcon::Mode mode,
+ bool mirrored,
+ const QColor &color,
+ HbRenderingMode renderMode )
{
static const int paramArraySize = 8;
@@ -576,11 +555,10 @@
}
}
- // Step 2: There was no animation definition, try to get default size from theme index if it is a themed icon
+ // Step 2: There was no animation definition,
+ // try to get default size from theme index if it is a themed icon (logical name).
- // TODO: change this to simpler function call in Symbian OS env
- if (QDir::isRelativePath(iconName)) {
-#ifdef Q_OS_SYMBIAN
+ if (HbThemeUtils::isLogicalName(iconName)) {
// Try to get themed icon information from theme index
HbThemeIndexResource resource(iconName);
if (resource.isValid()) {
@@ -590,15 +568,9 @@
} else {
size = resource.defaultItemSize();
}
- // Returns invalid size if there is a valid theme index, but the item was not found there.
- return size;
- } else {
- // Step 3: Theme index was not used, try to get icon's default size from theme server's default size cache.
- params.iconFileName = resolveIconFileName(params);
}
-#else
- params.iconFileName = resolveIconFileName(params);
-#endif
+ // Returns invalid size if the index did not provide the size
+ return size;
} else { // Absolute path, use it directly without resolving anything.
params.iconFileName = iconName;
}
@@ -610,27 +582,7 @@
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 (manager && format != "MNG" && format != "GIF" &&
- !iconName.startsWith(':')) { // not using server for app's own resources (iconName is a logical name for theme elements)
-#ifdef HB_ICON_TRACES
- qDebug() << "HbIconLoader::DefaultSize req to server " << params.iconFileName;
-#endif
- QSizeF sizeFromServer = HbThemeClient::global()->getSharedIconDefaultSize(params.iconFileName);
-#ifdef HB_ICON_TRACES
- qDebug() << "HbIconLoader::DefaultSize result from server" << sizeFromServer;
-#endif
- if (sizeFromServer.isValid()) {
- return sizeFromServer;
- }
- }
-#endif // Q_OS_SYMBIAN
-
- // Step 4: Get the default size from the icon file in the client side
+ // Step 3: Get the default size from the icon file in the client side
HbIconSource *source = getIconSource(params.iconFileName, format);
size = source->defaultSize();
@@ -770,16 +722,16 @@
void HbIconLoader::freeGpuIconData()
{
#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
- for( int i = 0; i < iconEngineList.count(); i++ ) {
+ for( int i = 0; i < iconEngineList.count(); i++ ) {
HbIconEngine *engine = iconEngineList.at(i);
- engine->resetIconImpl();
- }
- for(int i = 0; i< frameDrawerInstanceList.count(); i++) {
- HbFrameDrawerPrivate * fd = frameDrawerInstanceList.at(i);
- if ( (fd->iconFormatType() == SGIMAGE) || (fd->iconFormatType() == NVG) ) {
- fd->resetMaskableIcon();
- }
- }
+ engine->resetIconImpl();
+ }
+ for(int i = 0; i< frameDrawerInstanceList.count(); i++) {
+ HbFrameDrawerPrivate * fd = frameDrawerInstanceList.at(i);
+ if ( (fd->iconFormatType() == SGIMAGE) || (fd->iconFormatType() == NVG) ) {
+ fd->resetMaskableIcon();
+ }
+ }
#endif
}
@@ -848,23 +800,7 @@
QList<HbIconAnimationFrameSet::FrameData> frameList;
// Get the default size from the first animation frame
- params.cleanIconName = frameDefs.at(0).iconName;
- params.iconFileName = resolveIconFileName(params);
- QString format = formatFromPath(params.iconFileName);
-
- // Try to get the default size from server if the icon is not such that is loaded in client side.
- if (format != "MNG"
- && format != "GIF"
- && !params.iconFileName.startsWith(':'))
- {
- QSizeF defSize = HbThemeClient::global()->getSharedIconDefaultSize(params.iconFileName);
- if (defSize.isValid()) {
- return defSize;
- }
- }
-
- // Otherwise get if by calling HbIconLoader::defaultSize for the first animation frame
- return HbIconLoader::defaultSize(params.iconFileName, QString(), params.options);
+ return HbIconLoader::defaultSize(frameDefs.at(0).iconName, QString(), params.options);
}
void HbIconLoader::loadAnimation(HbIconAnimationDefinition &def, HbIconLoadingParams ¶ms)
@@ -975,7 +911,7 @@
#endif
// If not found then it can still be a normal file specified with a relative path.
if (!iconFound) {
- iconFound = QFile(params.iconName).exists();
+ iconFound = QFile::exists(params.iconName);
if (iconFound) {
iconPath = params.iconName;
}
@@ -1271,12 +1207,12 @@
#endif
#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
- if (newRenderMode != renderMode) {
+ if (newRenderMode != renderMode) {
if (newRenderMode == ESWRendering) {
- // switching from HW to SW mode
- freeGpuIconData();
+ // switching from HW to SW mode
+ freeGpuIconData();
}
- if (HbThemeClient::global()->switchRenderingMode(newRenderMode)) {
+ if (HbThemeClient::global()->switchRenderingMode(newRenderMode)) {
renderMode = newRenderMode;
}
}
@@ -1383,8 +1319,13 @@
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 );
+ 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)) {
@@ -1397,7 +1338,7 @@
return ptr;
}
#endif
- if (QDir::isRelativePath(iconName)) {
+ if (HbThemeUtils::isLogicalName(iconName)) {
params.iconFileName = resolveIconFileName(params);
} else {
params.iconFileName = iconName;
@@ -1528,8 +1469,13 @@
// and when NVG is not available.
#if defined(HB_ICONIMPL_CACHE)
- QByteArray cacheKey = d->createCacheKeyFrom(multiPartIconData.multiPartIconId, size,
- aspectRatioMode, mode, mirrored, color, renderMode);
+ QByteArray cacheKey = d->createCacheKeyFrom(multiPartIconData.multiPartIconId,
+ size,
+ aspectRatioMode,
+ mode,
+ mirrored,
+ color,
+ renderMode);
//If consolidated icon found in the client's cache, increment ref-count and return
if (iconImplCache.contains(cacheKey)) {
HbIconImpl * ptr = iconImplCache.value(cacheKey);
@@ -1700,7 +1646,7 @@
* individual pieces.
*
*/
-void HbIconLoader::getMultiIconImplFromServer(QStringList &multiPartIconList,
+void HbIconLoader::getMultiIconImplFromServer(QStringList &multiPartIconList,
QVector<QSizeF> &sizeList,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
@@ -1718,8 +1664,13 @@
#ifdef HB_ICONIMPL_CACHE
// search the client cache first before asking the server
for(int i = 0; i < multiPartIconList.count(); i++) {
- QByteArray cacheKey = d->createCacheKeyFrom( multiPartIconList[i], sizeList[i], aspectRatioMode,
- mode, mirrored, color, currRenderMode );
+ 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
HbIconImpl * ptr = 0;
@@ -1771,8 +1722,13 @@
impl = HbIconImplCreator::createIconImpl(iconInfoList.icon[i], params);
#ifdef HB_ICONIMPL_CACHE
- QByteArray cacheKey = d->createCacheKeyFrom(multiPartIconList[i], sizeList.at(i) , aspectRatioMode,
- mode, mirrored, color, currRenderMode);
+ QByteArray cacheKey = d->createCacheKeyFrom( multiPartIconList[i],
+ sizeList.at(i) ,
+ aspectRatioMode,
+ mode,
+ mirrored,
+ color,
+ currRenderMode );
iconImplCache.insert(cacheKey, impl);
#ifdef HB_ICON_CACHE_DEBUG
qDebug() << "HbIconLoader::getMultiIconImplFromServer(): " << params.iconName << " inserted into impl-cache, ref-count now = " << impl->refCount();
--- a/src/hbcore/image/hbiconsource.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbiconsource.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -52,26 +52,26 @@
{
QString loweredIconPath = iconPath.toLower();
- if (loweredIconPath.endsWith(".svgz") ) {
- return "SVG";
+ if (loweredIconPath.endsWith(QLatin1String(".svgz"))) {
+ return QLatin1String("SVG");
}
- if (loweredIconPath.endsWith(".qpic") ) {
- return "PIC";
+ if (loweredIconPath.endsWith(QLatin1String(".qpic"))) {
+ return QLatin1String("PIC");
}
- if (loweredIconPath.endsWith(".svg")
- || loweredIconPath.endsWith(".png")
- || loweredIconPath.endsWith(".mng")
- || loweredIconPath.endsWith(".gif")
- || loweredIconPath.endsWith(".xpm")
- || loweredIconPath.endsWith(".jpg")
- || loweredIconPath.endsWith(".nvg")) {
+ if (loweredIconPath.endsWith(QLatin1String(".svg"))
+ || loweredIconPath.endsWith(QLatin1String(".png"))
+ || loweredIconPath.endsWith(QLatin1String(".mng"))
+ || loweredIconPath.endsWith(QLatin1String(".gif"))
+ || loweredIconPath.endsWith(QLatin1String(".xpm"))
+ || loweredIconPath.endsWith(QLatin1String(".jpg"))
+ || loweredIconPath.endsWith(QLatin1String(".nvg"))) {
return iconPath.right(3).toUpper();
}
- if (loweredIconPath.endsWith(".xml")
- || loweredIconPath.endsWith(".axml")
- || loweredIconPath.endsWith(".fxml"))
+ if (loweredIconPath.endsWith(QLatin1String(".xml"))
+ || loweredIconPath.endsWith(QLatin1String(".axml"))
+ || loweredIconPath.endsWith(QLatin1String(".fxml")))
{
return "BLOB";
}
@@ -93,6 +93,7 @@
const quint8* lBuf = (quint8*) buffer.data();
if((buffer.length() > NVG_VIEWBOX_WIDTH_OFS) && (buffer.length() > NVG_VIEWBOX_HEIGHT_OFS)) {
+ // Do not change to qreal, no matter what krazy says.
float lViewboxWidth = * (float*)(lBuf + NVG_VIEWBOX_WIDTH_OFS);
float lViewboxHeight = * (float*)(lBuf + NVG_VIEWBOX_HEIGHT_OFS);
--- a/src/hbcore/image/hbiconsource_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbiconsource_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -67,7 +67,7 @@
void releaseImageReader();
void takeImageReader();
QPixmap *pixmap();
- QByteArray* byteArray();
+ QByteArray *byteArray();
void deletePixmapIfLargerThan(int limitInBytes);
@@ -79,9 +79,9 @@
QString mType;
// These are used to generate the raster pixmap of the icon and for fetching icon's default size
- QPicture *mPicture;
- QPixmap *mPixmap;
- QByteArray* mByteArray;
+ QPicture *mPicture;
+ QPixmap *mPixmap;
+ QByteArray *mByteArray;
// Stored default size
QSize mDefaultSize;
--- a/src/hbcore/image/hbicontheme.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbicontheme.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -41,35 +41,14 @@
HbIconThemePrivate();
~HbIconThemePrivate();
- QString m_theme;
- QStringList m_dirList;
- QString m_description;
- bool loaded;
- void loadThemeDescriptionFile(const QString &themePath, int priority);
- void loadThemeDescriptionFiles(const QString &theme);
- bool addBaseThemePath();
-};
+ void loadThemeDescriptionFile();
-void HbIconThemePrivate::loadThemeDescriptionFiles(const QString &theme)
-{
- const QString indextheme(THEME_INDEX_FILE);
- QString pathToTheme;
- QMap<int, QString> maplist = HbThemeUtils::constructHierarchyListWithPathInfo(
- QString(), theme, Hb::IconResource);
- QMapIterator<int, QString> i(maplist);
- i.toBack();
- while (i.hasPrevious()) {
- i.previous();
- pathToTheme = HbStandardDirs::findResource(i.value() + indextheme, Hb::IconResource);
- if (!pathToTheme.isEmpty()) {
- loadThemeDescriptionFile(pathToTheme, i.key());
- }
- }
- if (!addBaseThemePath()) {
- qDebug() << "Can't find base theme";
- }
- loaded = true;
-}
+public:
+ QString m_theme;
+ QString m_description;
+ QString m_name;
+ bool loaded;
+};
HbIconThemePrivate::HbIconThemePrivate() : loaded(false)
{
@@ -79,68 +58,38 @@
{
}
-void HbIconThemePrivate::loadThemeDescriptionFile(const QString &themePath, int priority)
+void HbIconThemePrivate::loadThemeDescriptionFile()
{
+ // TODO: index file is accessed in several places, create utility
+ HbThemeIndexInfo info = HbThemeUtils::getThemeIndexInfo(ActiveTheme);
+
+ QString indexFileName;
+
+ indexFileName.append(info.path);
+ indexFileName.append("/icons/");
+ indexFileName.append(info.name);
+ indexFileName.append("/" THEME_INDEX_FILE);
+
HbIniParser iniParser;
- QFile themeFile(themePath);
+ QFile themeFile(indexFileName);
if (!themeFile.open(QIODevice::ReadOnly) || !iniParser.read(&themeFile)) {
- qDebug() << "Can't access file : " << themePath;
+#ifdef HB_THEME_SERVER_TRACES
+ qDebug() << "HbIconTheme: Can't access file: " << indexFileName;
+#endif
return;
}
- if (priority == HbLayeredStyleLoader::Priority_Theme) {
- m_description = iniParser.value("Icon Theme", "Comment");
+ m_description = iniParser.value("Icon Theme", "Comment");
+ m_name = iniParser.value("Icon Theme", "Name");
#ifdef Q_OS_SYMBIAN
- m_description = m_description.left(m_description.indexOf("\n", 0));
+ m_description = m_description.left(m_description.indexOf("\n", 0));
+ m_name = m_name.left(m_name.indexOf("\n", 0));
#endif
- }
-
- QString directories = iniParser.value("Icon Theme", "Directories");
- QStringList dirList = directories.split( ',', QString::SkipEmptyParts );
- QString indexThemeDir(themePath);
- indexThemeDir.chop(sizeof(THEME_INDEX_FILE) - 1);
-
- foreach (const QString &str, dirList) {
- m_dirList.append(QString(indexThemeDir + str + '/'));
- }
}
-bool HbIconThemePrivate::addBaseThemePath()
-{
- HbIniParser iniParser;
- const HbThemeInfo &baseThemeInfo = HbThemeUtils::baseTheme();
- QString baseThemePath = baseThemeInfo.rootDir + "/themes/icons/" + baseThemeInfo.name + "/"THEME_INDEX_FILE;
-
- // Parse it
- QFile baseThemeFile(baseThemePath);
- if (!baseThemeFile.open(QIODevice::ReadOnly) || !iniParser.read(&baseThemeFile)) {
- qDebug() << "Can't access file";
- return false;
- }
-
- if (m_theme == baseThemeInfo.name) {
- m_description = iniParser.value("Icon Theme", "Comment");
-#ifdef Q_OS_SYMBIAN
- m_description = m_description.left(m_description.indexOf("\n", 0));
-#endif
- }
-
- //Read parameters
- QString directories = iniParser.value("Icon Theme", "Directories");
- QStringList dirList = directories.split(',', QString::SkipEmptyParts);
- baseThemePath.chop(sizeof(THEME_INDEX_FILE) - 1);
- // Save paths
- foreach (const QString &str, dirList) {
- m_dirList.append(QString(baseThemePath + str + '/'));
- }
-
- return true;
-}
-
-
/*!
\class HbIconTheme
- \brief HbIconTheme gives access to icon themes and stores icon theme properties
+ \brief HbIconTheme gives access to icon themes and stores icon theme properties
according to the Freedesktop Icon Theme Specification
*/
HbIconTheme::HbIconTheme()
@@ -155,9 +104,8 @@
void HbIconTheme::setCurrentTheme(const QString &theme)
{
- if (d->m_theme != theme) {
+ if (!theme.isEmpty()) {
d->m_theme = theme;
- d->m_dirList.clear();
d->loaded = false;
}
}
@@ -170,29 +118,20 @@
return d->m_theme;
}
-/**
- * List of valid subdirectories of a theme
- */
-QStringList HbIconTheme::dirList() const
-{
- if (!d->loaded) {
- d->loadThemeDescriptionFiles(d->m_theme);
- }
- return d->m_dirList;
-}
-
QString HbIconTheme::description() const
{
if (!d->loaded) {
- d->loadThemeDescriptionFiles(d->m_theme);
+ d->loadThemeDescriptionFile();
}
return d->m_description;
}
-void HbIconTheme::clearDirList()
+QString HbIconTheme::name() const
{
- d->m_dirList.clear();
- d->loaded = false;
+ if (!d->loaded) {
+ d->loadThemeDescriptionFile();
+ }
+ return d->m_name;
}
void HbIconTheme::emitUpdateIcons(const QStringList &fileNames)
--- a/src/hbcore/image/hbicontheme_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbicontheme_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -34,16 +34,15 @@
class HB_AUTOTEST_EXPORT HbIconTheme : public QObject
{
-Q_OBJECT
+ Q_OBJECT
public:
explicit HbIconTheme();
~HbIconTheme();
void setCurrentTheme(const QString &theme);
QString currentTheme() const;
- QStringList dirList() const;
QString description() const;
- void clearDirList();
+ QString name() const;
void emitUpdateIcons(const QStringList &fileNames = QStringList());
// For future addition:
// QSizeF actualSize(HbIconLoader::Purpose purpose) const;
--- a/src/hbcore/image/hbmaskableiconimpl_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbmaskableiconimpl_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -35,144 +35,118 @@
class HB_AUTOTEST_EXPORT HbMaskableIconImpl
{
public:
- HbMaskableIconImpl(HbIconImpl * icon)
- {
- this->icon = icon;
- data = 0;
- maskApplied = false;
+ HbMaskableIconImpl(HbIconImpl *icon) {
+ this->icon = icon;
+ data = 0;
+ maskApplied = false;
}
-
- QPixmap pixmap()
- {
+
+ QPixmap pixmap() {
return icon->pixmap();
}
-
- void paint(QPainter* painter, const QRectF &childRect,
- Qt::Alignment alignment,
- const QPainterPath &clipPath = QPainterPath())
- {
+
+ void paint(QPainter *painter, const QRectF &childRect,
+ Qt::Alignment alignment,
+ const QPainterPath &clipPath = QPainterPath()) {
icon->paint(painter, childRect, alignment, clipPath, this);
maskApplied = false;
}
-
- HbIconImpl * iconImpl()
- {
+
+ HbIconImpl *iconImpl() {
return icon;
}
-
- bool maskChanged()
- {
+
+ bool maskChanged() {
return maskApplied;
}
-
- void setPixmap(QPixmap pixmap)
- {
- maskBitmap = pixmap;
+
+ void setPixmap(QPixmap pixmap) {
+ maskBitmap = pixmap;
}
-
- QSize defaultSize() const
- {
+
+ QSize defaultSize() const {
return icon->defaultSize();
}
-
- void setMask(const QBitmap& mask)
- {
- if(!mask.isNull()) {
+
+ void setMask(const QBitmap &mask) {
+ if (!mask.isNull()) {
maskBitmap = mask;
maskApplied = true;
- }
+ }
}
-
- QBitmap mask()
- {
+
+ QBitmap mask() {
return maskBitmap;
}
-
- QSize size()
- {
+
+ QSize size() {
return icon->size();
}
-
- void setColor(const QColor &color)
- {
- icon->setColor(color);
+
+ void setColor(const QColor &color) {
+ icon->setColor(color);
}
-
- QColor color()
- {
+
+ QColor color() {
return icon->color();
}
-
- HbSharedIconInfo iconData() const
- {
+
+ HbSharedIconInfo iconData() const {
return icon->iconData();
}
-
- QString iconFileName() const
- {
+
+ QString iconFileName() const {
return icon->iconFileName();
}
-
- QSizeF keySize() const
- {
+
+ QSizeF keySize() const {
return icon->keySize();
}
-
- Qt::AspectRatioMode iconAspectRatioMode() const
- {
+
+ Qt::AspectRatioMode iconAspectRatioMode() const {
return icon->iconAspectRatioMode();
}
-
- QIcon::Mode iconMode() const
- {
+
+ QIcon::Mode iconMode() const {
return icon->iconMode();
}
-
- bool isMirrored() const
- {
+
+ bool isMirrored() const {
return icon->isMirrored();
}
-
- bool isCreatedOnServer() const
- {
+
+ bool isCreatedOnServer() const {
return icon->isCreatedOnServer();
}
-
- void incrementRefCount()
- {
+
+ void incrementRefCount() {
icon->incrementRefCount();
}
-
- uint refCount()
- {
+
+ uint refCount() {
return icon->refCount();
}
-
- void decrementRefCount()
- {
+
+ void decrementRefCount() {
icon->decrementRefCount();
}
-
- void dispose()
- {
+
+ void dispose() {
icon->destroyMaskedData(data);
icon->dispose();
delete this;
}
-
- void setImplData(HbIconMaskedData *data)
- {
+
+ void setImplData(HbIconMaskedData *data) {
this->data = data;
}
-
- HbIconMaskedData * implData() const
- {
+
+ HbIconMaskedData *implData() const {
return data;
}
-
+
private:
- ~HbMaskableIconImpl()
- {
+ ~HbMaskableIconImpl() {
}
HbIconImpl *icon;
--- a/src/hbcore/image/hbnvgiconimpl_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbnvgiconimpl_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -47,30 +47,30 @@
#define EGL_DESTROY_CONTEXT(display, context) \
if (context != EGL_NO_CONTEXT) { eglDestroyContext(display, context); }
-
+
// Constants
static const int HB_BITS_PER_COLOR = 8;
HbNvgIconImpl::HbNvgIconImpl(const HbSharedIconInfo &iconData,
- const QString& name,
- const QSizeF& keySize,
+ const QString &name,
+ const QSizeF &keySize,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
HbRenderingMode renderMode):
- HbIconImpl(iconData,
- name,
- keySize,
- aspectRatioMode,
- mode,
- mirrored,
- renderMode),
- readyToRender(false),
- specialCaseApplied(false),
- nvgEngine(NULL),
- eglStates(HbEglStates::global()),
- vgImageRenderer(0),
- pixmapIconRenderer(0)
+ HbIconImpl(iconData,
+ name,
+ keySize,
+ aspectRatioMode,
+ mode,
+ mirrored,
+ renderMode),
+ readyToRender(false),
+ specialCaseApplied(false),
+ nvgEngine(0),
+ eglStates(HbEglStates::global()),
+ vgImageRenderer(0),
+ pixmapIconRenderer(0)
{
eglStates->ref();
retrieveNvgData();
@@ -97,7 +97,7 @@
int width,
int height,
bool useGivenContext,
- HbNvgEngine * nvgEngine)
+ HbNvgEngine *nvgEngine)
{
EGLConfig config;
@@ -259,7 +259,7 @@
}
if (currentReadSurface == EGL_NO_SURFACE) {
- //pixmap is called without EGL being initialized
+ //pixmap is called without EGL being initialized
const EGLint attribList2[] = {
EGL_WIDTH, width,
@@ -280,20 +280,20 @@
EGLContext newContext = EGL_NO_CONTEXT;
if (eglContext == EGL_NO_CONTEXT) {
newContext = eglCreateContext(display, config, EGL_NO_CONTEXT, 0);
- if (newContext == EGL_NO_CONTEXT) {
+ if (newContext == EGL_NO_CONTEXT) {
EGL_DESTROY_SURFACE(display, dummySurface);
return currentPixmap;
}
}
-
+
if (dummySurface) {
if (eglMakeCurrent(display, dummySurface, dummySurface,
newContext) == EGL_FALSE) {
- EGL_DESTROY_SURFACE(display, dummySurface);
+ EGL_DESTROY_SURFACE(display, dummySurface);
EGL_DESTROY_CONTEXT(display, newContext);
return currentPixmap;
}
-
+
surfaceImage = createVGImageFromNVG(display,
dummySurface,
dummySurface,
@@ -314,7 +314,7 @@
}
if (surfaceImage == VG_INVALID_HANDLE) {
- EGL_DESTROY_SURFACE(display, dummySurface);
+ EGL_DESTROY_SURFACE(display, dummySurface);
EGL_DESTROY_CONTEXT(display, newContext);
return currentPixmap;
}
@@ -326,13 +326,13 @@
VG_sARGB_8888_PRE, 0, 0, width, height);
eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
} else {
- eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
- prevEGLState.restore();
+ eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+ prevEGLState.restore();
image = QImage(width, height, QImage::Format_ARGB32_Premultiplied);
vgGetImageSubData(surfaceImage, image.bits(), image.bytesPerLine(),
VG_sARGB_8888_PRE, 0, 0, width, height);
- }
-
+ }
+
vgDestroyImage(surfaceImage);
EGL_DESTROY_SURFACE(display, dummySurface);
@@ -342,7 +342,7 @@
return currentPixmap;
}
-HbNvgEngine::HbNvgErrorType HbNvgIconImpl::drawNVGIcon(const QSize & size, HbNvgEngine & nvgEngine)
+HbNvgEngine::HbNvgErrorType HbNvgIconImpl::drawNVGIcon(const QSize &size, HbNvgEngine &nvgEngine)
{
VGint mMatrixMode;
@@ -422,7 +422,7 @@
void HbNvgIconImpl::retrieveNvgData()
{
GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
- nvgData = QByteArray::fromRawData((char*)manager->base() + sharedIconData.nvgData.offset,
+ nvgData = QByteArray::fromRawData((char *)manager->base() + sharedIconData.nvgData.offset,
sharedIconData.nvgData.dataSize);
defaultIconSize =
QSize(sharedIconData.nvgData.defaultWidth, sharedIconData.nvgData.defaultHeight);
@@ -430,9 +430,9 @@
}
-VGImage HbNvgIconImpl::getVgImage(HbIconImpl * impl, QPainter * painter)
+VGImage HbNvgIconImpl::getVgImage(HbIconImpl *impl, QPainter *painter)
{
- HbNvgIconImpl * nvgImpl = (HbNvgIconImpl*)impl;
+ HbNvgIconImpl *nvgImpl = (HbNvgIconImpl *)impl;
painter->beginNativePainting();
@@ -449,14 +449,14 @@
return vgimage;
}
-void HbNvgIconImpl::paint(QPainter* painter,
- const QRectF& rect,
+void HbNvgIconImpl::paint(QPainter *painter,
+ const QRectF &rect,
Qt::Alignment alignment,
const QPainterPath &clipPath,
- HbMaskableIconImpl * maskIconData)
+ HbMaskableIconImpl *maskIconData)
{
#ifdef HB_ICON_CACHE_DEBUG
- qDebug() << "HbNvgIconImpl::paint()-->"<<this->fileName;
+ qDebug() << "HbNvgIconImpl::paint()-->" << this->fileName;
#endif
QSizeF renderSize = contentSize;
@@ -472,7 +472,8 @@
maskApplied = true;
}
- if ((painter->paintEngine()->type() != QPaintEngine::OpenVG) || maskApplied) {
+ QPaintEngine *paintEngine = painter->paintEngine();
+ if (!paintEngine || paintEngine->type() != QPaintEngine::OpenVG || maskApplied) {
painter->beginNativePainting();
pixmap();
@@ -494,18 +495,18 @@
return;
}
}
-
+
vgSeti(VG_RENDERING_QUALITY, VG_RENDERING_QUALITY_FASTER);
drawNVGIcon(painter, topLeft, renderSize, settings);
}
-void HbNvgIconImpl::drawNVGIcon(QPainter * painter,
- const QPointF & topLeft,
- const QSizeF & renderSize,
+void HbNvgIconImpl::drawNVGIcon(QPainter *painter,
+ const QPointF &topLeft,
+ const QSizeF &renderSize,
NvgAspectRatioSettings settings)
{
nvgEngine->engine()->setPreserveAspectRatio(settings.nvgAlignStatusAndAspectRatio,
- settings.type);
+ settings.type);
nvgEngine->engine()->enableMirroring(mirrored);
painter->beginNativePainting();
@@ -581,9 +582,9 @@
painter->endNativePainting();
}
-bool HbNvgIconImpl::drawRasterizedIcon(QPainter * painter,
- const QPointF & topLeft,
- const QSizeF & renderSize,
+bool HbNvgIconImpl::drawRasterizedIcon(QPainter *painter,
+ const QPointF &topLeft,
+ const QSizeF &renderSize,
const QPainterPath &clipPath)
{
bool ret = false;
@@ -622,8 +623,8 @@
return ret;
}
-QPointF HbNvgIconImpl::setAlignment(const QRectF& rect,
- QSizeF& renderSize,
+QPointF HbNvgIconImpl::setAlignment(const QRectF &rect,
+ QSizeF &renderSize,
Qt::Alignment alignment)
{
QPointF topLeft = rect.topLeft();
--- a/src/hbcore/image/hbnvgiconimpl_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbnvgiconimpl_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -35,8 +35,7 @@
class HbVgImageIconRenderer;
class HbPixmapIconRenderer;
-struct NvgAspectRatioSettings
-{
+struct NvgAspectRatioSettings {
HbNvgEngine::HbNvgAlignType nvgAlignStatusAndAspectRatio;
HbNvgEngine::HbNvgMeetType type;
};
@@ -45,8 +44,8 @@
{
public :
HbNvgIconImpl(const HbSharedIconInfo &iconData,
- const QString& name,
- const QSizeF& keySize,
+ const QString &name,
+ const QSizeF &keySize,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
@@ -54,11 +53,11 @@
~HbNvgIconImpl();
QPixmap pixmap();
- void paint(QPainter* painter,
+ void paint(QPainter *painter,
const QRectF &rect,
Qt::Alignment alignment,
const QPainterPath &clipPath = QPainterPath(),
- HbMaskableIconImpl * maskIconData = 0);
+ HbMaskableIconImpl *maskIconData = 0);
QSize defaultSize() const;
@@ -68,18 +67,18 @@
private :
void retrieveNvgData();
- QPointF setAlignment(const QRectF& rect,
- QSizeF& renderSize,
+ QPointF setAlignment(const QRectF &rect,
+ QSizeF &renderSize,
Qt::Alignment alignment);
NvgAspectRatioSettings mapKeyAspectRatioToNvgAspectRatio(Qt::AspectRatioMode aspectRatio);
- HbNvgEngine::HbNvgErrorType drawNVGIcon(const QSize & size, HbNvgEngine &engine);
+ HbNvgEngine::HbNvgErrorType drawNVGIcon(const QSize &size, HbNvgEngine &engine);
int createContextAndSurface(EGLDisplay display,
int width,
int height,
- EGLContext & newContext,
- EGLSurface & newSurface,
- EGLConfig & config);
+ EGLContext &newContext,
+ EGLSurface &newSurface,
+ EGLConfig &config);
VGImage createVGImageFromNVG(EGLDisplay display,
EGLSurface currentReadSurface,
@@ -88,19 +87,19 @@
int width,
int height,
bool useGivenContext = true,
- HbNvgEngine * nvgEngine = 0);
+ HbNvgEngine *nvgEngine = 0);
- bool drawRasterizedIcon(QPainter * painter,
- const QPointF & topLeft,
- const QSizeF & renderSize,
+ bool drawRasterizedIcon(QPainter *painter,
+ const QPointF &topLeft,
+ const QSizeF &renderSize,
const QPainterPath &clipPath);
- void drawNVGIcon(QPainter * painter,
- const QPointF & topLeft,
- const QSizeF & renderSize,
+ void drawNVGIcon(QPainter *painter,
+ const QPointF &topLeft,
+ const QSizeF &renderSize,
NvgAspectRatioSettings settings);
- static VGImage getVgImage(HbIconImpl * impl, QPainter * painter);
+ static VGImage getVgImage(HbIconImpl *impl, QPainter *painter);
private:
QByteArray nvgData;
@@ -111,7 +110,7 @@
HbPooledNVGEngine *nvgEngine;
HbEglStates *eglStates;
HbVgImageIconRenderer *vgImageRenderer;
- HbPixmapIconRenderer * pixmapIconRenderer;
+ HbPixmapIconRenderer *pixmapIconRenderer;
};
#endif // end of HBNVGICONIMPL_P_H
--- a/src/hbcore/image/hbpixmapiconimpl_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbpixmapiconimpl_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -35,33 +35,32 @@
#include "hbmaskableiconimpl_p.h"
#include "hbpixmapiconrenderer_p.h"
-struct HbPixmapMaskedIcon
-{
+struct HbPixmapMaskedIcon {
QPixmap currentPixmap;
};
-HbPixmapIconImpl::HbPixmapIconImpl(HbSharedIconInfo iconData, QString& name,
- const QSizeF& keySize,
+HbPixmapIconImpl::HbPixmapIconImpl(HbSharedIconInfo iconData, QString &name,
+ const QSizeF &keySize,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
HbRenderingMode renderMode):
- HbIconImpl(iconData,
- name,
- keySize,
- aspectRatioMode,
- mode,
- mirrored,
- renderMode),
- pixmapIconRenderer(0)
+ HbIconImpl(iconData,
+ name,
+ keySize,
+ aspectRatioMode,
+ mode,
+ mirrored,
+ renderMode),
+ pixmapIconRenderer(0)
{
retrievePixmapData();
pixmapIconRenderer = new HbPixmapIconRenderer(pixmapData, this);
}
-HbPixmapIconImpl::HbPixmapIconImpl(const QPixmap& pixmap, const QString& name):
- pixmapData(pixmap),
- pixmapIconRenderer(0)
+HbPixmapIconImpl::HbPixmapIconImpl(const QPixmap &pixmap, const QString &name):
+ pixmapData(pixmap),
+ pixmapIconRenderer(0)
{
pixmapIconRenderer = new HbPixmapIconRenderer(pixmapData, this);
aspectRatioMode = Qt::KeepAspectRatio;
@@ -95,7 +94,7 @@
void HbPixmapIconImpl::retrievePixmapData()
{
GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
- QImage image((const uchar*)
+ QImage image((const uchar *)
((char *)manager->base() + sharedIconData.pixmapData.offset),
sharedIconData.pixmapData.width, sharedIconData.pixmapData.height,
sharedIconData.pixmapData.format);
@@ -106,14 +105,14 @@
}
-void HbPixmapIconImpl::paint(QPainter* painter,
+void HbPixmapIconImpl::paint(QPainter *painter,
const QRectF &rect,
Qt::Alignment alignment,
const QPainterPath &clipPath,
- HbMaskableIconImpl * maskIconData)
+ HbMaskableIconImpl *maskIconData)
{
#ifdef HB_ICON_CACHE_DEBUG
- qDebug() << "HbPixmapIconImpl::paint()-->"<<this->fileName;
+ qDebug() << "HbPixmapIconImpl::paint()-->" << this->fileName;
#endif
QPointF topLeft = rect.topLeft();
QSizeF pixmapSize = pixmapData.size();
--- a/src/hbcore/image/hbpixmapiconimpl_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbpixmapiconimpl_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -34,21 +34,21 @@
class HB_AUTOTEST_EXPORT HbPixmapIconImpl : public HbIconImpl
{
public :
- HbPixmapIconImpl(HbSharedIconInfo iconData, QString& name,
- const QSizeF& keySize,
+ HbPixmapIconImpl(HbSharedIconInfo iconData, QString &name,
+ const QSizeF &keySize,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
HbRenderingMode renderMode);
- HbPixmapIconImpl(const QPixmap& pixmap, const QString& name = QString());
+ explicit HbPixmapIconImpl(const QPixmap &pixmap, const QString &name = QString());
~HbPixmapIconImpl();
QPixmap pixmap();
- void paint(QPainter* painter,
+ void paint(QPainter *painter,
const QRectF &rect,
Qt::Alignment alignment,
const QPainterPath &clipPath = QPainterPath(),
- HbMaskableIconImpl * maskIconData = 0);
+ HbMaskableIconImpl *maskIconData = 0);
QSize defaultSize() const;
QSize size();
void destroyMaskedData(HbIconMaskedData *data);
--- a/src/hbcore/image/hbpixmapiconrenderer.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbpixmapiconrenderer.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -29,16 +29,15 @@
#include <QStyleOption>
#include <QApplication>
-struct HbPixmapIconMaskedData
-{
+struct HbPixmapIconMaskedData {
QPixmap currentPixmap;
};
HbPixmapIconRenderer::HbPixmapIconRenderer(const QPixmap &pixmap, HbIconImpl *impl)
- : iconMode(QIcon::Normal),
- iconPropertiesApplied(false),
- pixmapData(pixmap),
- iconImpl(impl)
+ : iconMode(QIcon::Normal),
+ iconPropertiesApplied(false),
+ pixmapData(pixmap),
+ iconImpl(impl)
{
}
@@ -46,10 +45,10 @@
{
}
-void HbPixmapIconRenderer::draw(QPainter* painter,
+void HbPixmapIconRenderer::draw(QPainter *painter,
const QPointF &topLeft,
const QPainterPath &clipPath,
- HbMaskableIconImpl * maskIconData)
+ HbMaskableIconImpl *maskIconData)
{
if (!iconPropertiesApplied) {
applyIconProperties();
@@ -67,37 +66,33 @@
doDraw(painter, topLeft, pixmapToDraw, clipPath);
}
-void HbPixmapIconRenderer::doDraw(QPainter * painter,
- const QPointF & topLeft,
- const QPixmap & finalPixmap,
- const QPainterPath & clipPath)
+void HbPixmapIconRenderer::doDraw(QPainter *painter,
+ const QPointF &topLeft,
+ const QPixmap &finalPixmap,
+ const QPainterPath &clipPath)
{
if (!clipPath.isEmpty()) {
QPainterPath oldPath;
- bool clipped = painter->hasClipping();
-
- if (!clipped) {
+ bool wasClipped = painter->hasClipping();
+
+ if (!wasClipped) {
painter->setClipping(true);
}
-
+
QRectF cliprect = clipPath.boundingRect();
QPainterPath intersect(clipPath);
- if (clipped) {
- oldPath = painter->clipPath();
+ oldPath = painter->clipPath();
+ if (wasClipped) {
QRectF oldrect = oldPath.boundingRect();
intersect = oldPath.intersected(clipPath);
QRectF interrect = intersect.boundingRect();
}
-
- painter->setClipPath(intersect, Qt::ReplaceClip);
+
+ painter->setClipPath(intersect, Qt::ReplaceClip);
painter->drawPixmap(topLeft, finalPixmap);
-
- if (!clipped) {
- painter->setClipPath(oldPath, Qt::NoClip);
- } else {
- painter->setClipPath(oldPath);
- }
- painter->setClipping(clipped);
+
+ painter->setClipPath(oldPath);
+ painter->setClipping(wasClipped);
} else {
painter->drawPixmap(topLeft, finalPixmap);
}
@@ -122,11 +117,11 @@
iconPropertiesApplied = true;
}
-QPixmap HbPixmapIconRenderer::getMaskedPixmap(HbMaskableIconImpl * maskIconData)
+QPixmap HbPixmapIconRenderer::getMaskedPixmap(HbMaskableIconImpl *maskIconData)
{
QPixmap maskedPixmap;
- HbPixmapIconMaskedData * mi = (HbPixmapIconMaskedData *)maskIconData->implData();
+ HbPixmapIconMaskedData *mi = (HbPixmapIconMaskedData *)maskIconData->implData();
if (maskIconData->maskChanged()) {
if (!mi) {
mi = new HbPixmapIconMaskedData();
@@ -146,6 +141,6 @@
void HbPixmapIconRenderer::destroyMaskedData(HbIconMaskedData *data)
{
- delete((HbPixmapIconMaskedData*)data);
+ delete((HbPixmapIconMaskedData *)data);
}
--- a/src/hbcore/image/hbpixmapiconrenderer_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbpixmapiconrenderer_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -23,8 +23,8 @@
**
****************************************************************************/
-#ifndef HBPIXMAPICONRENDERER_P_H_
-#define HBPIXMAPICONRENDERER_P_H_
+#ifndef HBPIXMAPICONRENDERER_P_H
+#define HBPIXMAPICONRENDERER_P_H
#include <hbglobal.h>
#include <QIcon>
@@ -36,35 +36,31 @@
class HB_CORE_PRIVATE_EXPORT HbPixmapIconRenderer
{
public:
-
- HbPixmapIconRenderer(const QPixmap & pixmap, HbIconImpl *impl);
-
+
+ HbPixmapIconRenderer(const QPixmap &pixmap, HbIconImpl *impl);
+
~HbPixmapIconRenderer();
-
- void setColor(const QColor & color)
- {
+
+ void setColor(const QColor &color) {
this->iconColor = color;
}
-
- void setMode(QIcon::Mode mode)
- {
+
+ void setMode(QIcon::Mode mode) {
this->iconMode = mode;
}
-
- QColor color()
- {
+
+ QColor color() {
return iconColor;
}
-
- QIcon::Mode mode()
- {
+
+ QIcon::Mode mode() {
return iconMode;
}
- void draw(QPainter* painter,
+ void draw(QPainter *painter,
const QPointF &topLeft,
const QPainterPath &clipPath,
- HbMaskableIconImpl * maskIconData);
+ HbMaskableIconImpl *maskIconData);
void destroyMaskedData(HbIconMaskedData *data);
@@ -72,19 +68,18 @@
void applyIconProperties();
- QPixmap getMaskedPixmap(HbMaskableIconImpl * maskIconData);
+ QPixmap getMaskedPixmap(HbMaskableIconImpl *maskIconData);
- void doDraw(QPainter * painter,
- const QPointF & topLeft,
- const QPixmap & finalPixmap,
- const QPainterPath & clipPath);
+ void doDraw(QPainter *painter,
+ const QPointF &topLeft,
+ const QPixmap &finalPixmap,
+ const QPainterPath &clipPath);
QColor iconColor;
QIcon::Mode iconMode;
bool iconPropertiesApplied;
QPixmap pixmapData;
- HbIconImpl * iconImpl;
+ HbIconImpl *iconImpl;
};
#endif
-
--- a/src/hbcore/image/hbsgimageiconimpl_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbsgimageiconimpl_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -39,7 +39,7 @@
#include "hbpixmapiconrenderer_p.h"
typedef EGLImageKHR(*pfnEglCreateImageKHR)(EGLDisplay, EGLContext,
- EGLenum, EGLClientBuffer, EGLint*);
+ EGLenum, EGLClientBuffer, EGLint *);
typedef EGLBoolean(*pfnEglDestroyImageKHR)(EGLDisplay, EGLImageKHR);
typedef VGImage(*pfnVgCreateEGLImageTargetKHR)(VGeglImageKHR);
@@ -53,21 +53,21 @@
if (context != EGL_NO_CONTEXT) { eglDestroyContext(display, context); }
HbSgimageIconImpl::HbSgimageIconImpl(const HbSharedIconInfo &iconData,
- const QString& name,
- const QSizeF& keySize,
+ const QString &name,
+ const QSizeF &keySize,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
HbRenderingMode renderMode):
- HbIconImpl(iconData,
- name,
- keySize,
- aspectRatioMode,
- mode,
- mirrored,
- renderMode),
- vgImageRenderer(0),
- pixmapIconRenderer(0)
+ HbIconImpl(iconData,
+ name,
+ keySize,
+ aspectRatioMode,
+ mode,
+ mirrored,
+ renderMode),
+ vgImageRenderer(0),
+ pixmapIconRenderer(0)
{
retrieveSgImageData();
}
@@ -103,15 +103,15 @@
EGLContext eglContext = eglContextPrev;
EGLSurface eglSurface = eglSurfacePrevDraw;
-
+
EGLContext eglNewContext = EGL_NO_CONTEXT;
EGLContext eglNewSurface = EGL_NO_SURFACE;
-
+
if (eglContext == EGL_NO_CONTEXT) {
EGLConfig config;
-
+
EGLint numConfigs;
-
+
const EGLint attribList[] = {
EGL_RENDERABLE_TYPE, EGL_OPENVG_BIT,
EGL_SURFACE_TYPE, EGL_PBUFFER_BIT | EGL_VG_ALPHA_FORMAT_PRE_BIT,
@@ -121,13 +121,13 @@
EGL_ALPHA_SIZE, HB_BITS_PER_COLOR,
EGL_NONE
};
-
+
if (eglChooseConfig(display, attribList, &config, 1, &numConfigs) == EGL_FALSE) {
return currentPixmap;
}
-
+
if (eglSurface == EGL_NO_SURFACE) {
- //pixmap is called without EGL being initialized
+ //pixmap is called without EGL being initialized
const EGLint attribList2[] = {
EGL_WIDTH, contentSize.width(),
@@ -141,22 +141,22 @@
}
}
eglNewContext = eglContext = eglCreateContext(display, config, EGL_NO_CONTEXT, 0);
- if (eglContext == EGL_NO_CONTEXT) {
+ if (eglContext == EGL_NO_CONTEXT) {
EGL_DESTROY_SURFACE(display, eglNewSurface);
return currentPixmap;
}
if (eglMakeCurrent(display, eglSurface, eglSurface,
- eglContext) == EGL_FALSE) {
- EGL_DESTROY_SURFACE(display, eglNewSurface);
+ eglContext) == EGL_FALSE) {
+ EGL_DESTROY_SURFACE(display, eglNewSurface);
EGL_DESTROY_CONTEXT(display, eglNewContext);
return currentPixmap;
}
}
-
-
+
+
VGImage localVgImage = getVgImageFromSgImage();
if (localVgImage == VG_INVALID_HANDLE) {
- EGL_DESTROY_SURFACE(display, eglNewSurface);
+ EGL_DESTROY_SURFACE(display, eglNewSurface);
EGL_DESTROY_CONTEXT(display, eglNewContext);
if (eglContextPrev) {
eglMakeCurrent(display, eglSurfacePrevDraw, eglSurfacePrevRead, eglContextPrev);
@@ -183,10 +183,10 @@
if (eglNewContext != EGL_NO_CONTEXT || eglNewSurface != EGL_NO_SURFACE) {
eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
- EGL_DESTROY_SURFACE(display, eglNewSurface);
+ EGL_DESTROY_SURFACE(display, eglNewSurface);
EGL_DESTROY_CONTEXT(display, eglNewContext);
}
-
+
if (eglContextPrev) {
eglMakeCurrent(display, eglSurfacePrevDraw, eglSurfacePrevRead, eglContextPrev);
}
@@ -206,16 +206,16 @@
contentSize = QSize(sharedIconData.sgImageData.width, sharedIconData.sgImageData.height);
}
-VGImage HbSgimageIconImpl::getVgImage(HbIconImpl * impl, QPainter *)
+VGImage HbSgimageIconImpl::getVgImage(HbIconImpl *impl, QPainter *)
{
return ((HbSgimageIconImpl *)impl)->getVgImageFromSgImage();
}
-void HbSgimageIconImpl::paint(QPainter* painter,
- const QRectF& rect,
+void HbSgimageIconImpl::paint(QPainter *painter,
+ const QRectF &rect,
Qt::Alignment alignment,
const QPainterPath &clipPath,
- HbMaskableIconImpl * maskIconData)
+ HbMaskableIconImpl *maskIconData)
{
#ifdef HB_ICON_CACHE_DEBUG
qDebug() << "HbSgimageIconImpl::paint()-->" << this->fileName;
@@ -230,19 +230,20 @@
maskApplied = true;
}
- if ((painter->paintEngine()->type() != QPaintEngine::OpenVG) ||
- maskApplied || pixmapIconRenderer) {
+ QPaintEngine *paintEngine = painter->paintEngine();
+ if (!paintEngine || paintEngine->type() != QPaintEngine::OpenVG
+ || maskApplied || pixmapIconRenderer) {
// going to pixmap, vgimage may not be required any more
if (vgImageRenderer) {
delete vgImageRenderer;
vgImageRenderer = 0;
}
-
+
if (!pixmapIconRenderer) {
painter->beginNativePainting();
pixmap();
painter->endNativePainting();
-
+
pixmapIconRenderer = new HbPixmapIconRenderer(currentPixmap, this);
pixmapIconRenderer->setColor(iconColor);
pixmapIconRenderer->setMode(mode);
@@ -270,8 +271,8 @@
}
}
-QPointF HbSgimageIconImpl::setAlignment(const QRectF& rect,
- QSizeF& renderSize,
+QPointF HbSgimageIconImpl::setAlignment(const QRectF &rect,
+ QSizeF &renderSize,
Qt::Alignment alignment)
{
QPointF topLeft = rect.topLeft();
@@ -306,8 +307,8 @@
#endif
}
-
-
+
+
EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
// Retrieve the extensions
--- a/src/hbcore/image/hbsgimageiconimpl_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbsgimageiconimpl_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -40,8 +40,8 @@
{
public :
HbSgimageIconImpl(const HbSharedIconInfo &iconData,
- const QString& name,
- const QSizeF& keySize,
+ const QString &name,
+ const QSizeF &keySize,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
@@ -49,11 +49,11 @@
~HbSgimageIconImpl();
QPixmap pixmap();
- void paint(QPainter* painter,
+ void paint(QPainter *painter,
const QRectF &rect,
Qt::Alignment alignment,
const QPainterPath &clipPath = QPainterPath(),
- HbMaskableIconImpl * maskIconData = 0);
+ HbMaskableIconImpl *maskIconData = 0);
QSize defaultSize() const;
QSize size();
@@ -62,19 +62,19 @@
private :
void retrieveSgImageData();
VGImage getVgImageFromSgImage();
- QPointF setAlignment(const QRectF& rect,
- QSizeF& renderSize,
+ QPointF setAlignment(const QRectF &rect,
+ QSizeF &renderSize,
Qt::Alignment alignment);
- void updatePainterTransformation(QPainter * painter, const QPointF & pos);
- static VGImage getVgImage(HbIconImpl * impl, QPainter * painter);
+ void updatePainterTransformation(QPainter *painter, const QPointF &pos);
+ static VGImage getVgImage(HbIconImpl *impl, QPainter *painter);
private:
TSgDrawableId sgImageId;
QPixmap currentPixmap;
QSize contentSize;
- HbVgImageIconRenderer * vgImageRenderer;
- HbPixmapIconRenderer * pixmapIconRenderer;
+ HbVgImageIconRenderer *vgImageRenderer;
+ HbPixmapIconRenderer *pixmapIconRenderer;
};
#endif // HBSGIMAGEICONIMPL_P_H
--- a/src/hbcore/image/hbvgimageiconrenderer.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbvgimageiconrenderer.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -29,15 +29,15 @@
#include <QtCore/qvarlengtharray.h>
-HbVgImageIconRenderer::HbVgImageIconRenderer(VGImage img, const QSize & size, HbIconImpl * impl)
- : vgImage(img),
- iconMode(QIcon::Normal),
- specialCaseApplied(false),
- rendersize(size),
- addedToStates(false),
- opacityPaint(VG_INVALID_HANDLE),
- lastOpacity(1.0),
- iconImpl(impl)
+HbVgImageIconRenderer::HbVgImageIconRenderer(VGImage img, const QSize &size, HbIconImpl *impl)
+ : vgImage(img),
+ iconMode(QIcon::Normal),
+ specialCaseApplied(false),
+ rendersize(size),
+ addedToStates(false),
+ opacityPaint(VG_INVALID_HANDLE),
+ lastOpacity(1.0),
+ iconImpl(impl)
{
eglStates = HbEglStates::global();
eglStates->ref();
@@ -91,7 +91,7 @@
}
}
-bool HbVgImageIconRenderer::draw(QPainter * painter, const QPointF & topLeft, const QPainterPath & clipPath)
+bool HbVgImageIconRenderer::draw(QPainter *painter, const QPointF &topLeft, const QPainterPath &clipPath)
{
if ((iconColor.isValid()) || (iconMode != QIcon::Normal)) {
applyIconProperties();
@@ -107,36 +107,36 @@
addedToStates = true;
}
- if (vgImage != VG_INVALID_HANDLE) {
+ if (vgImage != VG_INVALID_HANDLE) {
QPainterPath oldPath;
- bool clipped = painter->hasClipping();
-
+ bool wasClipped = painter->hasClipping();
+
if (!clipPath.isEmpty()) {
- if (!clipped) {
+ if (!wasClipped) {
painter->setClipping(true);
}
-
+
QPainterPath intersect(clipPath);
- if (clipped) {
- oldPath = painter->clipPath();
+ oldPath = painter->clipPath();
+ if (wasClipped) {
intersect = oldPath.intersected(clipPath);
if (intersect.isEmpty()) {
return true;
}
}
-
+
painter->setClipPath(intersect, Qt::ReplaceClip);
painter->beginNativePainting();
}
-
+
VGint imageMode = vgGeti(VG_IMAGE_MODE);
VGint matrixMode = vgGeti(VG_MATRIX_MODE);
VGPaint oldFillPaint = VG_INVALID_HANDLE;
VGPaint oldStrkPaint = VG_INVALID_HANDLE;
VGint blendMode = 0;
-
+
updatePainterTransformation(painter, topLeft);
-
+
qreal opacity = painter->opacity();
if (opacity != lastOpacity || iconMode == QIcon::Selected) {
@@ -193,12 +193,8 @@
if (!clipPath.isEmpty()) {
painter->endNativePainting();
- if (!clipped) {
- painter->setClipPath(oldPath, Qt::NoClip);
- } else {
- painter->setClipPath(oldPath);
- }
- painter->setClipping(clipped);
+ painter->setClipPath(oldPath);
+ painter->setClipping(wasClipped);
}
return true;
}
@@ -207,7 +203,7 @@
}
-void HbVgImageIconRenderer::updatePainterTransformation(QPainter * painter, const QPointF & pos)
+void HbVgImageIconRenderer::updatePainterTransformation(QPainter *painter, const QPointF &pos)
{
VGfloat devh = painter->device()->height() - 1;
QTransform viewport(1.0f, 0.0f, 0.0f,
--- a/src/hbcore/image/hbvgimageiconrenderer_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/image/hbvgimageiconrenderer_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -23,8 +23,8 @@
**
****************************************************************************/
-#ifndef HBVGIMAGEICONRENDERER_P_H_
-#define HBVGIMAGEICONRENDERER_P_H_
+#ifndef HBVGIMAGEICONRENDERER_P_H
+#define HBVGIMAGEICONRENDERER_P_H
#include <hbglobal.h>
#include <VG/openvg.h>
@@ -40,55 +40,49 @@
{
public:
- typedef VGImage(*VgImageCreator)(HbIconImpl * impl, QPainter * painter);
+ typedef VGImage(*VgImageCreator)(HbIconImpl *impl, QPainter *painter);
- HbVgImageIconRenderer(VGImage img, const QSize & size, HbIconImpl *impl);
+ HbVgImageIconRenderer(VGImage img, const QSize &size, HbIconImpl *impl);
~HbVgImageIconRenderer();
-
- void setColor(const QColor & color)
- {
+
+ void setColor(const QColor &color) {
this->iconColor = color;
}
-
- void setMode(QIcon::Mode mode)
- {
+
+ void setMode(QIcon::Mode mode) {
this->iconMode = mode;
}
-
- QColor color()
- {
+
+ QColor color() {
return iconColor;
}
-
- QIcon::Mode mode()
- {
+
+ QIcon::Mode mode() {
return iconMode;
}
-
- void setVgImageCreator(VgImageCreator vgCreator)
- {
+
+ void setVgImageCreator(VgImageCreator vgCreator) {
vgImageCreator = vgCreator;
}
-
- bool draw(QPainter * painter, const QPointF & topLeft, const QPainterPath & clipPath);
+
+ bool draw(QPainter *painter, const QPointF &topLeft, const QPainterPath &clipPath);
private:
void applyIconProperties();
- void updatePainterTransformation(QPainter * painter, const QPointF & pos);
+ void updatePainterTransformation(QPainter *painter, const QPointF &pos);
VGImage vgImage;
QColor iconColor;
QIcon::Mode iconMode;
bool specialCaseApplied;
QSize rendersize;
- HbEglStates * eglStates;
+ HbEglStates *eglStates;
bool addedToStates;
VGPaint opacityPaint;
qreal lastOpacity;
- HbIconImpl * iconImpl;
+ HbIconImpl *iconImpl;
VgImageCreator vgImageCreator;
};
#endif
-
--- a/src/hbcore/indicatorplugins/hbindicatorinterface.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/indicatorplugins/hbindicatorinterface.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -268,6 +268,21 @@
}
/*!
+ Called by the framework, when the indicator menu is about to show.
+ Indicators data can be refreshed here.
+
+ Should return true, if the indicator data is refreshed, false otherwise.
+ If true is returned then the indicator menu calls indicatorData to get refreshed data.
+ Default implementation returns false.
+
+ \sa HbIndicatorInterface::indicatorData(int role)
+*/
+bool HbIndicatorInterface::refreshData()
+{
+ return false;
+}
+
+/*!
Constructs an indicator.
\a indicatorType contains the type of the indicator,
--- a/src/hbcore/indicatorplugins/hbindicatorinterface.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/indicatorplugins/hbindicatorinterface.h Fri Jun 11 13:58:22 2010 +0300
@@ -68,6 +68,7 @@
void processClientRequest(RequestType type, const QVariant ¶meter);
virtual bool handleInteraction(InteractionType type);
virtual QVariant indicatorData(int role) const = 0;
+ virtual bool refreshData();
virtual ~HbIndicatorInterface();
signals:
void dataChanged();
--- a/src/hbcore/inputfw/hbinputcontextproxy.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/inputfw/hbinputcontextproxy.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -114,14 +114,17 @@
setInputFrameworkFocus(0);
return true;
} else if (event->type() == QEvent::RequestSoftwareInputPanel) {
- if(QWidget * focusedWidget = qApp->focusWidget()) {
+ if(QWidget * focusedWidget = qApp->focusWidget()) {
// see if the focused widget is graphics view, if so get the focused graphics item in the view
// and acivate inputmethod for the focused graphics item
- if(QGraphicsView * graphicsView = qobject_cast<QGraphicsView*>(focusedWidget)) {
- if(QGraphicsScene * scene = graphicsView->scene()) {
- if(QGraphicsItem * focusingWidget = scene->focusItem()) {
- if (focusingWidget->isWidget()) {
- setInputFrameworkFocus(static_cast<QGraphicsWidget*>(focusingWidget));
+ if (QGraphicsView * graphicsView = qobject_cast<QGraphicsView*>(focusedWidget)) {
+ if (QGraphicsScene * scene = graphicsView->scene()) {
+ if (QGraphicsItem * fItem = scene->focusItem()) {
+ QGraphicsProxyWidget *proxy = qgraphicsitem_cast<QGraphicsProxyWidget *>(fItem);
+ if (proxy) {
+ setInputFrameworkFocus(proxy->widget()->focusWidget());
+ } else {
+ setInputFrameworkFocus(static_cast<QGraphicsWidget*>(fItem));
}
}
}
--- a/src/hbcore/inputfw/hbinputdef.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/inputfw/hbinputdef.h Fri Jun 11 13:58:22 2010 +0300
@@ -67,17 +67,17 @@
{
HbKeyboardNone = 0x00000000,
- HbKeyboard12Key = 0x00000001, /**< Conventional phone keypad */
-
- HbKeyboardQwerty = 0x00000001 | HbQwertyKeyboardMask, /**< Qwerty keyboard */
-
- HbKeyboardVirtual12Key = 0x00000001 | HbTouchInputMask, /**< Touchscreen version of conventional phone keypad */
+ HbKeyboard12Key = 0x00000001, /**< Deprecated, use HbKeyboardHardwarePortrait instead. */
+ HbKeyboardHardwarePortrait = HbKeyboard12Key, /**< Hardware keyboard for portrait orientation. */
+ HbKeyboardQwerty = 0x00000001 | HbQwertyKeyboardMask, /**< Deprecated, use HbKeyboardHardwareLandcape instead */
+ HbKeyboardHardwareLandcape = HbKeyboardQwerty, /**< Hardware keyboard for landscape mode. */
+ HbKeyboardVirtual12Key = 0x00000001 | HbTouchInputMask, /**< Deprecated, use HbKeyboardTouchPortrait instead. */
+ HbKeyboardTouchPortrait = HbKeyboardVirtual12Key, /**< Touch keyboard for portrait mode. */
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 */
- HbKeyboardThaiStarSctPortrait = 0x00000006 | HbTouchInputMask, /**< Special character selection keypad for star key in Thai portrait view */
- HbKeyboardThaiHashSctPortrait = 0x00000007 | HbTouchInputMask /**< Special character selection keypad for hash key in Thai portrait view */
+ HbKeyboardHwr = 0x00000005 | HbTouchInputMask| HbHwrKeyboardMask /**< Hand writing recognition keypad */
};
Q_DECLARE_FLAGS(HbKeyboardType, HbKeyboardTypeFlag)
--- a/src/hbcore/inputfw/hbinputeditorinterface.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/inputfw/hbinputeditorinterface.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -34,6 +34,7 @@
#include "hbinputstandardfilters.h"
#include "hbinputvkbhost.h"
#include "hbabstractvkbhost.h"
+#include "hbinpututils.h"
/*!
@alpha
@@ -289,8 +290,11 @@
// Remove the action first if it's already in the list
int index = mPrivate->mActions.indexOf(action);
- if (index >= 0)
+ if (index >= 0) {
mPrivate->mActions.removeAt(index);
+ disconnect(action, SIGNAL(destroyed(QObject *)),
+ HbEditorInterfacePrivateCache::instance(), SLOT(actionDestroyed(QObject* object)));
+ }
int pos = mPrivate->mActions.indexOf(before);
if (pos < 0) {
@@ -298,6 +302,9 @@
}
mPrivate->mActions.insert(pos, action);
+ connect(action, SIGNAL(destroyed(QObject *)),
+ HbEditorInterfacePrivateCache::instance(), SLOT(actionDestroyed(QObject *)));
+
mPrivate->unlock();
HbEditorInterfacePrivateCache::instance()->notifyValueChanged(mPrivate->mHostEditor);
}
@@ -318,6 +325,8 @@
if (mPrivate) {
mPrivate->lock();
mPrivate->mActions.removeAll(action);
+ disconnect(action, SIGNAL(destroyed(QObject *)),
+ HbEditorInterfacePrivateCache::instance(), SLOT(actionDestroyed(QObject* object)));
mPrivate->unlock();
HbEditorInterfacePrivateCache::instance()->notifyValueChanged(mPrivate->mHostEditor);
}
@@ -452,16 +461,16 @@
QObject *theEditor = editor();
if (theEditor) {
- QGraphicsWidget *graphicsWidgetEditor = 0;
+ QGraphicsObject *graphicsObjectEditor = 0;
QWidget *widgetEditor = qobject_cast<QWidget*>(theEditor);
if (widgetEditor) {
- if (widgetEditor->graphicsProxyWidget()) {
+ if (QGraphicsProxyWidget * pw = HbInputUtils::graphicsProxyWidget(widgetEditor)) {
HbVkbHost *host = HbVkbHost::getVkbHost(widgetEditor);
if (host) {
return host;
}
// it is a proxy widget, let graphics widget loop handle the parent chain.
- graphicsWidgetEditor = widgetEditor->graphicsProxyWidget();
+ graphicsObjectEditor = pw;
} else {
for (QWidget *parent = widgetEditor; parent; parent = parent->parentWidget()) {
HbVkbHost* host = HbVkbHost::getVkbHost(parent);
@@ -469,17 +478,17 @@
return host;
}
}
- return 0; // Need to add default handler here...
+ return new HbAbstractVkbHost(widgetEditor->window());
}
}
- if (!graphicsWidgetEditor) {
- graphicsWidgetEditor = qobject_cast<QGraphicsWidget*>(theEditor);
+ if (!graphicsObjectEditor) {
+ graphicsObjectEditor = qobject_cast<QGraphicsObject*>(theEditor);
}
- if (graphicsWidgetEditor) {
- QGraphicsWidget *lastKnownParent = 0;
- for (QGraphicsWidget *parent = graphicsWidgetEditor; parent; parent = parent->parentWidget()) {
+ if (graphicsObjectEditor) {
+ QGraphicsObject *lastKnownParent = 0;
+ for (QGraphicsObject *parent = graphicsObjectEditor; parent; parent = parent->parentObject()) {
HbVkbHost* host = HbVkbHost::getVkbHost(parent);
if (host) {
return host;
@@ -500,17 +509,17 @@
/*!
Returns true if this instance is attached to same editor as given instance.
*/
-bool HbEditorInterface::operator==(const HbEditorInterface& interface) const
+bool HbEditorInterface::operator==(const HbEditorInterface& editorInterface) const
{
- return (mPrivate == interface.mPrivate);
+ return (mPrivate == editorInterface.mPrivate);
}
/*!
Returns true if this instance is not attached to same editor as given instance.
*/
-bool HbEditorInterface::operator!=(const HbEditorInterface& interface) const
+bool HbEditorInterface::operator!=(const HbEditorInterface& editorInterface) const
{
- return (mPrivate != interface.mPrivate);
+ return (mPrivate != editorInterface.mPrivate);
}
/*!
@@ -557,7 +566,7 @@
}
/*!
-A convinience method for setting up the editor as completing email field.
+A convenience method for setting up the editor as completing email field.
*/
void HbEditorInterface::setUpAsCompletingEmailField()
{
@@ -571,7 +580,7 @@
}
/*!
-A convinience method for setting up the editor as completing url field.
+A convenience method for setting up the editor as completing url field.
*/
void HbEditorInterface::setUpAsCompletingUrlField()
{
@@ -585,7 +594,7 @@
}
/*!
-A convinience method for setting up the editor as latin alphabet editor. In this mode, the input framework
+A convenience method for setting up the editor as latin alphabet editor. In this mode, the input framework
will use global input language if it is naturally capable of producing latin aplhabets. Otherwise
it will switch locally to english language (is is assumed that english is always available).
It is also recommended that prediction is disabled in latin only editors. That's because predictive mode in
--- a/src/hbcore/inputfw/hbinputeditorinterface.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/inputfw/hbinputeditorinterface.h Fri Jun 11 13:58:22 2010 +0300
@@ -49,8 +49,8 @@
HbTextCase textCase() const;
void setTextCase(HbTextCase textCase);
- HbInputModeType mode() const;
- void setMode(HbInputModeType inputMode);
+ HbInputModeType mode() const;
+ void setMode(HbInputModeType inputMode);
HbEditorConstraints inputConstraints() const;
void setInputConstraints(HbEditorConstraints constraints);
HbInputFilter *filter() const;
@@ -70,12 +70,12 @@
void lastFocusedState(HbInputState &result) const;
void setLastFocusedState(const HbInputState &state);
- bool operator==(const HbEditorInterface& interface) const;
- bool operator!=(const HbEditorInterface& interface) const;
+ bool operator==(const HbEditorInterface& editorInterface) const;
+ bool operator!=(const HbEditorInterface& editorInterface) const;
QObject* editor() const;
HbVkbHost *vkbHost() const;
-public: // Convinience methods for setting up standard editor types.
+public: // Convenience methods for setting up standard editor types.
void setUpAsCompletingEmailField();
void setUpAsCompletingUrlField();
void setUpAsLatinAlphabetOnlyEditor();
--- a/src/hbcore/inputfw/hbinputeditorinterface_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/inputfw/hbinputeditorinterface_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -196,6 +196,19 @@
}
}
+void HbEditorInterfacePrivateCache::actionDestroyed(QObject* object)
+{
+ foreach(HbEditorInterfacePrivate *editorInterfacePrivate, mObjectCache) {
+ HbAction *action = static_cast<HbAction *>(object);
+ if (editorInterfacePrivate->mActions.contains(action)) {
+ editorInterfacePrivate->mActions.removeAll(action);
+ foreach(HbEditorInterface *editorInterface, editorInterfacePrivate->mAttachedInterfaces) {
+ editorInterface->backendModified();
+ }
+ }
+ }
+}
+
void HbEditorInterfacePrivateCache::notifyValueChanged(QObject* editor)
{
for (int i = 0; i < mObjectCache.count(); i++) {
--- a/src/hbcore/inputfw/hbinputeditorinterface_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/inputfw/hbinputeditorinterface_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -103,13 +103,14 @@
~HbEditorInterfacePrivateCache();
public:
- HbEditorInterfacePrivate* attachEditor(QObject* editor, HbEditorInterface* interface);
- bool isConnected(QObject* object);
+ HbEditorInterfacePrivate *attachEditor(QObject *editor, HbEditorInterface *interface);
+ bool isConnected(QObject *object);
void notifyValueChanged(QObject *editor);
public slots:
- void destroyed(QObject* object);
- void interfaceDestroyed(QObject* object);
+ void destroyed(QObject *object);
+ void interfaceDestroyed(QObject *object);
+ void actionDestroyed(QObject *object);
private:
QVector<HbEditorInterfacePrivate*> mObjectCache;
--- a/src/hbcore/inputfw/hbinputfocusobject.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/inputfw/hbinputfocusobject.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -29,14 +29,18 @@
#include <QLineEdit>
#include <QTextEdit>
#include <QPointer>
+#include <QGraphicsView>
#include "hbinputmethod.h"
#include "hbinputfocusobject.h"
#include "hbinputeditorinterface.h"
#include "hbinputvkbhost.h"
#include "hbinputstandardfilters.h"
+#include "hbinpututils.h"
#include "hbnamespace_p.h"
+
+
/*!
@alpha
@hbcore
@@ -141,16 +145,26 @@
}
if (d->mFocusedObject) {
- QApplication::sendEvent(d->mFocusedObject, &event);
if (event.type() == QEvent::InputMethod) {
+ QInputContext *ic = qApp->inputContext();
+ QInputMethodEvent* imEvent = static_cast<QInputMethodEvent*>(&event);
+ if (ic) {
+ ic->sendEvent(*imEvent);
+ }
// Currently in Qt, QTextEdit doesn't ensure cursor visibility
// in case we are sending text in the form of QInputMethodEvent. So we need
// to call QTextEdit:ensureCursorVisible() here till we get a fix from Qt.
ensureCursorVisible(d->mFocusedObject);
+ } else {
+ QInputContext *ic = qApp->inputContext();
+ if (ic && ic->focusWidget()) {
+ QApplication::sendEvent(ic->focusWidget(), &event);
+ }
}
}
}
+
/*!
Posts given event to focused editor in an asynchronous manner.
*/
@@ -179,14 +193,27 @@
{
Q_D(const HbInputFocusObject);
- QGraphicsWidget *graphicsWidget = qobject_cast<QGraphicsWidget*>(d->mFocusedObject);
- if (graphicsWidget && graphicsWidget->scene()) {
- return graphicsWidget->scene()->inputMethodQuery(query);
+ QGraphicsObject *graphicsObject = qobject_cast<QGraphicsObject*>(d->mFocusedObject);
+ if (graphicsObject && graphicsObject->scene()) {
+ return graphicsObject->scene()->inputMethodQuery(query);
}
+ // check if QWidget is embedded as a proxy in scene. If yes try to get details
+ // from the scene.
QWidget *widget = qobject_cast<QWidget*>(d->mFocusedObject);
+ QGraphicsProxyWidget *pw = HbInputUtils::graphicsProxyWidget(widget);
+ if (pw && pw->scene()) {
+ return pw->scene()->inputMethodQuery(query);
+ }
+
if (widget) {
- return widget->inputMethodQuery(query);
+ // QWidget returns microfocus in local coordinate.
+ // we need to map it to global coordinate.
+ QVariant v = widget->inputMethodQuery(query);
+ if (v.type() == QVariant::Rect) {
+ v = v.toRect().translated(widget->mapToGlobal(QPoint(0, 0)));
+ }
+ return v;
}
return QVariant();
@@ -257,20 +284,19 @@
{
Q_D(HbInputFocusObject);
- QGraphicsWidget *graphicsWidget = qobject_cast<QGraphicsWidget*>(d->mFocusedObject);
- if (!graphicsWidget) {
+ QGraphicsObject *graphicsObject = qobject_cast<QGraphicsObject*>(d->mFocusedObject);
+ if (!graphicsObject) {
QWidget *widget = qobject_cast<QWidget*>(d->mFocusedObject);
if (widget) {
- if (widget->graphicsProxyWidget()) {
- graphicsWidget = widget->graphicsProxyWidget();
- } else {
+ if (!(graphicsObject = HbInputUtils::graphicsProxyWidget(widget))) {
widget->clearFocus();
+ return;
}
}
}
- if (graphicsWidget && graphicsWidget->scene()) {
- graphicsWidget->scene()->setFocusItem(0);
+ if (graphicsObject && graphicsObject->scene()) {
+ graphicsObject->scene()->setFocusItem(0);
}
}
@@ -308,26 +334,41 @@
}
/*!
-Returns editor widget geometry. In case of QGraphicsWidget, the returned value is in scene coordinates.
+Returns editor widget geometry. In case of QGraphicsObject, the returned value is in scene coordinates.
*/
QRectF HbInputFocusObject::editorGeometry() const
{
Q_D(const HbInputFocusObject);
- QGraphicsWidget *graphicsWidget = qobject_cast<QGraphicsWidget*>(d->mFocusedObject);
- if (!graphicsWidget) {
+ QGraphicsObject *graphicsObject = qobject_cast<QGraphicsObject*>(d->mFocusedObject);
+ if (!graphicsObject) {
QWidget *widget = qobject_cast<QWidget*>(d->mFocusedObject);
if (widget) {
- if (widget->graphicsProxyWidget()) {
- graphicsWidget = widget->graphicsProxyWidget();
+ // check if widget is inside a proxy.
+ QGraphicsProxyWidget *pw = HbInputUtils::graphicsProxyWidget(widget);
+ if (pw) {
+ // check if we are pointing to the toplevel
+ // proxy widget, if not then we must check for
+ // the widgets window and see if it is a proxy.
+ if (pw->widget() == widget) {
+ graphicsObject = pw;
+ } else if (pw->widget() == widget->window()) {
+ // focused object is not a proxy but it is
+ // inside a proxy, query to proxy about
+ // the focused objects rect.
+ QRectF rect = pw->subWidgetRect(widget);
+ rect.translate(pw->scenePos());
+ return rect;
+ }
} else {
- return widget->geometry();
+ return QRectF(widget->mapToGlobal(QPoint(0, 0)), widget->size());
}
}
}
- if (graphicsWidget) {
- return QRectF(graphicsWidget->scenePos(), graphicsWidget->size());
+ // we need to find the editor which is inside
+ if (graphicsObject) {
+ return QRectF(graphicsObject->scenePos(), graphicsObject->boundingRect().size());
}
return QRectF();
@@ -335,7 +376,7 @@
/*!
Returns cursor micro focus by sending Qt::ImMicroFocus to focused editor.
-In case of QGraphicsWidget, the returned rectangle is in scene coordinates.
+In case of QGraphicsObject, the returned rectangle is in scene coordinates.
*/
QRectF HbInputFocusObject::microFocus() const
{
@@ -360,36 +401,38 @@
{
Q_D(const HbInputFocusObject);
- QGraphicsWidget *editorWidget = qobject_cast<QGraphicsWidget*>(d->mFocusedObject);
+ QGraphicsObject *editorWidget = qobject_cast<QGraphicsObject*>(d->mFocusedObject);
if (!editorWidget) {
QWidget *widget = qobject_cast<QWidget*>(d->mFocusedObject);
if (widget) {
- editorWidget = widget->graphicsProxyWidget();
+ editorWidget = HbInputUtils::graphicsProxyWidget(widget);
}
}
if (editorWidget) {
qreal result = editorWidget->zValue();
- for (QGraphicsWidget *parent = editorWidget->parentWidget(); parent; parent = parent->parentWidget()) {
+ for (QGraphicsObject *parent = editorWidget->parentObject(); parent; parent = parent->parentObject()) {
result += parent->zValue();
}
-
- return result + HbPrivate::VKBValueUnit;
+ result += HbPrivate::VKBValueUnit;
+ if(result >= 0) {
+ return result;
+ }
}
return 0.0;
}
/*!
-Returns input method hints. See QWidget and QGraphicsWidget documentation for more information.
+Returns input method hints. See QWidget and QGraphicsItem documentation for more information.
*/
Qt::InputMethodHints HbInputFocusObject::inputMethodHints() const
{
Q_D(const HbInputFocusObject);
- QGraphicsWidget *graphicsWidget = qobject_cast<QGraphicsWidget*>(d->mFocusedObject);
- if (graphicsWidget) {
- return graphicsWidget->inputMethodHints();
+ QGraphicsObject *graphicsObject = qobject_cast<QGraphicsObject*>(d->mFocusedObject);
+ if (graphicsObject) {
+ return graphicsObject->inputMethodHints();
}
QWidget *widget = qobject_cast<QWidget*>(d->mFocusedObject);
@@ -407,9 +450,9 @@
{
Q_D(HbInputFocusObject);
- QGraphicsWidget *graphicsWidget = qobject_cast<QGraphicsWidget*>(d->mFocusedObject);
- if (graphicsWidget) {
- graphicsWidget->setInputMethodHints(hints);
+ QGraphicsObject *graphicsObject = qobject_cast<QGraphicsObject*>(d->mFocusedObject);
+ if (graphicsObject) {
+ graphicsObject->setInputMethodHints(hints);
return;
}
@@ -473,21 +516,37 @@
/*!
Returns the scenePos of the associated editor widget, if the concept makes sense
-in its context (i.e. the editor is part of a scene, either being a QGraphicsWidget or
+in its context (i.e. the editor is part of a scene, either being a QGraphicsObject or
a QWidget embedded in a QGraphicsProxyWidget). Otherwise returns QPointF(0.0, 0.0).
*/
QPointF HbInputFocusObject::scenePos() const
{
Q_D(const HbInputFocusObject);
- QGraphicsWidget *graphicsWidget = qobject_cast<QGraphicsWidget*>(d->mFocusedObject);
- if (graphicsWidget) {
- return graphicsWidget->scenePos();
+ QGraphicsObject *graphicsObject = qobject_cast<QGraphicsObject*>(d->mFocusedObject);
+ if (graphicsObject) {
+ return graphicsObject->scenePos();
}
- QWidget *widget = qobject_cast<QWidget*>(d->mFocusedObject);
- if (widget && widget->graphicsProxyWidget()) {
- return widget->graphicsProxyWidget()->scenePos();
+ QWidget *w = qobject_cast<QWidget*>(d->mFocusedObject);
+ // check if widget is inside a proxy.
+ QGraphicsProxyWidget *pw = HbInputUtils::graphicsProxyWidget(w);
+ if (pw) {
+ // check if we are pointing to the toplevel
+ // proxy widget, if not then we must check for
+ // the widgets window and see if it is a proxy.
+ if (pw->widget() == w) {
+ return pw->scenePos();
+ } else if (pw->widget() == w->window()) {
+ QRectF rect = pw->subWidgetRect(w);
+ rect.translate(pw->scenePos());
+ return rect.topLeft();
+ }
+ }
+
+ if (w) {
+ // not a proxy.. Meaning widget is inside a QWidget window.
+ return w->mapToGlobal(QPoint(0,0));
}
return QPointF(0.0, 0.0);
@@ -570,9 +629,9 @@
return false;
} else {
- QGraphicsWidget *graphicsWidget = qobject_cast<QGraphicsWidget*>(editorObject);
- if (graphicsWidget) {
- if (!(graphicsWidget->flags() & QGraphicsItem::ItemAcceptsInputMethod)) {
+ QGraphicsObject *graphicsObject = qobject_cast<QGraphicsObject*>(editorObject);
+ if (graphicsObject) {
+ if (!(graphicsObject->flags() & QGraphicsItem::ItemAcceptsInputMethod)) {
return true;
}
}
@@ -583,23 +642,21 @@
return true;
}
-
/*!
Returns true if the input framework recognizes given object as editor.
*/
bool HbInputFocusObject::isEditor(QObject *object)
{
- QGraphicsObject *graphicsObject = qobject_cast<QGraphicsObject*>(object);
- if (graphicsObject) {
- return ((graphicsObject->flags() & QGraphicsItem::ItemAcceptsInputMethod) != 0);
+ if (QWidget *w = qobject_cast<QWidget *>(object)) {
+ if (w->testAttribute(Qt::WA_InputMethodEnabled)) {
+ return true;
+ }
}
- if (qobject_cast<QLineEdit*>(object)) {
- return true;
- }
-
- if (qobject_cast<QTextEdit*>(object)) {
- return true;
+ if (QGraphicsObject *gw = qobject_cast<QGraphicsObject *>(object)) {
+ if (gw->flags() & QGraphicsItem::ItemAcceptsInputMethod) {
+ return true;
+ }
}
return false;
@@ -615,9 +672,9 @@
{
Q_D(HbInputFocusObject);
- QGraphicsWidget *graphicsWidget = qobject_cast<QGraphicsWidget*>(d->mFocusedObject);
- if (graphicsWidget && graphicsWidget->scene()) {
- graphicsWidget->scene()->setFocusItem(graphicsWidget);
+ QGraphicsObject *graphicsObject = qobject_cast<QGraphicsObject*>(d->mFocusedObject);
+ if (graphicsObject && graphicsObject->scene()) {
+ graphicsObject->scene()->setFocusItem(graphicsObject);
} else {
QWidget *widget = qobject_cast<QWidget*>(d->mFocusedObject);
if (widget) {
--- a/src/hbcore/inputfw/hbinputkeymapfactory.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/inputfw/hbinputkeymapfactory.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -41,6 +41,8 @@
HbKeymapFactoryPrivate();
~HbKeymapFactoryPrivate();
void parseFiles(QStringList& files, QList<HbInputLanguage>& languages);
+ bool isValidKeymap(QFile& file);
+ float keymapVersion(QFile& file);
public:
QList<HbKeymap*> mKeymaps;
@@ -95,6 +97,97 @@
}
}
+bool HbKeymapFactoryPrivate::isValidKeymap(QFile& file)
+{
+ QTextStream stream(&file);
+ HbKeyboardType keyboardType = HbKeyboardNone;
+ bool retunResult = false;
+
+ while (!stream.atEnd()) {
+ QString line = stream.readLine();
+
+ if (keyboardType == HbKeyboardSctPortrait || keyboardType == HbKeyboardSctLandscape) {
+ continue;
+ }
+
+ // When an empty line is encountered, an ongoing keyboard definition ends
+ if (line.isEmpty()) {
+ if (keyboardType != HbKeyboardNone) {
+ keyboardType = HbKeyboardNone;
+ }
+ continue;
+ }
+ // Line starting with "//" is a comment
+ if (line.length() >= 2 && line.at(0) == '/' && line.at(1) == '/') {
+ continue;
+ }
+ // Non-empty line without ongoing keyboard definition is the start of a definition,
+ // containing the keyboard type as hex
+ if (keyboardType == HbKeyboardNone) {
+ bool ok = false;
+ int keyType = line.toInt(&ok, 16);
+ if (ok) {
+ keyboardType = static_cast<HbKeyboardType>(keyType);
+ }
+ retunResult = true;
+ // Non-empty line with ongoing keyboard definition contains a key definition
+ // Format: <keycode(char)><tab><keys_nomod><tab><keys_shiftmod><tab><keys_fnmod><tab><keys_fn+shiftmod>
+ // Keycode and keys_nomod should always be present, but the rest are optional
+
+ } else {
+ QStringList splitResult = line.split("\t");
+ if (splitResult.count() == 0) {
+ continue;
+ }
+
+ if ((splitResult.count() < 2 || splitResult.count() > 5)) {
+ retunResult = false;
+ break;
+ } else {
+ retunResult = true;
+ }
+ }
+ }
+ //Make the Reading position at the start of the file
+ stream.seek(0);
+ return retunResult;
+}
+
+float HbKeymapFactoryPrivate::keymapVersion(QFile& file)
+{
+ QTextStream stream(&file);
+ float versionNumber = -1;
+ while (!stream.atEnd()) {
+ QString line = stream.readLine();
+ if (line.isEmpty() || (line.length() >= 2 && line.at(0) == '/' && line.at(1) == '/')) {
+ continue;
+ }
+ QStringList splitResult = line.split("\t");
+
+ if(splitResult.at(0).toLower() == QString("version")) {
+ QStringList periodSplits = splitResult.at(1).split('.');
+ QString version = periodSplits.at(0);
+ version.append('.');
+ int count = periodSplits.count() - 1;
+ int i = 1;
+ while (i < count) {
+ version.append(periodSplits.at(i++));
+ }
+ versionNumber = version.toFloat();
+ break;
+ } else {
+ QString filename = file.fileName();
+ if (filename.left(2) == ":/" || filename.left(2).toLower() == "z:") {
+ versionNumber = 0;
+ break;
+ }
+ }
+ }
+
+ //Make the Reading position at the start of the file
+ stream.seek(0);
+ return versionNumber;
+}
/// @endcond
/*!
@@ -170,7 +263,9 @@
}
}
- QString filename;
+ QString filename, latestVersionFilename;
+ QFile file;
+ float maxVersionNumber = -1.0;
foreach (QString path, HbInputSettingProxy::keymapPluginPaths()) {
if (language.variant() == QLocale::AnyCountry) {
@@ -179,23 +274,36 @@
filename = path + '/' + QString::number(language.language()) + "_"
+ QString::number(language.variant()) + ".txt";
}
+
if (QFile::exists(filename)) {
- break;
- }
+ file.setFileName(filename);
+ if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ float fileVersion = mPrivate->keymapVersion(file);
+ if ((fileVersion > maxVersionNumber) && mPrivate->isValidKeymap(file)) {
+ //Found the valid keymap with latest version
+ latestVersionFilename = filename;
+ maxVersionNumber = fileVersion;
+ }
+ //Close the file
+ file.close();
+ }
+ }
}
- QFile file(filename);
+ file.setFileName(latestVersionFilename);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
- if (language.variant() == QLocale::AnyCountry) {
- // File not found when trying to open with AnyCountry (no location specified), check whether
- // the language is available as a country-specific version
- foreach(HbInputLanguage availableLanguage, availableLanguages()) {
- if (availableLanguage.language() == language.language()) {
- return keymap(availableLanguage);
+ if (language.variant() == QLocale::AnyCountry) {
+ // File not found when trying to open with AnyCountry (no location specified), check whether
+ // the language is available as a country-specific version
+
+ foreach(HbInputLanguage availableLanguage, availableLanguages()) {
+ if (availableLanguage.language() == language.language()) {
+ return keymap(availableLanguage);
+ }
+ }
}
- }
- }
- return 0;
- }
+ return 0;
+ }
+
QTextStream stream(&file);
HbKeymap* keymap = 0;
@@ -261,6 +369,7 @@
if (keymap) {
mPrivate->mKeymaps.append(keymap);
}
+ file.close();
return keymap;
}
@@ -292,12 +401,10 @@
languages = instance->mPrivate->mRomLanguages;
} else {
instance->mPrivate->parseFiles(romFiles, languages);
+ instance->mPrivate->mRomLanguages = languages;
}
instance->mPrivate->parseFiles(files, languages);
- if (instance->mPrivate->mRomLanguages.isEmpty()) {
- instance->mPrivate->mRomLanguages = languages;
- }
return languages;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/inputfw/hbinputmainwindow.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,304 @@
+/****************************************************************************
+**
+** 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 <QGraphicsWidget>
+#include <QGraphicsSceneMouseEvent>
+#include <QStyleOptionGraphicsItem>
+#include <QInputContext>
+
+#include "hbinputmainwindow_p.h"
+#include "hbinputregioncollector_p.h"
+#include "hbinstance.h"
+#include "hbwidget.h"
+#include "hbview.h"
+#include "hbnamespace_p.h"
+#include "hbview.h"
+#include "hbstackedlayout.h"
+
+#if defined (Q_OS_SYMBIAN)
+#include <coemain.h>
+#include <coecntrl.h>
+#include <e32cmn.h>
+
+TRect qt_QRect2TRect(const QRectF &rect)
+{
+ TRect trect;
+ trect.SetRect(rect.topLeft().x(), rect.topLeft().y(),
+ rect.bottomRight().x() + 1, rect.bottomRight().y() + 1);
+ return trect;
+}
+
+Q_DECLARE_TYPEINFO(TRect, Q_MOVABLE_TYPE);
+#endif
+
+class HbInputTransparentWindow : public HbWidget
+{
+public:
+
+ HbInputTransparentWindow(QGraphicsItem *parent = 0);
+ ~HbInputTransparentWindow();
+
+ enum { Type = Hb::ItemType_TransparentWindow };
+ int type() const { return Type; }
+
+ void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
+};
+
+HbInputTransparentWindow::HbInputTransparentWindow(QGraphicsItem *parent) :
+ HbWidget(parent)
+{
+}
+
+
+/*!
+ Destructs the transparent window.
+ */
+HbInputTransparentWindow::~HbInputTransparentWindow()
+{
+}
+
+void HbInputTransparentWindow::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+ Q_UNUSED(widget)
+ QPainter::CompositionMode compositionMode = painter->compositionMode();
+ painter->setCompositionMode(QPainter::CompositionMode_Source);
+ painter->fillRect(option->exposedRect, QColor(0,0,0,0));
+ painter->setCompositionMode(compositionMode);
+}
+
+/*
+creates an instance of HbInputMainWindow.
+*/
+HbInputMainWindow *HbInputMainWindow::instance()
+{
+ static HbInputMainWindow *mainWindow = new HbInputMainWindow();
+ return mainWindow;
+}
+
+HbInputMainWindow::~HbInputMainWindow()
+{
+}
+
+// constructor.
+HbInputMainWindow::HbInputMainWindow()
+// HbMainWindow creates a background QGraphicsItem, which has the background image. we need to hide it that.
+:HbMainWindow(0, Hb::WindowFlagTransparent), mLastFocusedWidget(0), mSpellQueryLaunched(false)
+{
+ // We need a window which is of type Qt::Window flag at the same time does not show
+ // any decorators Qt::Tool seems to be the option, and we want this window to be always on top so Qt::WindowStaysOnTopHint.
+ // And since transparency requires to have a frameless window we are setting that too.
+ setWindowFlags(Qt::WindowStaysOnTopHint | Qt::Tool | Qt::FramelessWindowHint);
+
+ // By default QGraphicsView has a background which is white in color (Other controls eg. QPushButton
+ // have a grey background), we need to make that transparent too.
+ setStyleSheet("background: transparent");
+
+ // No fous is necessary as we dont want the hbmainwindw to steal focus.
+ setFocusPolicy(Qt::NoFocus);
+
+ // add transparency begin.
+ HbView* view = new HbView;
+ view->hideItems(Hb::AllItems);
+ view->setContentFullScreen();
+
+#if defined (Q_OS_SYMBIAN)
+ CCoeControl *c = effectiveWinId();
+ c->SetFocusing(false);
+ RWindow *rw = static_cast<RWindow*>(c->DrawableWindow());
+ rw->SetRequiredDisplayMode( EColor16MA );
+ TInt err = rw->SetTransparencyAlphaChannel();
+ if ( err == KErrNone ) {
+ rw->SetBackgroundColor(~0);
+ }
+#endif // Q_OS_SYMBIAN
+
+ HbInputTransparentWindow *transparentWindow = new HbInputTransparentWindow;
+ HbStackedLayout *stackedLayout = new HbStackedLayout;
+ stackedLayout->addItem(transparentWindow);
+ view->setLayout(stackedLayout);
+ addView(view);
+ // add transparency ends.
+
+ connect(HbInputRegionCollector::instance(), SIGNAL(updateRegion(QRegion)), this, SLOT(updateRegion(QRegion)));
+
+ // QApplication signal for getting notification of any focus change. If therer
+ // is a switch between application window and HbInputMainWindow then we need to
+ // set the focus back to the application window, if we don't do that it will
+ // result in focusLost call inside framework.
+ connect(qApp, SIGNAL(focusChanged(QWidget *, QWidget *)),
+ this, SLOT(saveFocusWidget(QWidget *, QWidget *)));
+}
+
+
+void HbInputMainWindow::updateRegion(QRegion region)
+{
+ mMask = region;
+#if defined (Q_OS_SYMBIAN)
+ RWindowBase *rwindow = effectiveWinId()->DrawableWindow();
+ if (region.isEmpty()) {
+ TRegionFix<1> tregion(TRect(TPoint(0, 0), TSize(0,0)));
+ rwindow->SetShape(tregion);
+ } else {
+ // Using QVector assumes the memory layout is the same as RRegion
+ QVector<QRect> rects = region.rects();
+ QVector<TRect> trects(rects.count());
+ for (int i = 0; i < trects.count(); ++i)
+ trects[i] = qt_QRect2TRect(rects.at(i));
+ RRegion rregion(trects.count(), trects.data());
+ if (!rregion.CheckError())
+ rwindow->SetShape(rregion);
+ }
+#else
+ setMask(region);
+#endif
+}
+
+
+/*
+we should always set the focus back to the application window.
+*/
+bool HbInputMainWindow::event(QEvent *e)
+{
+ switch (e->type()) {
+ case QEvent::WindowActivate:
+ if (mLastFocusedWidget && !mSpellQueryLaunched) {
+ qApp->setActiveWindow(mLastFocusedWidget);
+ }
+ break;
+ default:
+ break;
+ }
+ return HbMainWindow::event(e);
+}
+
+/*
+This function checks for any modal dialog present in the HbGraphicsScene by checking DynamicPropertyChange
+and blocks the events to the application window by launching a widget which sits exactly in between the applicaion
+and HbInputMainWindow.
+*/
+bool HbInputMainWindow::eventFilter(QObject *obj, QEvent *event)
+{
+ if (event->type() == QEvent::DynamicPropertyChange) {
+ const QString p = static_cast<QDynamicPropertyChangeEvent *>(event)->propertyName();
+ if (p == "SpellQueryLaunched") {
+ QVariant variant = obj->property("SpellQueryLaunched");
+ if (variant.isValid()) {
+ mSpellQueryLaunched = variant.toBool();
+ if (mSpellQueryLaunched) {
+ qApp->setActiveWindow(this);
+ setFocus(Qt::OtherFocusReason);
+ } else {
+ if (mLastFocusedWidget) {
+ qApp->setActiveWindow(mLastFocusedWidget);
+ }
+ }
+ }
+ // return true as we are interested party!
+ return true;
+ }
+ }
+
+ // we need to only check for spontaneous events.
+ if (event->spontaneous() && (event->type() == QEvent::MouseButtonPress || event->type() == QEvent::MouseButtonRelease)) {
+ QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(event);
+ if (mouseEvent) {
+ // get the top level widget at the point, and see if that widget is a HbMainWindow,
+ // If it is a HbMainWindow then do not do any thing, as events will propagate
+ // correctly. But when it is clicked inside application window then send the event to
+ // viewport as we might want to close a popup.
+ if (!mMask.contains(mouseEvent->globalPos())) {
+ qApp->sendEvent(viewport(), event);
+ }
+ }
+ }
+
+ return HbMainWindow::eventFilter(obj, event);
+}
+
+/*
+Since hbmainwindow is overlapped on top of the application window, we need to
+set the focus back to the application window. Not doing so will result in a focus
+lost.
+*/
+void HbInputMainWindow::saveFocusWidget(QWidget * /*Old*/, QWidget *newFocus)
+{
+ if (newFocus && !this->isAncestorOf(newFocus)) {
+ mLastFocusedWidget = newFocus;
+ }
+}
+
+void HbInputMainWindow::showInputWindow()
+{
+ // installing event filter to the application.. this is needed to get
+ // the events happening in other vanilla windows.
+ qApp->installEventFilter(this);
+
+#ifdef Q_WS_WIN
+ // As in windows OS HbMainWindow can come anywhere on the screen.
+ // so we need to launch main window exactly at the top windows position.
+ QInputContext *ic = qApp->inputContext();
+ QWidget *fw = ic ? ic->focusWidget() : 0 ;
+ if (fw) {
+ QWidget *win = fw->window();
+ if (win) {
+ move(win->frameGeometry().x(), win->pos().y());
+ }
+ }
+#endif
+
+ HbInputRegionCollector::instance()->setEnabled(true);
+ show();
+
+#if defined(Q_OS_SYMBIAN)
+ // this is done to come on top of all the controls in symbian OS, done to overlap soft keys as well.
+ RWindow * rWindow = static_cast<RWindow *>(effectiveWinId()->DrawableWindow());
+ const int positionForeground(0);
+ rWindow->SetOrdinalPosition(positionForeground,
+ ECoeWinPriorityAlwaysAtFront);
+#endif
+}
+
+void HbInputMainWindow::hideInputWindow()
+{
+ if (mSpellQueryLaunched) {
+ return;
+ }
+
+ if (isVisible()) {
+ hide();
+#if defined(Q_OS_SYMBIAN)
+ RWindow *rWindow = static_cast<RWindow *>(effectiveWinId()->DrawableWindow());
+ const int positionBackground(-1);
+ rWindow->SetOrdinalPosition(positionBackground, ECoeWinPriorityNormal);
+#endif
+ }
+
+ HbInputRegionCollector::instance()->setEnabled(false);
+
+ // installing event filter to the application.. this is needed to get
+ // the events happening in other vanilla windows.
+ qApp->removeEventFilter(this);
+}
+
+//EOF
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/inputfw/hbinputmainwindow_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** 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 <QPointer>
+
+#include "hbmainwindow.h"
+#include "hbwidget.h"
+
+#ifndef HB_INPUT_MAINWINDOW
+#define HB_INPUT_MAINWINDOW
+
+class HbInputMainWindow : public HbMainWindow
+{
+ Q_OBJECT
+public:
+ static HbInputMainWindow *instance();
+ void showInputWindow();
+ void hideInputWindow();
+private:
+ HbInputMainWindow();
+ virtual ~HbInputMainWindow();
+
+ bool event(QEvent *e);
+ bool eventFilter(QObject *obj, QEvent *event);
+
+public slots:
+ void saveFocusWidget(QWidget * /*Old*/, QWidget *newFocus);
+ void updateRegion(QRegion region);
+
+private:
+ QPointer<QWidget> mLastFocusedWidget;
+ QRegion mMask;
+ bool mSpellQueryLaunched;
+};
+
+#endif //HB_INPUT_MAINWINDOW
+
+// End of file
--- a/src/hbcore/inputfw/hbinputmethod.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethod.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -62,19 +62,95 @@
activated from UI, input mode cache stops resolving input methods upon focus operations
and the custom input is active in all editors until it is deactivated.
-Following is the basic input framework program flow:
+\bold The input framework program flow
+
+1. An editor gains input focus.<BR>
+2. Editor sets requestSoftwareInputPanel event to active input context.<BR>
+3. The input framework creates input state based on editor attributes and the input mode cache <BR>
+ resolves correct mode handler and activates it.<BR>
+4. A virtual function HbInputMethod::focusReceived is called. At this point the input method<BR>
+ initializes whatever it needs to initialize in order to start the input operation (for example,<BR>
+ opens the virtual keyboard by using HbVkbHost API) and waits for user actions.<BR>
+5. Text is written. The input method delivers results to the editor buffer by using HbInputFocusObject API.<BR>
+ It can access editor attributes via HbEditorInterface API.<BR>
+6. The active editor loses focus. At this point the input method receives a call to virtual function<BR>
+ HbInputMethod::focusLost and is expected to conclude any ongoing input operations and shut down active<BR>
+ UI elements (such as the virtual keyboard).<BR>
+7. The input method waits for next focusReceived() call. <BR>
+
+\bold Input method resolving
+
+The input framework resolves correct input state handler based on three attributes: input mode,
+keyboard type and input language.
+
+The framework recognizes three different input modes: default, numeric and custom.
+Default and numeric input modes are something that the framework resolves for active
+input language and keyboard type. Custom input mode is something that the framework never
+activates automatically, but it is activated from UI or directly from application
+(or input method) code.
+
+Numeric input mode is something that can handle those editors that are configured to only accept
+numeric data (for example those that have Qt::ImhDigitsOnly hints on).
+
+Language attribute is matched either as a direct match or as a language range. Language range
+means the input method is capable of handling all the languages that
+HbKeymapFactory::availableLanguages() returns. Direct match always wins so it is possible
+to override language range for specific languages.
+
+The keyboard attribute is always matched directly. Note that event though the constant
+has term "keyboard" in it, it covers all input devices such as hand writing recognition widgets
+that don't utilize traditional keys. it is up the the input method what that constant
+really means.
+
+The input method resolving parameters are part of input plugin meta data and they are returned
+by QInputContextPlugin::languages() method. A single entry in the returned string list
+is formed by packing resolving parameters into HbInputModeProperties structure and calling
+HbInputModeProperties::asString() method.
-1. An editor gains input focus.
-2 Input mode cache resolves correct mode handler and activates it.
-3. A virtual function HbInputMethod::focusReceived is called. At this point the input method
- initializes whatever it needs to initialize in order to start the input operation (for example,
- opens the virtual keyboard by using HbVkbHost API) and waits for user actions.
-4. Text is written. The input method delivers results to the editor buffer by using HbInputFocusObject API.
- It can access editor attributes via HbEditorInterface API.
-5. The active editor loses focus. At this point the input method receives a call to virtual function
- HbInputMethod::focusLost and is expected to conclude any ongoing input operations and shut down active
- UI elements (such as the virtual keyboard).
-6. The input method waits for next focusReceived() call.
+Following code snippet shows how the input context plugin returns resolving parameters
+
+\snippet{unittest_hbinputmethod/unittest_hbinputmethod.cpp,1}
+
+\bold Input method resolving example
+
+Say that we have implemented touch input methods for 12 key portrait mode and qwerty landscape mode.
+Then we have Chinese touch input method for both portrait and landscape orientations and also
+Chinese handwriting recognition input mode for portrait mode.
+
+Touch input methods resolve to language range, which means that they will be handle all
+the other languages, except Chinese, which has its own designated input method.
+
+Touch input methods also implement support for numeric mode. Because Chinese language uses
+same numeric system as "latin" based languages, we only want to implement numeric mode
+handling in one input method and arrange resolving parameters so that the numeric mode
+is handled by default touch input method even when the global input language is Chinese.
+
+Chinese handwriting input method is something that is a custom mode, and will be activated
+from UI.
+
+Following example shows how the resolving attributes are set up to achieve above configuration.
+
+Portait touch input method returns following attributes
+
+\snippet{unittest_hbinputmethod/unittest_hbinputmethod.cpp,2}
+
+Landscape touch input method returns following attributes
+
+\snippet{unittest_hbinputmethod/unittest_hbinputmethod.cpp,3}
+
+Chinese portrait input method returns following attributes
+
+\snippet{unittest_hbinputmethod/unittest_hbinputmethod.cpp,4}
+
+Chinese landscape input method returns following attributes
+
+\snippet{unittest_hbinputmethod/unittest_hbinputmethod.cpp,5}
+
+Chinese handwriting recognition input method returns following attributes
+(note use of HbInputModeCustom, in this example HWR is something that we
+want to active from UI separately).
+
+\snippet{unittest_hbinputmethod/unittest_hbinputmethod.cpp,6}
\sa QInputContext
\sa HbInputFocusObject
@@ -120,8 +196,11 @@
master->d_ptr->mIsActive = true;
// Finally set application input context.
- QInputContext* proxy = master->d_ptr->newProxy();
- app.setInputContext(proxy);
+ QInputContext* proxy = master->d_ptr->proxy();
+ // A check required so that Qt does not delete inputcontext
+ // which we are passing.
+ if (proxy != app.inputContext())
+ app.setInputContext(proxy);
return true;
}
@@ -163,24 +242,21 @@
}
/*!
-Activates given input method. Input context is
-switched to custom method. Returns false if input method was not found
+Activates given input method. Returns false if input method was not found
or the framework was not able to activate it.
*/
bool HbInputMethod::activateInputMethod(const HbInputMethodDescriptor &inputMethod)
{
Q_D(HbInputMethod);
- if (!inputMethod.isEmpty()) {
- HbInputSettingProxy::instance()->setActiveCustomInputMethod(inputMethod);
-
+ if (!inputMethod.isEmpty()) {
if (inputMethod.isDefault()) {
d->setFocusCommon();
return true;
} else {
HbInputMethod *customMethod = HbInputModeCache::instance()->loadInputMethod(inputMethod);
- if (customMethod) {
- d->contextSwitch(customMethod);
+ if (customMethod) {
+ d->contextSwitch(customMethod);
return true;
}
}
@@ -301,17 +377,20 @@
void HbInputMethod::setFocusWidget(QWidget* widget)
{
Q_D(HbInputMethod);
-
+
if (d->mFocusLocked) {
- return;
- }
-
- QInputContext::setFocusWidget(widget);
-
+ return;
+ }
+
+ // attach focuswidget to prxoy inputcontext as proxy is
+ // the only inputcotext known to qt framework.
+ d->proxy()->QInputContext::setFocusWidget(widget);
+
if (!widget) {
// Losing focus.
if (d->mFocusObject) {
focusLost(false);
+ d->hideMainWindow();
delete d->mFocusObject;
d->mFocusObject = 0;
}
@@ -339,6 +418,7 @@
if (readOnly && HbInputFocusObject::isReadOnlyWidget(widget)) {
if (d->mFocusObject) {
focusLost();
+ d->hideMainWindow();
}
return;
}
@@ -390,6 +470,9 @@
if (d->mFocusObject && d->mFocusObject->object() == widget) {
delete d->mFocusObject;
d->mFocusObject = 0;
+ // passing to actual QInputContext which is attached to Qt framework.
+ // which will internally set QInputContext::focusWidget to Null.
+ d->proxy()->QInputContext::widgetDestroyed(widget);
}
}
@@ -414,7 +497,9 @@
if (focusObject == 0) {
// Losing focus.
if (d->mFocusObject != 0) {
+ disconnect(d->mFocusObject->object(), SIGNAL(destroyed(QObject*)), this, SLOT(editorDeleted(QObject*)));
focusLost(false);
+ d->hideMainWindow();
delete d->mFocusObject;
d->mFocusObject = 0;
}
@@ -443,18 +528,11 @@
delete d->mFocusObject;
d->mFocusObject = 0;
}
- QInputContext::setFocusWidget(0);
// Attach focus.
d->mFocusObject = focusObject;
connect(d->mFocusObject->object(), SIGNAL(destroyed(QObject*)), this, SLOT(editorDeleted(QObject*)));
- // If this is embedded QWidget, then set base class focus too.
- QWidget *widget = qobject_cast<QWidget*>(focusObject->object());
- if (widget) {
- QInputContext::setFocusWidget(widget);
- }
-
d->setFocusCommon();
// The focus jumped from one editor to another. Make sure that vkb host
@@ -776,12 +854,22 @@
Q_UNUSED(obj);
focusLost();
-
+ d->hideMainWindow();
delete d->mFocusObject;
d->mFocusObject = 0;
reset();
}
+/*!
+Returns the input method descriptor the framework used for loading this plugin.
+Returns empty descriptor if the framework doesn't recognize this input method
+(ie. it was not resolved by input mode cache).
+*/
+HbInputMethodDescriptor HbInputMethod::descriptor() const
+{
+ return HbInputModeCache::instance()->descriptor(this);
+}
+
// End of file
--- a/src/hbcore/inputfw/hbinputmethod.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethod.h Fri Jun 11 13:58:22 2010 +0300
@@ -87,6 +87,8 @@
void constructLatinState(HbInputState &result) const;
+ HbInputMethodDescriptor descriptor() const;
+
public slots:
void globalInputLanguageChanged(const HbInputLanguage &newLanguage);
void globalSecondaryInputLanguageChanged(const HbInputLanguage &newLanguage);
--- a/src/hbcore/inputfw/hbinputmethod_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethod_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -24,9 +24,11 @@
****************************************************************************/
#include <QInputMethodEvent>
#include <QGraphicsView>
+#include <QGraphicsScene>
#include <QGraphicsProxyWidget>
#include <QLocale>
#include <QClipboard>
+#include <QPointer>
#include "hbinputmethod.h"
#include "hbinputmethod_p.h"
@@ -37,7 +39,13 @@
#include "hbinputmethodnull_p.h"
#include "hbinpututils.h"
#include "hbinputstandardfilters.h"
+#include "hbinputmainwindow_p.h"
+#if defined(Q_OS_SYMBIAN)
+#include <coemain.h>
+#include <coecntrl.h>
+#include <e32cmn.h>
+#endif
/// @cond
/*!
@@ -222,8 +230,19 @@
return HbInputMethodNull::Instance();
}
- if (stateAllowedInEditor(state)) {
- stateHandler = HbInputModeCache::instance()->findStateHandler(state);
+ 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 (!stateHandler) {
+ stateHandler = HbInputModeCache::instance()->findStateHandler(state);
+ }
+
if (!stateHandler &&
state.inputMode() == HbInputModeNumeric &&
state.language() != QLocale::English &&
@@ -272,7 +291,8 @@
}
if (mFocusObject) {
- if (mFocusObject->inputMethodHints() & (Qt::ImhNoAutoUppercase | Qt::ImhPreferLowercase | Qt::ImhPreferUppercase)) {
+ if (mFocusObject->inputMethodHints() & (Qt::ImhNoAutoUppercase | Qt::ImhPreferLowercase |
+ Qt::ImhPreferUppercase | Qt::ImhDialableCharactersOnly | Qt::ImhEmailCharactersOnly | Qt::ImhUrlCharactersOnly)) {
// Input method hint forbids auto-capitalisation or prefers either case.
return false;
}
@@ -357,7 +377,8 @@
{
Q_Q(HbInputMethod);
- if (mFocusObject) {
+ if (mFocusObject &&
+ !(mFocusObject->editorInterface().inputConstraints() & HbEditorConstraintIgnoreFocus)) {
Qt::InputMethodHints hints = mFocusObject->inputMethodHints();
if (hints & Qt::ImhDialableCharactersOnly) {
setUpFocusedObjectAsPhoneNumberEditor();
@@ -382,27 +403,15 @@
inputStateFromEditor(mInputState);
// Find state handler
- HbInputMethod* stateHandler = 0;
- HbInputMethodDescriptor activeMethod = HbInputSettingProxy::instance()->activeCustomInputMethod();
- if (!activeMethod.isEmpty() && !activeMethod.isDefault()) {
- // A custom method is active. Don't resolve, just try to load it.
- if ((editorConstraints() & HbEditorConstraintIgnoreFocus) == 0) {
- stateHandler = HbInputModeCache::instance()->loadInputMethod(activeMethod);
- }
- }
-
- if (!stateHandler) {
- // It either wasn't a custom method or we were not able to load the custom method.
- // Resolve normally.
- stateHandler = findStateHandler(mInputState);
- }
-
+ HbInputMethod* stateHandler = findStateHandler(mInputState);
if (stateHandler == 0) {
// No state handler found (this should never happen under normal circumstances).
// Fall back to null method.
stateHandler = HbInputMethodNull::Instance();
}
+ checkAndShowMainWindow();
+
if (stateHandler != q_ptr) {
// This method cannot handle requested input state. Switch to another one.
contextSwitch(stateHandler);
@@ -454,9 +463,12 @@
\internal
Creates and returns new input context proxy.
*/
-QInputContext* HbInputMethodPrivate::newProxy()
+QInputContext* HbInputMethodPrivate::proxy()
{
- return new HbInputContextProxy(q_ptr);
+ if (!mProxy) {
+ mProxy = new HbInputContextProxy(q_ptr);
+ }
+ return mProxy;
}
/*!
@@ -525,6 +537,9 @@
// Transfer state.
mInputState = source->d_ptr->mInputState;
+
+ // we need to transfer focuswidget from current proxy to the next proxy.
+ proxy()->QInputContext::setFocusWidget(source->d_ptr->proxy()->focusWidget());
// Set this one active.
mIsActive = true;
@@ -563,8 +578,9 @@
toBeActive->d_ptr->transfer(q);
// Active new context.
- QInputContext* proxy = toBeActive->d_ptr->newProxy();
- qApp->setInputContext(proxy);
+ QInputContext* proxy = toBeActive->d_ptr->proxy();
+ if (proxy != qApp->inputContext())
+ qApp->setInputContext(proxy);
if (toBeActive->focusObject()) {
// Notify focus change.
@@ -685,15 +701,7 @@
*/
HbInputModeType HbInputMethodPrivate::defaultInputMode(const HbInputLanguage &inputLanguage) const
{
- if (inputLanguage == HbInputLanguage(QLocale::Chinese, QLocale::China)) {
- return HbInputModePinyin;
- }
- if (inputLanguage == HbInputLanguage(QLocale::Chinese, QLocale::HongKong)) {
- return HbInputModeStroke;
- }
- if (inputLanguage == HbInputLanguage(QLocale::Chinese, QLocale::Taiwan)) {
- return HbInputModeZhuyin;
- }
+ Q_UNUSED(inputLanguage);
return HbInputModeDefault;
}
@@ -781,6 +789,60 @@
/// @endcond
-// End of file
+/*
+create an instance of HbInputMainWindow which is a transparent window.
+*/
+void HbInputMethodPrivate::showMainWindow()
+{
+ // QGraphicsWidget is inside a graphics view which is not inside a HbMainWindow.
+ HbInputMainWindow *mainWindow = HbInputMainWindow::instance();
+ mainWindow->showInputWindow();
+ mInsideVanillaWindow = true;
+}
+
+/*
+ This function checks if focused object is inside a hbmainwindow, if it is inside a HbMainWindow
+ then it doesn't do anything. And if it finds that focused object is inside a vanilla window (windw != HbMainWindow)
+ then it creates a transparent window.
+*/
+void HbInputMethodPrivate::checkAndShowMainWindow()
+{
+ // check if focused object is inside HbMainWindow.
+ mInsideVanillaWindow = false;
+ QWidget *focusedWidget = proxy()->focusWidget();
+ if (focusedWidget) {
+ if (focusedWidget->inherits("HbMainWindow")) {
+ return;
+ }
+ // in symbian while launching a window on top of another
+ // there is a CCoeControl::FocusChange call on the vanilla window.
+ // causing it to lots of wiered problem.
+#if defined(Q_OS_SYMBIAN)
+ mFocusLocked = true;
+#endif
+ showMainWindow();
+#if defined(Q_OS_SYMBIAN)
+ // activating this at this time..
+ // will not require creation of new focus object
+ // as we already have one ..as we ignored the focus switch due to
+ // main window show.
+ focusedWidget->activateWindow();
+ mFocusLocked = false;
+#endif
+ }
+}
+/*
+hides HbInputMainWindow.
+*/
+void HbInputMethodPrivate::hideMainWindow()
+{
+ // QGraphicsWidget is inside a graphics view which is not inside a HbMainWindow.
+ if (mInsideVanillaWindow) {
+ HbInputMainWindow *mainWindow = HbInputMainWindow::instance();
+ mainWindow->hideInputWindow();
+ }
+}
+
+// End of file
--- a/src/hbcore/inputfw/hbinputmethod_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethod_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -26,14 +26,18 @@
#define HB_INPUT_METHOD_P_H
#include <QString>
+#include <QPointer>
#include <hbinputmodeproperties.h>
#include <hbinputstate.h>
#include <hbinputlanguage.h>
+#include "hbinputcontextproxy_p.h"
class HbInputStateMachine;
class HbInputFilter;
class HbInputMethod;
+class HbInputMainWindow;
+class HbInputContextProxy;
class HB_CORE_PRIVATE_EXPORT HbInputMethodPrivate
{
@@ -42,11 +46,13 @@
public:
explicit HbInputMethodPrivate(HbInputMethod* owner)
: q_ptr(owner),
+ mProxy(0),
mIsActive(false),
mFocusObject(0),
mInputState(HbInputModeNone, HbTextCaseNone, HbKeyboardNone),
mFocusLocked(false),
- mStateChangeInProgress(false)
+ mStateChangeInProgress(false),
+ mInsideVanillaWindow(false)
{}
~HbInputMethodPrivate();
@@ -65,7 +71,7 @@
void setFocusCommon();
void refreshState();
bool compareWithCurrentFocusObject(HbInputFocusObject* focusObject) const;
- QInputContext* newProxy();
+ QInputContext* proxy();
bool isFixedCaseEditor() const;
bool isLowerCaseOnlyEditor() const;
bool isUpperCaseOnlyEditor() const;
@@ -81,16 +87,20 @@
void setUpFocusedObjectAsPhoneNumberEditor();
void setUpFocusedObjectAsEmailEditor();
void setUpFocusedObjectAsUrlEditor();
-
+ void initMainWindow(QWidget *window);
+ void checkAndShowMainWindow();
+ void showMainWindow();
+ void hideMainWindow();
public:
HbInputMethod *q_ptr;
+ QPointer<HbInputContextProxy > mProxy;
bool mIsActive;
HbInputFocusObject* mFocusObject;
HbInputState mInputState;
bool mFocusLocked;
bool mStateChangeInProgress;
QList<HbInputModeProperties> mInputModes;
-
+ bool mInsideVanillaWindow;
private: // For unit test.
static HbInputMethodPrivate *d_ptr(HbInputMethod *inputMethod) {
Q_ASSERT(inputMethod);
--- a/src/hbcore/inputfw/hbinputmodecache.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmodecache.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -75,6 +75,7 @@
HbInputModeProperties propertiesFromState(const HbInputState &state) const;
HbInputMethod *cachedMethod(HbInputMethodListItem &item);
void updateMonitoredPaths();
+ bool isMappedLanguage(const HbInputLanguage &language) const;
public:
QFileSystemWatcher *mWatcher;
@@ -171,17 +172,21 @@
// If the item to be removed happens to be the active one,
// try to deal with the situation.
mMethods[i].cached->forceUnfocus();
- if (mMethods[i].descriptor.pluginNameAndPath() == HbInputSettingProxy::instance()->activeCustomInputMethod().pluginNameAndPath()) {
- // The active custom method is being removed.
- // Clear out related setting proxy values.
- HbInputSettingProxy::instance()->setActiveCustomInputMethod(HbInputMethodDescriptor());
+ // The active custom method is being removed.
+ // Clear out related setting proxy values.
+ if (mMethods[i].descriptor.pluginNameAndPath() == HbInputSettingProxy::instance()->preferredInputMethod(Qt::Horizontal).pluginNameAndPath()) {
+ HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Horizontal, HbInputMethodDescriptor());
+ }
+ if (mMethods[i].descriptor.pluginNameAndPath() == HbInputSettingProxy::instance()->preferredInputMethod(Qt::Vertical).pluginNameAndPath()) {
+ HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Vertical, HbInputMethodDescriptor());
}
// Replace it with null input context.
HbInputMethod *master = HbInputMethodNull::Instance();
master->d_ptr->mIsActive = true;
- QInputContext* proxy = master->d_ptr->newProxy();
- qApp->setInputContext(proxy);
+ QInputContext* proxy = master->d_ptr->proxy();
+ if (proxy != qApp->inputContext())
+ qApp->setInputContext(proxy);
}
delete mMethods[i].cached;
mMethods.removeAt(i);
@@ -245,6 +250,21 @@
}
}
}
+
+bool HbInputModeCachePrivate::isMappedLanguage(const HbInputLanguage &language) const
+{
+ if (language.defined()) {
+ QList<HbInputLanguage> languages = HbKeymapFactory::instance()->availableLanguages();
+ foreach (const HbInputLanguage mappedLanguage, languages) {
+ if (mappedLanguage == language) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+}
+
/// @endcond
/*!
@@ -470,4 +490,58 @@
return result;
}
+/*!
+\internal
+Returns true if given input method is able to handle given input state.
+*/
+bool HbInputModeCache::acceptsState(const HbInputMethod *inputMethod, const HbInputState &state) const
+{
+ Q_D(const HbInputModeCache);
+
+ foreach (const HbInputMethodListItem item, d->mMethods) {
+ if (item.cached == inputMethod) {
+ foreach (const QString language, item.languages) {
+ HbInputModeProperties mode = d->propertiesFromString(language);
+ // Check if keyboard type matches.
+ if (mode.keyboard() == state.keyboard()) {
+ // Check if input mode matches or it is a custom input method but
+ // state's mode is not numeric.
+ if (mode.inputMode() == state.inputMode() ||
+ ((mode.inputMode() == HbInputModeCustom) &&
+ (state.inputMode() != HbInputModeNumeric))) {
+ // Check if language matches or input method supports
+ // all mapped languages and state's language is among them.
+ if (mode.language() == state.language() ||
+ (mode.language().undefined() && d->isMappedLanguage(state.language()))) {
+ return true;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ return false;
+}
+
+/*!
+\internal
+Returns input method descriptor for given input method. Returns empty descriptor if the framework
+doesn't recognize given input method.
+*/
+HbInputMethodDescriptor HbInputModeCache::descriptor(const HbInputMethod *inputMethod) const
+{
+ Q_D(const HbInputModeCache);
+
+ foreach (HbInputMethodListItem item, d->mMethods) {
+ if (item.cached == inputMethod) {
+ return item.descriptor;
+ }
+ }
+
+ return HbInputMethodDescriptor();
+}
+
+
// End of file
+
--- a/src/hbcore/inputfw/hbinputmodecache_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmodecache_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -53,6 +53,8 @@
HbInputMethod* findStateHandler(const HbInputState& state);
HbInputMethod* activeMethod() const;
QList<HbInputLanguage> listInputLanguages() const;
+ bool acceptsState(const HbInputMethod *inputMethod, const HbInputState &state) const;
+ HbInputMethodDescriptor descriptor(const HbInputMethod *inputMethod) const;
public slots:
void shutdown();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/inputfw/hbinputregioncollector.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,242 @@
+/****************************************************************************
+**
+** 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 <QRegion>
+#include <QTransform>
+#include <QPointer>
+
+#include "hbinputregioncollector_p.h"
+#include "hbwidget.h"
+#include "hbmainwindow.h"
+#include "hbpopup.h"
+#include "hbdeviceprofile.h"
+
+/*!
+\proto
+\class HbInputRegionCollector
+\brief Installs a filter on a HbWidget and observes for a change in position, size and visibility
+of the attached widget. As soon as it detects a change in size, position or visibility it calculates
+total of the region of all the widgets attached and emits updateRegion signal.
+
+It is enabled and disabled by input framework, it is enabled when ever input framework detects
+that the application is not having any HbMainWindow.
+
+*/
+
+/// @cond
+
+class HbWidgetFilterList
+{
+public:
+ HbWidgetFilterList(HbWidget *w)
+ :mWidget (w), mIsVisible (false)
+ {
+ }
+ bool operator ==(const HbWidgetFilterList &other) const {return mWidget == other.mWidget;}
+ QPointer <HbWidget> mWidget;
+ // visibility is needed as the time when we get show event inside eventFilter
+ // widget is not visible.
+ bool mIsVisible;
+};
+
+class HbInputRegionCollectorPrivate
+{
+public:
+ HbInputRegionCollectorPrivate()
+ :mEnabled(false), mModalDialogs(0){}
+ QList < HbWidgetFilterList > mInputWidgets;
+ bool mEnabled;
+ int mModalDialogs;
+};
+
+
+/*!
+Creates a static instance of HbInputRegionCollector.
+*/
+HbInputRegionCollector *HbInputRegionCollector::instance()
+{
+ static HbInputRegionCollector regionCollector;
+ return ®ionCollector;
+}
+
+/*!
+Constructor.
+*/
+HbInputRegionCollector::HbInputRegionCollector()
+ :d_ptr(new HbInputRegionCollectorPrivate())
+{
+}
+
+/*!
+Destructor.
+*/
+HbInputRegionCollector::~HbInputRegionCollector()
+{
+ delete d_ptr;
+}
+
+/*!
+Installs a even filter on the passed widget.
+*/
+void HbInputRegionCollector::attach (HbWidget *widget)
+{
+ if (widget && !d_ptr->mInputWidgets.contains(widget)) {
+ if (d_ptr->mEnabled) {
+ widget->installEventFilter(this);
+ }
+ d_ptr->mInputWidgets.append(HbWidgetFilterList(widget));
+ }
+}
+
+/*!
+Detaches widget from region collection and updates current region if region collection is enabled.
+*/
+void HbInputRegionCollector::detach (HbWidget *widget)
+{
+ if (widget && d_ptr->mInputWidgets.contains(widget)) {
+ widget->removeEventFilter(this);
+ d_ptr->mInputWidgets.removeOne(widget);
+ if (d_ptr->mEnabled) {
+ update();
+ }
+ }
+}
+
+/*!
+Observes size, position and move events of all attached widgets and calls update().
+*/
+bool HbInputRegionCollector::eventFilter (QObject *obj, QEvent *event)
+{
+ HbWidget *widget = qobject_cast<HbWidget *>(obj);
+ if (widget) {
+ switch (event->type()) {
+ case QEvent::GraphicsSceneResize:
+ case QEvent::GraphicsSceneMove:
+ update();
+ break;
+ case QEvent::Show:
+ {
+ // We can not query for HbWidget visiblility at this point
+ // so have to set it inside the strcuture variable.
+ int pos = d_ptr->mInputWidgets.indexOf(widget);
+ if (pos != -1) {
+ // Temporary TODO ++
+ // TODO write a HbInputWidgetStore class which will hold all the
+ // active widgets and will emit signals for example sceneBlocked()
+ // sceneUnBlocked(). And then connect to region collector.
+ HbPopup *popup = qobject_cast<HbPopup *>(obj);
+ // since there is a bug in Qt that QGraphicsItem geenrates two show events
+ // once when you do a show() and once when you added it to the scene(),
+ // so need a check on visibility.
+ if (popup && popup->isModal() && !d_ptr->mInputWidgets[pos].mIsVisible) {
+ d_ptr->mModalDialogs++;
+ }
+ // Temporary TODO --
+ d_ptr->mInputWidgets[pos].mIsVisible = true;
+ update();
+ }
+ break;
+ }
+ case QEvent::Hide:
+ {
+ int pos = d_ptr->mInputWidgets.indexOf(widget);
+ if (pos != -1) {
+ // Temporary TODO ++
+ HbPopup *popup = qobject_cast<HbPopup *>(obj);
+ if (popup && popup->isModal()) {
+ d_ptr->mModalDialogs--;
+ }
+ // Temporary TODO --
+ d_ptr->mInputWidgets[pos].mIsVisible = false;
+ update();
+ }
+ break;
+ }
+ default:
+ break;
+ };
+ }
+ return false;
+}
+
+/*!
+Calculates all the attached HbWidget's rectangle and prepares a region out of it and then
+emits updateRegion.
+*/
+void HbInputRegionCollector::update()
+{
+ QRegion region;
+
+ // since there is a modal dialog launched we need to mask the entire window.
+ if (d_ptr->mModalDialogs) {
+ region += QRect(QPoint(0, 0), HbDeviceProfile::current().logicalSize());
+ emit updateRegion(region);
+ return;
+ }
+
+ QList<HbWidgetFilterList> list = d_ptr->mInputWidgets;
+ for (int i = 0; i < list.size(); ++i) {
+ if (list.at(i).mIsVisible) {
+ HbWidget *widget = list.at(i).mWidget;
+ if (widget) {
+ HbMainWindow *window = widget->mainWindow();
+ if (window) {
+ QRectF rect = widget->rect();
+ rect.translate(widget->pos());
+ // we need to check transformation of the QGraphicsView.
+ // for example when there is a orientation switch transformation
+ // is 270 degree. We should map it to get transformed rectangle.
+ QTransform t = window->viewportTransform();
+ QRectF tRect = t.mapRect(rect);
+ region += tRect.toRect();
+ QRectF intersection = QRectF(window->geometry()).intersected(tRect);
+ region += intersection.toRect();
+ }
+ }
+ }
+ }
+ emit updateRegion(region);
+}
+
+/*!
+Enables region collection, this function is called by input framework.
+*/
+void HbInputRegionCollector::setEnabled(bool enabled)
+{
+ d_ptr->mEnabled = enabled;
+ QList<HbWidgetFilterList>& list = d_ptr->mInputWidgets;
+ for (int i = 0; i < list.size(); ++i) {
+ HbWidget *widget = list.at(i).mWidget;
+ if (widget) {
+ if (enabled) {
+ widget->installEventFilter(this);
+ } else {
+ widget->removeEventFilter(this);
+ }
+ }
+ }
+}
+
+//EOF
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/inputfw/hbinputregioncollector_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** 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 HB_INPUT_REGION_COLLECTOR_H
+#define HB_INPUT_REGION_COLLECTOR_H
+
+#include "hbinputdef.h"
+
+#include <QObject>
+#include <QRegion>
+
+class HbWidget;
+class HbInputRegionCollectorPrivate;
+
+class HB_CORE_PRIVATE_EXPORT HbInputRegionCollector : public QObject
+{
+ Q_OBJECT
+public:
+ static HbInputRegionCollector *instance();
+ ~HbInputRegionCollector();
+
+ void attach (HbWidget *widget);
+ void detach (HbWidget *widget);
+ void setEnabled ( bool enabled );
+ void update ();
+
+protected:
+ bool eventFilter (QObject *obj, QEvent *event);
+
+signals:
+ void updateRegion (QRegion region);
+
+private:
+ HbInputRegionCollector();
+ HbInputRegionCollectorPrivate *const d_ptr;
+
+private:
+ Q_DECLARE_PRIVATE_D(d_ptr, HbInputRegionCollector)
+ Q_DISABLE_COPY(HbInputRegionCollector)
+};
+
+#endif // HB_INPUT_REGION_COLLECTOR_H
--- a/src/hbcore/inputfw/hbinputsettingproxy.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/inputfw/hbinputsettingproxy.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -68,6 +68,77 @@
/// @cond
+HbSettingProxyInputMethodDescriptor::HbSettingProxyInputMethodDescriptor()
+{
+ pluginNameAndPathSize = 0;
+ keySize = 0;
+ displayNameSize = 0;
+}
+
+HbSettingProxyInputMethodDescriptor::HbSettingProxyInputMethodDescriptor(const HbInputMethodDescriptor &descriptor)
+{
+ *this = descriptor;
+}
+
+void HbSettingProxyInputMethodDescriptor::operator=(const HbInputMethodDescriptor &descriptor)
+{
+ pluginNameAndPathSize = 0;
+ keySize = 0;
+ displayNameSize = 0;
+
+ if (!descriptor.pluginNameAndPath().isEmpty() &&
+ (descriptor.pluginNameAndPath().size() * sizeof(QChar) < HbActiveMethodNameMax)) {
+ pluginNameAndPathSize = descriptor.pluginNameAndPath().size();
+ memcpy((void*)pluginNameAndPath, (void*)descriptor.pluginNameAndPath().unicode(), descriptor.pluginNameAndPath().size() * sizeof(QChar));
+ }
+ if (!descriptor.key().isEmpty() &&
+ (descriptor.key().size() * sizeof(QChar) < HbActiveMethodKeyMax)) {
+ memcpy((void*)key, (void*)descriptor.key().unicode(), descriptor.key().size() * sizeof(QChar));
+ keySize = descriptor.key().size();
+ }
+ if (!descriptor.displayName().isEmpty() &&
+ (descriptor.displayName().size() * sizeof(QChar) < HbActiveMethodKeyMax)) {
+ memcpy((void*)displayName, (void*)descriptor.displayName().unicode(), descriptor.displayName().size() * sizeof(QChar));
+ displayNameSize = descriptor.displayName().size();
+ }
+}
+
+HbInputMethodDescriptor HbSettingProxyInputMethodDescriptor::descriptor() const
+{
+ HbInputMethodDescriptor result;
+
+ if (pluginNameAndPathSize > 0) {
+ result.setPluginNameAndPath(QString(pluginNameAndPath, pluginNameAndPathSize));
+ }
+ if (keySize > 0) {
+ result.setKey(QString(key, keySize));
+ }
+ if (displayNameSize > 0) {
+ result.setDisplayName(QString(displayName, displayNameSize));
+ }
+
+ return result;
+}
+
+QByteArray HbSettingProxyInputMethodDescriptor::data() const
+{
+ if (customDataSize > 0) {
+ return QByteArray(customData, customDataSize);
+ }
+
+ return QByteArray();
+}
+
+void HbSettingProxyInputMethodDescriptor::setData(const QByteArray &data)
+{
+ customDataSize = 0;
+
+ if (data.size() > 0 && data.size() <= (int)HbActiveMethodKeyMax * 2) {
+ memcpy(customData, data.data(), data.size());
+ customDataSize = data.size();
+ }
+}
+
// Special character classifier class for bookkeeping
// of how popular a SC is.
class HbScClassifier
@@ -169,10 +240,8 @@
prData->iGlobalSecondaryInputLanguage = QLocale::Language(0);
prData->iActiveKeyboard = HbKeyboardVirtual12Key;
prData->iTouchKeyboard = HbKeyboardVirtual12Key;
- prData->iHwKeyboard = HbKeyboardQwerty;
- prData->iActiveCustomMethodName[0] = 0;
- prData->iActiveCustomMethodKey[0] = 0;
- prData->iPredictiveInputState = HbKeyboardSettingNone;
+ prData->iHwKeyboard = HbKeyboardQwerty;
+ prData->iPredictiveInputState = (HbKeyboardSettingFlags)HbKeyboardSetting12key|HbKeyboardSettingQwerty;
prData->iDigitType = HbDigitTypeLatin;
prData->iQwertyTextCasing = true;
prData->iQwertyCharacterPreview = true;
@@ -180,7 +249,11 @@
prData->iKeypressTimeout = 1000;
prData->iAutocompletion = (HbKeyboardSettingFlags)(HbKeyboardSetting12key | HbKeyboardSettingQwerty);
prData->iTypingCorrectionLevel = HbTypingCorrectionLevelHigh;
- prData->iPrimaryCandidateMode = HbPrimaryCandidateModeBestPrediction;
+ prData->iPrimaryCandidateMode = HbPrimaryCandidateModeBestPrediction;
+ prData->iPreferredMethodHorizontal = HbInputMethodDescriptor();
+ prData->iPreferredMethodHorizontal.setData(QByteArray());
+ prData->iPreferredMethodVertical = HbInputMethodDescriptor();
+ prData->iPreferredMethodVertical.setData(QByteArray());
}
}
unlock();
@@ -512,6 +585,109 @@
}
/*!
+Returns the preferred input method for given screen orientation. Initially this value is empty
+and the framework will resolve the default handler.
+
+\sa setPreferredInputMethod
+*/
+HbInputMethodDescriptor HbInputSettingProxy::preferredInputMethod(Qt::Orientation orientation) const
+{
+ Q_D(const HbInputSettingProxy);
+
+ HbInputMethodDescriptor result;
+
+ HbSettingProxyInternalData* prData = d->proxyData();
+ if (prData) {
+ d->lock();
+ if (orientation == Qt::Horizontal) {
+ result = prData->iPreferredMethodHorizontal.descriptor();
+ } else {
+ result = prData->iPreferredMethodVertical.descriptor();
+ }
+ d->unlock();
+ }
+
+ return result;
+}
+
+/*!
+Returns the preferred input method for current screen orientation. Initially this value is empty
+and the framework will resolve the default handler.
+
+\sa setPreferredInputMethod
+*/
+HbInputMethodDescriptor HbInputSettingProxy::preferredInputMethod() const
+{
+ Q_D(const HbInputSettingProxy);
+
+ HbInputMethodDescriptor result;
+
+ HbSettingProxyInternalData* prData = d->proxyData();
+ if (prData) {
+ d->lock();
+ if (prData->iScreenOrientation == 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
+*/
+QByteArray HbInputSettingProxy::preferredInputMethodCustomData(Qt::Orientation orientation) const
+{
+ Q_D(const HbInputSettingProxy);
+
+ QByteArray result;
+
+ HbSettingProxyInternalData* prData = d->proxyData();
+ if (prData) {
+ d->lock();
+ if (orientation == Qt::Horizontal) {
+ result = prData->iPreferredMethodHorizontal.data();
+ } else {
+ result = prData->iPreferredMethodVertical.data();
+ }
+ d->unlock();
+ }
+
+ return result;
+}
+
+/*!
+Sets preferred input method for given screen orientation. The parameter \a customdata may contain
+any information the preferred input method needs to remember as part of settings data.
+Note that only 128 bytes is reserved for custom data. Larger amount of it needs to be
+handled by other means.
+This method is for input method developers only. There should never be need to call it from application code.
+
+\sa preferredInputMethod
+*/
+void HbInputSettingProxy::setPreferredInputMethod(Qt::Orientation orientation, const HbInputMethodDescriptor &inputMethod, const QByteArray &customData)
+{
+ Q_D(HbInputSettingProxy);
+ HbSettingProxyInternalData* prData = d->proxyData();
+ if (prData) {
+ d->lock();
+ if (orientation == Qt::Horizontal) {
+ prData->iPreferredMethodHorizontal = inputMethod;
+ prData->iPreferredMethodHorizontal.setData(customData);
+ } else {
+ prData->iPreferredMethodVertical = inputMethod;
+ prData->iPreferredMethodVertical.setData(customData);
+ }
+ d->unlock();
+ }
+}
+
+/*!
Sets system wide input language. Will emit signal globalInputLanguageChanged if language is changed.
\sa globalInputLanguage
@@ -769,11 +945,20 @@
QStringList HbInputSettingProxy::keymapPluginPaths()
{
QStringList result;
+ QFileInfoList list = QDir::drives();
+
#ifdef Q_OS_SYMBIAN
- result.append(QString("z:/resource/keymaps"));
+ for(int counter = 0; counter < list.count(); counter ++) {
+ result.append(list.at(counter).absoluteFilePath() + QString("/resource/keymaps"));
+ }
#else
result.append(HB_RESOURCES_DIR + (QDir::separator() + QString("keymaps")));
+ for(int counter = 0; counter < list.count(); counter ++) {
+ result.append(list.at(counter).absoluteFilePath() + QString("resource/keymaps"));
+ }
#endif
+ result.sort();
+ //Append the default resource at the end
result.append(":/keymaps");
return QStringList(result);
}
@@ -959,36 +1144,15 @@
*/
HbInputMethodDescriptor HbInputSettingProxy::activeCustomInputMethod() const
{
- Q_D(const HbInputSettingProxy);
-
- HbInputMethodDescriptor result;
-
- d->lock();
- HbSettingProxyInternalData* prData = d->proxyData();
- if (prData) {
- result.setPluginNameAndPath(d->stringFromProxyDataElement(prData->iActiveCustomMethodName));
- result.setKey(d->stringFromProxyDataElement(prData->iActiveCustomMethodKey));
- }
- d->unlock();
-
- return HbInputMethodDescriptor(result);
+ return HbInputMethodDescriptor();
}
/*!
-
\sa activeCustomInputMethod
*/
void HbInputSettingProxy::setActiveCustomInputMethod(const HbInputMethodDescriptor &inputMethod)
{
- Q_D(HbInputSettingProxy);
-
- d->lock();
- HbSettingProxyInternalData* prData = d->proxyData();
- if (prData) {
- d->stringToProxyDataElement(prData->iActiveCustomMethodName, inputMethod.pluginNameAndPath(), HbActiveMethodNameMax);
- d->stringToProxyDataElement(prData->iActiveCustomMethodKey, inputMethod.key(), HbActiveMethodKeyMax);
- }
- d->unlock();
+ Q_UNUSED(inputMethod)
}
/*!
--- a/src/hbcore/inputfw/hbinputsettingproxy.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/inputfw/hbinputsettingproxy.h Fri Jun 11 13:58:22 2010 +0300
@@ -94,6 +94,10 @@
HbTypingCorrectionLevel typingCorrectionLevel() const;
void setPrimaryCandidateMode(HbPrimaryCandidateMode mode);
HbPrimaryCandidateMode primaryCandidateMode() const;
+ HbInputMethodDescriptor preferredInputMethod(Qt::Orientation orientation) const;
+ HbInputMethodDescriptor preferredInputMethod() const;
+ QByteArray preferredInputMethodCustomData(Qt::Orientation orientation) const;
+ void setPreferredInputMethod(Qt::Orientation orientation, const HbInputMethodDescriptor &inputMethod, const QByteArray &customData = QByteArray());
signals:
void globalInputLanguageChanged(const HbInputLanguage &newLanguage);
--- a/src/hbcore/inputfw/hbinputsettingproxy_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/inputfw/hbinputsettingproxy_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -28,16 +28,39 @@
#include <QSharedMemory>
#include <QString>
+#include "hbinputmethoddescriptor.h"
#include "hbinputlanguage.h"
-const int HbProxyDataRequiredVersion = 13;
+const int HbProxyDataRequiredVersion = 18;
const QString KInputSettingProxyKey("HbInputSettingProxy");
-const int HbActiveMethodNameMax = 255;
-const int HbActiveMethodKeyMax = 64;
+const unsigned int HbActiveMethodNameMax = 255;
+const unsigned int HbActiveMethodKeyMax = 64;
class HbScClassifier;
class HbInputSettingProxy;
+class HbSettingProxyInputMethodDescriptor
+{
+public:
+ HbSettingProxyInputMethodDescriptor();
+ HbSettingProxyInputMethodDescriptor(const HbInputMethodDescriptor &descriptor);
+ void operator=(const HbInputMethodDescriptor &descriptor);
+ HbInputMethodDescriptor descriptor() const;
+ QByteArray data() const;
+ void setData(const QByteArray &data);
+
+public:
+ unsigned int pluginNameAndPathSize;
+ QChar pluginNameAndPath[HbActiveMethodNameMax];
+ unsigned int keySize;
+ QChar key[HbActiveMethodKeyMax];
+ unsigned int displayNameSize;
+ QChar displayName[HbActiveMethodKeyMax];
+ unsigned int customDataSize;
+ char customData[HbActiveMethodKeyMax * 2];
+};
+
+
// REMEMBER to increase HbProxyDataRequiredVersion every time you add fields
// to this class or change related constants!
struct HbSettingProxyInternalData
@@ -52,9 +75,7 @@
HbKeyboardSettingFlags iPredictiveInputState;
HbInputDigitType iDigitType;
bool iQwertyTextCasing;
- bool iQwertyCharacterPreview;
- QChar iActiveCustomMethodName[HbActiveMethodNameMax];
- QChar iActiveCustomMethodKey[HbActiveMethodKeyMax];
+ bool iQwertyCharacterPreview;
Qt::Orientation iScreenOrientation;
bool iOrientationChangeCompleted;
bool iFlipStatus;
@@ -63,6 +84,8 @@
HbKeyboardSettingFlags iAutocompletion;
HbTypingCorrectionLevel iTypingCorrectionLevel;
HbPrimaryCandidateMode iPrimaryCandidateMode;
+ HbSettingProxyInputMethodDescriptor iPreferredMethodHorizontal;
+ HbSettingProxyInputMethodDescriptor iPreferredMethodVertical;
};
class HB_CORE_PRIVATE_EXPORT HbInputSettingProxyPrivate
--- a/src/hbcore/inputfw/hbinputstandardfilters.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/inputfw/hbinputstandardfilters.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -25,6 +25,12 @@
#include "hbinputstandardfilters.h"
#include "hbinputsettingproxy.h"
+
+#define HB_DIGIT_ARABIC_INDIC_START_VALUE 0x0660
+#define HB_DIGIT_ARABIC_INDIC_END_VALUE 0x0669
+#define HB_DIGIT_EASTERN_ARABIC_START_VALUE 0x06F0
+#define HB_DIGIT_EASTERN_ARABIC_END_VALUE 0x06F9
+
/*!
@alpha
@hbcore
@@ -48,14 +54,23 @@
QLocale::Language language = HbInputSettingProxy::instance()->globalInputLanguage().language();
QLocale::Language systemLanguage = QLocale::system().language();
- if (language != systemLanguage) {
- if (aChar >= '0' && aChar <= '9') {
+ // If both phone language and writing language are same, then language specific
+ // digits should be allowed in phone number and digits only editors. If the current
+ // language is Arabic, then Arabic-indic digits are supported. Eastern-Arabic digits
+ // are supported in Persian and Urdu languages.
+ if (language == systemLanguage) {
+ if (language == QLocale::Arabic &&
+ (aChar >= HB_DIGIT_ARABIC_INDIC_START_VALUE &&
+ aChar <= HB_DIGIT_ARABIC_INDIC_END_VALUE)) {
+ ret = true;
+ } else if ((language == QLocale::Persian ||
+ language == QLocale::Urdu) &&
+ (aChar >= HB_DIGIT_EASTERN_ARABIC_START_VALUE &&
+ aChar <= HB_DIGIT_EASTERN_ARABIC_END_VALUE)) {
+ ret = true;
+ } else if (aChar >= '0' && aChar <= '9') {
ret = true;
}
- } else if (language == QLocale::Arabic) {
- if (aChar >= 0x0660 && aChar <= 0x0669) {
- ret = true;
- }
} else if (aChar >= '0' && aChar <= '9') {
ret = true;
}
--- a/src/hbcore/inputfw/hbinpututils.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/inputfw/hbinpututils.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -42,32 +42,9 @@
#include "hbinputlanguage.h"
#include "hbinpututils.h"
-#define HB_DIGIT_ARABIC_INDIC_START_VALUE 0x0660
-
-
-/// @cond
+#define HB_DIGIT_ARABIC_INDIC_START_VALUE 0x0660
+#define HB_DIGIT_EASTERN_ARABIC_START_VALUE 0x06F0
-static bool usesLatinDigits(QLocale::Language language, HbInputDigitType digitType)
-{
- if (digitType == HbDigitTypeDevanagari) {
- return false;
- }
- if (language == QLocale::Urdu || language == QLocale::Persian) {
- // Latin digits are used in Persian and Urdu ITU-T keypads
- if (HbInputSettingProxy::instance()->activeKeyboard() == HbKeyboardVirtual12Key) {
- return true;
- } else {
- return false;
- }
- }
- if (language == QLocale::Arabic && digitType == HbDigitTypeArabicIndic) {
- return false;
- }
-
- return true;
-}
-
-/// @endcond
/*!
\class HbInputUtils
@@ -92,9 +69,11 @@
const HbInputLanguage language,
const HbInputDigitType digitType)
{
+ Q_UNUSED(language);
+
if (key) {
QString chars = key->characters(HbModifierNone);
- if (usesLatinDigits(language.language(), digitType)) {
+ if (digitType == HbDigitTypeLatin) {
for (int i = 0; i < chars.length(); i++) {
if (chars.at(i) >= '0' && chars.at(i) <= '9') {
return chars.at(i);
@@ -110,13 +89,14 @@
for (int i = 0; i < chars.length(); i++) {
if (chars.at(i) >= '0' && chars.at(i) <= '9') {
return HB_DIGIT_ARABIC_INDIC_START_VALUE +
- (chars.at(i).toAscii() - '0');
+ (chars.at(i).unicode() - '0');
}
}
} else if (digitType == HbDigitTypeEasternArabic) {
for (int i = 0; i < chars.length(); i++) {
- if (chars.at(i) >= 0x06F0 && chars.at(i) <= 0x06F9) {
- return chars.at(i);
+ if (chars.at(i) >= '0' && chars.at(i) <= '9') {
+ return HB_DIGIT_EASTERN_ARABIC_START_VALUE +
+ (chars.at(i).unicode() - '0');
}
}
}
@@ -255,11 +235,35 @@
case QLocale::Arabic:
digitType = HbDigitTypeArabicIndic;
break;
+ case QLocale::Persian:
+ case QLocale::Urdu:
+ digitType = HbDigitTypeEasternArabic;
+ break;
+ case QLocale::Hindi:
+ digitType = HbDigitTypeDevanagari;
+ break;
default:
digitType = HbDigitTypeLatin;
break;
}
return digitType;
}
+
+
+/*!
+Returns the proxy widget of the embedded widget in a graphics view ;
+if widget does not have the proxy widget then it returns the proxy widget of its window.
+ otherwise returns 0.
+*/
+QGraphicsProxyWidget* HbInputUtils::graphicsProxyWidget(const QWidget* w)
+{
+ QGraphicsProxyWidget *pw = w ? w->graphicsProxyWidget() : 0;
+ if (w && !pw) {
+ pw = w->window() ? w->window()->graphicsProxyWidget() : w->graphicsProxyWidget();
+ }
+ return pw;
+}
+
+
// End of file
--- a/src/hbcore/inputfw/hbinpututils.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/inputfw/hbinpututils.h Fri Jun 11 13:58:22 2010 +0300
@@ -36,6 +36,7 @@
class QInputContextPlugin;
class QWidget;
class QGraphicsWidget;
+class QGraphicsProxyWidget;
struct HbInputMethodList
{
@@ -61,7 +62,8 @@
static QWidget* createWrapperWidget(QGraphicsWidget* graphicsWidget);
static QGraphicsWidget* createGraphicsProxyWidget(QWidget* widget);
- static HbInputDigitType inputDigitType(HbInputLanguage language);
+ static HbInputDigitType inputDigitType(HbInputLanguage language);
+ static QGraphicsProxyWidget* graphicsProxyWidget(const QWidget* w);
};
/*!
--- a/src/hbcore/inputfw/hbinputvkbhostbridge.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/inputfw/hbinputvkbhostbridge.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -209,6 +209,8 @@
if (d->mActiveHost != host) {
if (d->mActiveHost) {
+ // Closing the previous vkb hosts keypad so that if necessary can be launched again for that same vkb host.
+ d->mActiveHost->closeKeypad(false);
disconnect(d->mActiveHost, SIGNAL(aboutToOpen()), this, SIGNAL(aboutToOpen()));
disconnect(d->mActiveHost, SIGNAL(aboutToClose()), this, SIGNAL(aboutToClose()));
disconnect(d->mActiveHost, SIGNAL(keypadOpened()), this, SIGNAL(keypadOpened()));
--- a/src/hbcore/inputfw/inputfw.pri Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/inputfw/inputfw.pri Fri Jun 11 13:58:22 2010 +0300
@@ -62,9 +62,12 @@
PRIVATE_HEADERS += $$PWD/hbinputextrauserdictionary_p.h
PRIVATE_HEADERS += $$PWD/hbinputmethod_p.h
PRIVATE_HEADERS += $$PWD/hbinputsettingproxy_p.h
+PRIVATE_HEADERS += $$PWD/hbinputmainwindow_p.h
+PRIVATE_HEADERS += $$PWD/hbinputregioncollector_p.h
# framework sources
-SOURCES += $$PWD/hbinputmethod.cpp
+SOURCES += $$PWD/hbinputmethod.cpp \
+ inputfw/hbinputregioncollector.cpp
SOURCES += $$PWD/hbinputkeymap.cpp
SOURCES += $$PWD/hbinputpredictionengine.cpp
SOURCES += $$PWD/hbinputkeymapfactory.cpp
@@ -88,4 +91,5 @@
SOURCES += $$PWD/hbinputmethod_p.cpp
SOURCES += $$PWD/hbinputmethoddescriptor.cpp
SOURCES += $$PWD/hbinputvkbhostbridge.cpp
+SOURCES += $$PWD/hbinputmainwindow.cpp
--- a/src/hbcore/layouts/hbanchorlayout.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/layouts/hbanchorlayout.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -49,7 +49,8 @@
end edges are defined by (layout item, edge) pairs. See setAnchor() for
more details.
- If anchors set allow ambiguos positioning of items, then layout tries to set items size as close to preferred as possible.
+ If anchors set allow ambiguos positioning of items, then layout tries to set items size as
+ close to preferred as possible.
Example code:
\snippet{anchorlayoutsample.cpp,1}
@@ -163,7 +164,8 @@
void createEquations( EdgeType type );
void setSizeProp( SizeProperty *v, QGraphicsLayoutItem *item, EdgeType type );
GraphVertex *createCenterEdge( EdgeType type, QGraphicsLayoutItem *item, Hb::Edge edge );
- void defineNextGeometry( const int itemIndexStart, const int itemIndexEnd, const int anchorIndex, const int definedItemIndex );
+ void defineNextGeometry( const int itemIndexStart, const int itemIndexEnd,
+ const int anchorIndex, const int definedItemIndex );
QSizeF sizeHint( Qt::SizeHint which );
@@ -208,7 +210,8 @@
/*!
\internal
*/
-HbAnchorLayoutPrivate::HbAnchorLayoutPrivate() : mEquationsDirty( false ), mValid( true ), mWrongAnchors( false ), mInvalidateCalled(false),
+HbAnchorLayoutPrivate::HbAnchorLayoutPrivate() :
+ mEquationsDirty( false ), mValid( true ), mWrongAnchors( false ), mInvalidateCalled(false),
mLayoutVarH( 0 ), mLayoutVarV( 0 )
{
}
@@ -276,7 +279,11 @@
return 0;
}
-void HbAnchorLayoutPrivate::defineNextGeometry( const int itemIndexStart, const int itemIndexEnd, const int anchorIndex, const int definedItemIndex )
+void HbAnchorLayoutPrivate::defineNextGeometry(
+ const int itemIndexStart,
+ const int itemIndexEnd,
+ const int anchorIndex,
+ const int definedItemIndex )
{
ItemGeometry *knownItemGeom, *unKnownItemGeom;
Hb::Edge knownEdge, unKnownEdge;
@@ -303,10 +310,12 @@
if( isHorizontal ) {
mGeometryDefinedH[itemIndexEnd] = true;
- itemSize = mSolutionHorizontal.value( mVariablesHorizontal.findVariable( mItems.at(itemIndexEnd) ) );
+ itemSize = mSolutionHorizontal.value(
+ mVariablesHorizontal.findVariable( mItems.at(itemIndexEnd) ) );
} else {
mGeometryDefinedV[itemIndexEnd] = true;
- itemSize = mSolutionVertical.value( mVariablesVertical.findVariable( mItems.at(itemIndexEnd) ) );
+ itemSize = mSolutionVertical.value(
+ mVariablesVertical.findVariable( mItems.at(itemIndexEnd) ) );
}
sign = 1;
@@ -319,10 +328,12 @@
if( isHorizontal ) {
mGeometryDefinedH[itemIndexStart] = true;
- itemSize = mSolutionHorizontal.value( mVariablesHorizontal.findVariable( mItems.at(itemIndexStart) ) );
+ itemSize = mSolutionHorizontal.value(
+ mVariablesHorizontal.findVariable( mItems.at(itemIndexStart) ) );
} else {
mGeometryDefinedV[itemIndexStart] = true;
- itemSize = mSolutionVertical.value( mVariablesVertical.findVariable( mItems.at(itemIndexStart) ) );
+ itemSize = mSolutionVertical.value(
+ mVariablesVertical.findVariable( mItems.at(itemIndexStart) ) );
}
sign = -1;
@@ -655,7 +666,8 @@
}
-GraphVertex *HbAnchorLayoutPrivate::createCenterEdge( EdgeType type, QGraphicsLayoutItem *item, Hb::Edge edge )
+GraphVertex *HbAnchorLayoutPrivate::createCenterEdge(
+ EdgeType type, QGraphicsLayoutItem *item, Hb::Edge edge )
{
GraphVertex *middle;
GraphVertex *start = 0;
@@ -885,9 +897,11 @@
itemStart = 0;
itemEnd = 0;
for( int j = 0; j < vertices->size(); j++ ) {
- if( ( vertices->at(j)->itemRef == anchor->mStartItem ) && ( vertices->at(j)->itemSide == anchor->mStartEdge ) ) {
+ if( ( vertices->at(j)->itemRef == anchor->mStartItem ) &&
+ ( vertices->at(j)->itemSide == anchor->mStartEdge ) ) {
itemStart = vertices->at(j);
- } else if( ( vertices->at(j)->itemRef == anchor->mEndItem ) && ( vertices->at(j)->itemSide == anchor->mEndEdge ) ) {
+ } else if( ( vertices->at(j)->itemRef == anchor->mEndItem ) &&
+ ( vertices->at(j)->itemSide == anchor->mEndEdge ) ) {
itemEnd = vertices->at(j);
}
}
@@ -951,7 +965,8 @@
if( ! AnchorLayoutEngine::instance()->processItems( edges, vertices, vs, el ) ) {
mWrongAnchors = true;
- AnchorLayoutEngine::instance()->cleanUp( layoutStart, layoutMiddle, layoutEnd, edges, vertices, el );
+ AnchorLayoutEngine::instance()->cleanUp(
+ layoutStart, layoutMiddle, layoutEnd, edges, vertices, el );
//#ifdef HBANCHORLAYOUT_DEBUG
qDebug() << "FAIL line:" << __LINE__;
//#endif //HBANCHORLAYOUT_DEBUG
@@ -985,8 +1000,10 @@
layoutVar->sizeProp.pref = 100;
layoutVar->sizeProp.flags = 0;
- AnchorLayoutEngine::instance()->attachToLayout( layoutStart, layoutMiddle, layoutEnd, layoutVar, el );
- AnchorLayoutEngine::instance()->cleanUp( layoutStart, layoutMiddle, layoutEnd, edges, vertices, el );
+ AnchorLayoutEngine::instance()->attachToLayout(
+ layoutStart, layoutMiddle, layoutEnd, layoutVar, el );
+ AnchorLayoutEngine::instance()->cleanUp(
+ layoutStart, layoutMiddle, layoutEnd, edges, vertices, el );
mAnchorsVisited.resize( mAnchors.size() * sizeof( bool ) );
@@ -1307,7 +1324,8 @@
}
/*!
- From QGraphicsLayoutItem. If size hint for certain set of items cannot be defined, then it returns default size hint (0/100/1000)
+ From QGraphicsLayoutItem. If size hint for certain set of items cannot be defined,
+ then it returns default size hint (0/100/1000)
\param which desired size hint.
\param constraint optional constraint.
\return calculated size hint.
--- a/src/hbcore/layouts/hbanchorlayoutengine_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/layouts/hbanchorlayoutengine_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -34,17 +34,17 @@
#include <QtDebug>
#endif
-#define EPSILON 0.01f
-#define MAX_SIZE 0xffffff
+static const qreal EPSILON = 0.01f;
+static const qreal MAX_SIZE = 0xffffff;
-static inline bool myFuzzyCompare(double p1, double p2)
+static inline bool myFuzzyCompare(double p1, double p2) //krazy:exclude=typedefs
{
return (qAbs(p1 - p2) <= 0.0001);
}
-static inline bool myFuzzyCompare(float p1, float p2)
+static inline bool myFuzzyCompare(float p1, float p2) //krazy:exclude=typedefs
{
- return (qAbs(p1 - p2) <= EPSILON);
+ return (qAbs(p1 - p2) <= (float)EPSILON); //krazy:exclude=typedefs
}
@@ -60,7 +60,8 @@
static inline bool differentSignOrZero( qreal val1, qreal val2 )
{
- return ( ( val1 < EPSILON ) && ( val2 > -EPSILON ) ) || ( ( val1 > -EPSILON ) && ( val2 < EPSILON ) );
+ return ( ( val1 < EPSILON ) && ( val2 > -EPSILON ) ) ||
+ ( ( val1 > -EPSILON ) && ( val2 < EPSILON ) );
}
@@ -78,7 +79,11 @@
return &theAnchorLayoutSimplyfier;
}
-bool AnchorLayoutEngine::processItems( QList<GraphEdge*> *edges, QList<GraphVertex*> *vertices, VariableSet *vs, QList<Expression*> *el )
+bool AnchorLayoutEngine::processItems(
+ QList<GraphEdge*> *edges,
+ QList<GraphVertex*> *vertices,
+ VariableSet *vs,
+ QList<Expression*> *el )
{
bool result = true;
@@ -122,7 +127,8 @@
break;
}
- if( ( oldEdgesNumber == edges->size() ) && ( oldVerticesNumber == vertices->size() ) ) {
+ if( ( oldEdgesNumber == edges->size() ) &&
+ ( oldVerticesNumber == vertices->size() ) ) {
state = SPLIT_1;
break;
}
@@ -157,7 +163,8 @@
return result;
}
-GraphVertex *AnchorLayoutEngine::nextVertex( GraphVertex *currentVertex, GraphEdge *currentEdge, int *sign )
+GraphVertex *AnchorLayoutEngine::nextVertex(
+ GraphVertex *currentVertex, GraphEdge *currentEdge, int *sign )
{
if( currentEdge->startVertex == currentVertex ) {
*sign = 1;
@@ -175,7 +182,8 @@
return currentVertex->edges.at(0);
}
-bool AnchorLayoutEngine::findSerialChains( QList<GraphEdge*> *edges, QList<GraphVertex*> *vertices, QList<Expression*> *el )
+bool AnchorLayoutEngine::findSerialChains(
+ QList<GraphEdge*> *edges, QList<GraphVertex*> *vertices, QList<Expression*> *el )
{
bool result = true;
@@ -245,7 +253,8 @@
qDebug() << "Adding one more left edge";
#endif //HBANCHORLAYOUT_DEBUG
- } while( ( currentVertex != initialVertex ) && ( currentVertex->edges.size() == 2 ) && ( ! currentVertex->special ) );
+ } while( ( currentVertex != initialVertex ) &&
+ ( currentVertex->edges.size() == 2 ) && ( ! currentVertex->special ) );
if( currentVertex == initialVertex ) {
el->append( expr );
@@ -331,6 +340,7 @@
i--;
}
+ delete initialVertex;
continue;
}
@@ -373,7 +383,11 @@
}
-bool AnchorLayoutEngine::findParallelChains( QList<GraphEdge*> *edges, QList<GraphVertex*> *vertices, VariableSet *vs, QList<Expression*> *el )
+bool AnchorLayoutEngine::findParallelChains(
+ QList<GraphEdge*> *edges,
+ QList<GraphVertex*> *vertices,
+ VariableSet *vs,
+ QList<Expression*> *el )
{
Q_UNUSED( vertices );
bool result = true;
@@ -407,10 +421,12 @@
compared = edges->at(j);
found = false;
- if( ( current->startVertex == compared->startVertex ) && ( current->endVertex == compared->endVertex ) ) {
+ if( ( current->startVertex == compared->startVertex ) &&
+ ( current->endVertex == compared->endVertex ) ) {
found = true;
sign = 1;
- } else if( ( current->startVertex == compared->endVertex ) && ( current->endVertex == compared->startVertex ) ) {
+ } else if( ( current->startVertex == compared->endVertex ) &&
+ ( current->endVertex == compared->startVertex ) ) {
found = true;
sign = -1;
}
@@ -468,12 +484,17 @@
newEdgeSizeProp->pref = sign * compared->expr->prefValue();
newEdgeSizeProp->flags |= SizeProperty::FlagFixed;
} else {
- if( sign * compared->expr->minValue() < sign * compared->expr->maxValue() ) {
- newEdgeSizeProp->min = qMax( newEdgeSizeProp->min, sign * compared->expr->minValue() );
- newEdgeSizeProp->max = qMin( newEdgeSizeProp->max, sign * compared->expr->maxValue() );
+ if( sign * compared->expr->minValue() <
+ sign * compared->expr->maxValue() ) {
+ newEdgeSizeProp->min =
+ qMax( newEdgeSizeProp->min, sign * compared->expr->minValue() );
+ newEdgeSizeProp->max =
+ qMin( newEdgeSizeProp->max, sign * compared->expr->maxValue() );
} else {
- newEdgeSizeProp->min = qMax( newEdgeSizeProp->min, sign * compared->expr->maxValue() );
- newEdgeSizeProp->max = qMin( newEdgeSizeProp->max, sign * compared->expr->minValue() );
+ newEdgeSizeProp->min =
+ qMax( newEdgeSizeProp->min, sign * compared->expr->maxValue() );
+ newEdgeSizeProp->max =
+ qMin( newEdgeSizeProp->max, sign * compared->expr->minValue() );
}
if( comparedEdgeFlags & SizeProperty::FlagExpanding ) {
expandingPrefValues.append( sign * compared->expr->prefValue() );
@@ -499,7 +520,8 @@
delete compared;
} else {
if( comparedEdgeFlags & SizeProperty::FlagFixed ) {
- if( ! myFuzzyCompare( newEdgeSizeProp->pref, sign * compared->expr->prefValue() ) ) {
+ if( ! myFuzzyCompare( newEdgeSizeProp->pref,
+ sign * compared->expr->prefValue() ) ) {
#ifdef HBANCHORLAYOUT_DEBUG
qDebug()<< "!!! two different parallel fixed items";
#endif //HBANCHORLAYOUT_DEBUG
@@ -543,19 +565,23 @@
if( ~newEdgeSizeProp->flags & SizeProperty::FlagFixed ) {
int expectedPref = 0;
if( expandingPrefValues.size() < numberOfParallelEdges ) {
- expectedPref = static_cast<int>(newEdgeSizeProp->pref / ( numberOfParallelEdges - expandingPrefValues.size() ));
+ expectedPref = static_cast<int>(newEdgeSizeProp->pref /
+ ( numberOfParallelEdges - expandingPrefValues.size() ));
}
qSort( expandingPrefValues );
- if( ( !expandingPrefValues.isEmpty() ) && ( qAbs( expandingPrefValues.last() ) < qAbs( expandingPrefValues.first() ) ) ) {
- qSort( expandingPrefValues.begin(), expandingPrefValues.end(), qGreater<qreal>() );
+ if( ( !expandingPrefValues.isEmpty() ) &&
+ ( qAbs( expandingPrefValues.last() ) < qAbs( expandingPrefValues.first() ) ) ) {
+ qSort( expandingPrefValues.begin(),
+ expandingPrefValues.end(), qGreater<qreal>() );
}
while( expandingPrefValues.size() > 0 ) {
if( qAbs( expandingPrefValues.last() ) > qAbs( expectedPref ) ) {
newEdgeSizeProp->pref += expandingPrefValues.last();
expandingPrefValues.removeLast();
- expectedPref = static_cast<int>(newEdgeSizeProp->pref / ( numberOfParallelEdges - expandingPrefValues.size() ));
+ expectedPref = static_cast<int>(newEdgeSizeProp->pref /
+ ( numberOfParallelEdges - expandingPrefValues.size() ));
} else {
break;
}
@@ -607,6 +633,7 @@
currentVertex = nextVertex( initialVertex, currentEdge, &sign );
vertices->removeOne( initialVertex );
+ delete initialVertex;
edges->removeOne( currentEdge );
while( ( currentVertex->edges.size() == 2 ) && ( ! currentVertex->special ) ) {
@@ -642,7 +669,8 @@
return result;
}
-void AnchorLayoutEngine::attachToLayout( GraphVertex *start, GraphVertex *middle, GraphVertex *end, Variable *layoutVar,
+void AnchorLayoutEngine::attachToLayout(
+ GraphVertex *start, GraphVertex *middle, GraphVertex *end, Variable *layoutVar,
QList<Expression*> *el )
{
GraphEdge *current;
@@ -689,11 +717,15 @@
// else some compare and indicate error
} else if( ~layoutVar->sizeProp.flags & SizeProperty::FlagFixed ) {
if( current->expr->minValue() / se.mCoef < current->expr->maxValue() / se.mCoef ) {
- layoutVar->sizeProp.min = qMax( layoutVar->sizeProp.min, current->expr->minValue() / se.mCoef );
- layoutVar->sizeProp.max = qMin( layoutVar->sizeProp.max, current->expr->maxValue() / se.mCoef );
+ layoutVar->sizeProp.min =
+ qMax( layoutVar->sizeProp.min, current->expr->minValue() / se.mCoef );
+ layoutVar->sizeProp.max =
+ qMin( layoutVar->sizeProp.max, current->expr->maxValue() / se.mCoef );
} else {
- layoutVar->sizeProp.min = qMax( layoutVar->sizeProp.min, current->expr->maxValue() / se.mCoef );
- layoutVar->sizeProp.max = qMin( layoutVar->sizeProp.max, current->expr->minValue() / se.mCoef );
+ layoutVar->sizeProp.min =
+ qMax( layoutVar->sizeProp.min, current->expr->maxValue() / se.mCoef );
+ layoutVar->sizeProp.max =
+ qMin( layoutVar->sizeProp.max, current->expr->minValue() / se.mCoef );
}
layoutVar->sizeProp.pref += qAbs( current->expr->prefValue() / se.mCoef );
}
@@ -732,12 +764,17 @@
}
// else some compare and indicate error
} else if( ~layoutVar->sizeProp.flags & SizeProperty::FlagFixed ) {
- if( current->expr->minValue() / se.mCoef < current->expr->maxValue() / se.mCoef ) {
- layoutVar->sizeProp.min = qMax( layoutVar->sizeProp.min, current->expr->minValue() / se.mCoef );
- layoutVar->sizeProp.max = qMin( layoutVar->sizeProp.max, current->expr->maxValue() / se.mCoef );
+ if( current->expr->minValue() /
+ se.mCoef < current->expr->maxValue() / se.mCoef ) {
+ layoutVar->sizeProp.min =
+ qMax( layoutVar->sizeProp.min, current->expr->minValue() / se.mCoef );
+ layoutVar->sizeProp.max =
+ qMin( layoutVar->sizeProp.max, current->expr->maxValue() / se.mCoef );
} else {
- layoutVar->sizeProp.min = qMax( layoutVar->sizeProp.min, current->expr->maxValue() / se.mCoef );
- layoutVar->sizeProp.max = qMin( layoutVar->sizeProp.max, current->expr->minValue() / se.mCoef );
+ layoutVar->sizeProp.min =
+ qMax( layoutVar->sizeProp.min, current->expr->maxValue() / se.mCoef );
+ layoutVar->sizeProp.max =
+ qMin( layoutVar->sizeProp.max, current->expr->minValue() / se.mCoef );
}
layoutVar->sizeProp.pref += qAbs( current->expr->prefValue() / se.mCoef );
}
@@ -758,7 +795,13 @@
}
}
-void AnchorLayoutEngine::cleanUp( GraphVertex *start, GraphVertex *middle, GraphVertex *end, QList<GraphEdge*> *edges, QList<GraphVertex*> *vertices, QList<Expression*> *el )
+void AnchorLayoutEngine::cleanUp(
+ GraphVertex *start,
+ GraphVertex *middle,
+ GraphVertex *end,
+ QList<GraphEdge*> *edges,
+ QList<GraphVertex*> *vertices,
+ QList<Expression*> *el )
{
if( start ) {
vertices->removeOne( start );
@@ -785,7 +828,10 @@
}
-bool AnchorLayoutEngine::splitVertices( QList<GraphEdge*> *edges, QList<GraphVertex*> *vertices, int level )
+bool AnchorLayoutEngine::splitVertices(
+ QList<GraphEdge*> *edges,
+ QList<GraphVertex*> *vertices,
+ int level )
{
bool result = false;
GraphEdge *newEdge, *current, *edgeToModify;
@@ -879,7 +925,10 @@
}
-bool AnchorLayoutEngine::solveEquation( QList<Expression*> *elOriginal, VariableSet *vs, Solution *solution )
+bool AnchorLayoutEngine::solveEquation(
+ QList<Expression*> *elOriginal,
+ VariableSet *vs,
+ Solution *solution )
{
enum State {
CheckEquationsNum,
@@ -984,7 +1033,8 @@
}
solution->insert( se.mVar, se.mVar->sizeProp.pref );
}
- } else if( ( ( pref < EPSILON ) && ( maxExp > pref ) ) || ( ( pref > -EPSILON ) && ( maxExp < pref ) ) ) {
+ } else if( ( ( pref < EPSILON ) && ( maxExp > pref ) ) ||
+ ( ( pref > -EPSILON ) && ( maxExp < pref ) ) ) {
for ( int i = 0; i < currentEquation->mExpression.size(); i++ ) {
SimpleExpression se = currentEquation->mExpression.at(i);
@@ -1033,7 +1083,8 @@
SimpleExpression se = currentEquation->mExpression.at(i);
qreal value;
- if ( ( se.mVar->sizeProp.flags & SizeProperty::FlagFixed ) || solution->contains( ( se.mVar ) ) ) {
+ if ( ( se.mVar->sizeProp.flags & SizeProperty::FlagFixed ) ||
+ solution->contains( ( se.mVar ) ) ) {
continue;
}
@@ -1150,7 +1201,8 @@
qreal value = - exp.value( solution ) / se.mCoef;
- if ( ( value - se.mVar->sizeProp.min < -EPSILON ) || ( value - se.mVar->sizeProp.max > EPSILON ) ) {
+ if ( ( value - se.mVar->sizeProp.min < -EPSILON ) ||
+ ( value - se.mVar->sizeProp.max > EPSILON ) ) {
#ifdef HBANCHORLAYOUT_DEBUG
qDebug( "cannot solve: min=%lf, max=%lf, value=%lf", se.mVar->sizeProp.min, se.mVar->sizeProp.max, value );
#endif
@@ -1268,7 +1320,8 @@
for ( int i = 0; i < mExpression.size(); i++ ) {
isFixed = isFixed && ( mExpression.at(i).mVar->sizeProp.flags & SizeProperty::FlagFixed );
- isExpanding = ( isExpanding ) || ( mExpression.at(i).mVar->sizeProp.flags & SizeProperty::FlagExpanding );
+ isExpanding = ( isExpanding ) ||
+ ( mExpression.at(i).mVar->sizeProp.flags & SizeProperty::FlagExpanding );
}
if( isFixed ) {
@@ -1392,7 +1445,9 @@
if ( currentExpression.mVar->sizeProp.flags & SizeProperty::FlagFixed ) {
result += currentExpression.mVar->sizeProp.pref * currentExpression.mCoef;
} else {
- result += qMin( currentExpression.mVar->sizeProp.max * currentExpression.mCoef, currentExpression.mVar->sizeProp.min * currentExpression.mCoef );
+ result += qMin( currentExpression.mVar->sizeProp.max *
+ currentExpression.mCoef,
+ currentExpression.mVar->sizeProp.min * currentExpression.mCoef );
}
}
@@ -1426,7 +1481,9 @@
if ( currentExpression.mVar->sizeProp.flags & SizeProperty::FlagFixed ) {
result += currentExpression.mVar->sizeProp.pref * currentExpression.mCoef;
} else {
- result += qMax( currentExpression.mVar->sizeProp.max * currentExpression.mCoef, currentExpression.mVar->sizeProp.min * currentExpression.mCoef );
+ result += qMax( currentExpression.mVar->sizeProp.max *
+ currentExpression.mCoef,
+ currentExpression.mVar->sizeProp.min * currentExpression.mCoef );
}
}
@@ -1447,7 +1504,9 @@
} else if ( solution->contains( ( currentExpression.mVar ) ) ) {
result += solution->value( ( currentExpression.mVar ) ) * currentExpression.mCoef;
} else {
- result += qMin( currentExpression.mVar->sizeProp.max * currentExpression.mCoef, currentExpression.mVar->sizeProp.min * currentExpression.mCoef );
+ result += qMin( currentExpression.mVar->sizeProp.max *
+ currentExpression.mCoef,
+ currentExpression.mVar->sizeProp.min * currentExpression.mCoef );
}
}
@@ -1487,7 +1546,9 @@
} else if ( solution->contains( ( currentExpression.mVar ) ) ) {
result += solution->value( ( currentExpression.mVar ) ) * currentExpression.mCoef;
} else {
- result += qMax( currentExpression.mVar->sizeProp.max * currentExpression.mCoef, currentExpression.mVar->sizeProp.min * currentExpression.mCoef );
+ result += qMax( currentExpression.mVar->sizeProp.max *
+ currentExpression.mCoef,
+ currentExpression.mVar->sizeProp.min * currentExpression.mCoef );
}
}
@@ -1530,13 +1591,15 @@
res += " + ";
}
if( mExpression.at(i).mVar->sizeProp.flags & SizeProperty::FlagFixed ) {
- res += '(' + QString::number( mExpression.at(i).mCoef ) + ')' + "var[" + QString::number( mExpression.at(i).mVar->mId ) + ']' + "(" +
+ res += '(' + QString::number( mExpression.at(i).mCoef ) +
+ ')' + "var[" + QString::number( mExpression.at(i).mVar->mId ) + ']' + '(' +
QString::number( mExpression.at(i).mVar->sizeProp.pref ) + "|f)";
} else {
- res += '(' + QString::number( mExpression.at(i).mCoef ) + ')' + "var[" + QString::number( mExpression.at(i).mVar->mId ) + ']' + "(" +
- QString::number( mExpression.at(i).mVar->sizeProp.min ) + "," +
- QString::number( mExpression.at(i).mVar->sizeProp.pref ) + "," +
- QString::number( mExpression.at(i).mVar->sizeProp.max ) + ")";
+ res += '(' + QString::number( mExpression.at(i).mCoef ) +
+ ')' + "var[" + QString::number( mExpression.at(i).mVar->mId ) + ']' + '(' +
+ QString::number( mExpression.at(i).mVar->sizeProp.min ) + ',' +
+ QString::number( mExpression.at(i).mVar->sizeProp.pref ) + ',' +
+ QString::number( mExpression.at(i).mVar->sizeProp.max ) + ')';
}
}
return res;
--- a/src/hbcore/layouts/hbmeshlayout_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/layouts/hbmeshlayout_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -23,11 +23,6 @@
**
****************************************************************************/
-#include <QDebug>
-#include <QList>
-#include <QWidget>
-
-
#include "hbmeshlayout_p.h"
#include "hbmeshlayoutdebug_p.h"
@@ -35,6 +30,10 @@
#include "hblayoututils_p.h"
#include "hbanchor_p.h"
+#include <QDebug>
+#include <QList>
+#include <QWidget>
+
//Uncomment next define in order to get more debug prints.
//Similar define exists also in the engine side.
//#define HBMESHLAYOUT_DEBUG
@@ -201,7 +200,11 @@
void setSizeProp( SizeProperty *v, QGraphicsLayoutItem *item, EdgeType type );
GraphVertex *createCenterEdge( EdgeType type, QGraphicsLayoutItem *item, Hb::Edge edge );
- void defineNextGeometry( const int itemIndexStart, const int itemIndexEnd, const int anchorIndex, const int definedItemIndex );
+ void defineNextGeometry(
+ const int itemIndexStart,
+ const int itemIndexEnd,
+ const int anchorIndex,
+ const int definedItemIndex );
QSizeF sizeHint(Qt::SizeHint which);
@@ -267,8 +270,9 @@
\class HbMeshLayoutPrivate
\internal
*/
-HbMeshLayoutPrivate::HbMeshLayoutPrivate() : mEquationsDirty(false), mValid(true), mInvalidateCalled( false ), mWrongAnchors( false ),
- mUsedRect( 0, 0, 0, 0 ), mLayoutVarH( 0 ), mLayoutVarV( 0 )
+HbMeshLayoutPrivate::HbMeshLayoutPrivate() :
+ mEquationsDirty(false), mValid(true), mInvalidateCalled( false ), mWrongAnchors( false ),
+ mUsedRect( 0, 0, 0, 0 ), mLayoutVarH( 0 ), mLayoutVarV( 0 )
{
}
@@ -447,7 +451,8 @@
}
-GraphVertex *HbMeshLayoutPrivate::createCenterEdge( EdgeType type, QGraphicsLayoutItem *item, Hb::Edge edge )
+GraphVertex *HbMeshLayoutPrivate::createCenterEdge(
+ EdgeType type, QGraphicsLayoutItem *item, Hb::Edge edge )
{
GraphVertex *middle;
GraphVertex *start = 0;
@@ -561,7 +566,11 @@
return middle;
}
-void HbMeshLayoutPrivate::defineNextGeometry( const int itemIndexStart, const int itemIndexEnd, const int anchorIndex, const int definedItemIndex )
+void HbMeshLayoutPrivate::defineNextGeometry(
+ const int itemIndexStart,
+ const int itemIndexEnd,
+ const int anchorIndex,
+ const int definedItemIndex )
{
ItemGeometry *knownItemGeom, *unKnownItemGeom;
Hb::Edge knownEdge, unKnownEdge;
@@ -588,10 +597,12 @@
if( isHorizontal ) {
mGeometryDefinedH[itemIndexEnd] = true;
- itemSize = mSolutionHorizontal.value( mVariablesHorizontal.findVariable( mActualItems.at(itemIndexEnd) ) );
+ itemSize = mSolutionHorizontal.value(
+ mVariablesHorizontal.findVariable( mActualItems.at(itemIndexEnd) ) );
} else {
mGeometryDefinedV[itemIndexEnd] = true;
- itemSize = mSolutionVertical.value( mVariablesVertical.findVariable( mActualItems.at(itemIndexEnd) ) );
+ itemSize = mSolutionVertical.value(
+ mVariablesVertical.findVariable( mActualItems.at(itemIndexEnd) ) );
}
sign = 1;
@@ -604,10 +615,12 @@
if( isHorizontal ) {
mGeometryDefinedH[itemIndexStart] = true;
- itemSize = mSolutionHorizontal.value( mVariablesHorizontal.findVariable( mActualItems.at(itemIndexStart) ) );
+ itemSize = mSolutionHorizontal.value(
+ mVariablesHorizontal.findVariable( mActualItems.at(itemIndexStart) ) );
} else {
mGeometryDefinedV[itemIndexStart] = true;
- itemSize = mSolutionVertical.value( mVariablesVertical.findVariable( mActualItems.at(itemIndexStart) ) );
+ itemSize = mSolutionVertical.value(
+ mVariablesVertical.findVariable( mActualItems.at(itemIndexStart) ) );
}
sign = -1;
@@ -1014,9 +1027,11 @@
itemStart = 0;
itemEnd = 0;
for( int j = 0; j < vertices->size(); j++ ) {
- if( ( vertices->at(j)->itemRef == anchor->mStartItem ) && ( vertices->at(j)->itemSide == anchor->mStartEdge ) ) {
+ if( ( vertices->at(j)->itemRef == anchor->mStartItem ) &&
+ ( vertices->at(j)->itemSide == anchor->mStartEdge ) ) {
itemStart = vertices->at(j);
- } else if( ( vertices->at(j)->itemRef == anchor->mEndItem ) && ( vertices->at(j)->itemSide == anchor->mEndEdge ) ) {
+ } else if( ( vertices->at(j)->itemRef == anchor->mEndItem ) &&
+ ( vertices->at(j)->itemSide == anchor->mEndEdge ) ) {
itemEnd = vertices->at(j);
}
}
@@ -1080,7 +1095,8 @@
if( ! AnchorLayoutEngine::instance()->processItems( edges, vertices, vs, el ) ) {
mWrongAnchors = true;
- AnchorLayoutEngine::instance()->cleanUp( layoutStart, layoutMiddle, layoutEnd, edges, vertices, el );
+ AnchorLayoutEngine::instance()->cleanUp(
+ layoutStart, layoutMiddle, layoutEnd, edges, vertices, el );
#ifdef HBMESHLAYOUT_DEBUG
qDebug() << "FAIL! " << __LINE__;
#endif //HBMESHLAYOUT_DEBUG
@@ -1114,8 +1130,10 @@
layoutVar->sizeProp.pref = 100;
layoutVar->sizeProp.flags = 0;
- AnchorLayoutEngine::instance()->attachToLayout( layoutStart, layoutMiddle, layoutEnd, layoutVar, el );
- AnchorLayoutEngine::instance()->cleanUp( layoutStart, layoutMiddle, layoutEnd, edges, vertices, el );
+ AnchorLayoutEngine::instance()->attachToLayout(
+ layoutStart, layoutMiddle, layoutEnd, layoutVar, el );
+ AnchorLayoutEngine::instance()->cleanUp(
+ layoutStart, layoutMiddle, layoutEnd, edges, vertices, el );
mAnchorsVisited.resize( mAnchors.size() * sizeof( bool ) );
@@ -1290,7 +1308,8 @@
}
if( isAnchorNew ) {
- item = new HbAnchor(startItem, anchor.mStartEdge, 0 /*end item*/, anchor.mEndEdge, value);
+ item = new HbAnchor(
+ startItem, anchor.mStartEdge, 0 /*end item*/, anchor.mEndEdge, value);
} else {
item = anchors->at( count );
item->mStartItem = startItem;
@@ -1454,7 +1473,8 @@
\param spacing spacing value for all edges starting from (\a startId, \a startEdge).
\return true if success, false otherwise.
*/
-bool HbMeshLayout::setAnchor(const QString& startId, Edge startEdge, const QString& endId, Edge endEdge, qreal spacing)
+bool HbMeshLayout::setAnchor(
+ const QString& startId, Edge startEdge, const QString& endId, Edge endEdge, qreal spacing)
{
Q_D( HbMeshLayout );
@@ -1473,7 +1493,8 @@
return false;
}
-bool HbMeshLayout::setAnchor(const QString& startId, Edge startEdge, const QString& endId, Edge endEdge)
+bool HbMeshLayout::setAnchor(
+ const QString& startId, Edge startEdge, const QString& endId, Edge endEdge)
{
Q_D( HbMeshLayout );
--- a/src/hbcore/layouts/hbstackedlayout.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/layouts/hbstackedlayout.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -66,7 +66,7 @@
Constructor.
\param parent parent layout item.
*/
-HbStackedLayout::HbStackedLayout(QGraphicsLayoutItem * parent)
+HbStackedLayout::HbStackedLayout(QGraphicsLayoutItem *parent)
: QGraphicsLayout(parent), d(new HbStackedLayoutPrivate())
{
}
@@ -83,7 +83,7 @@
for (int i = count() - 1; i >= 0; --i) {
QGraphicsLayoutItem *item = itemAt(i);
// The following lines can be removed, but this removes the item
- // from the layout more efficiently than the implementation of
+ // from the layout more efficiently than the implementation of
// ~QGraphicsLayoutItem.
removeAt(i);
if (item) {
@@ -94,7 +94,7 @@
}
}
}
-
+
delete d;
}
@@ -128,7 +128,7 @@
*/
int HbStackedLayout::insertItem(int index, QGraphicsLayoutItem *item)
{
- if( !item ) {
+ if (!item) {
qWarning("HbStackedLayout::insertItem: item is NULL");
return -1;
}
@@ -160,7 +160,7 @@
*/
void HbStackedLayout::removeItem(QGraphicsLayoutItem *item)
{
- removeAt( indexOf( item ) );
+ removeAt(indexOf(item));
}
/*!
@@ -170,8 +170,8 @@
int HbStackedLayout::indexOf(QGraphicsLayoutItem *item) const
{
int c = d->mList.count();
- for ( int i = 0; i < c; i++ ) {
- if ( d->mList.at(i) == item ) {
+ for (int i = 0; i < c; i++) {
+ if (d->mList.at(i) == item) {
return i;
}
}
@@ -200,7 +200,7 @@
*/
void HbStackedLayout::removeAt(int index)
{
- if (index <0 || index >= d->mList.size()) {
+ if (index < 0 || index >= d->mList.size()) {
return;
}
itemAt(index)->setParentLayoutItem(0);
@@ -232,12 +232,12 @@
{
if (which == Qt::MaximumSize) {
// Sub items do not affect the maximum size hint.
- return QSizeF( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
+ return QSizeF(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
}
QSizeF sizeHint(0, 0);
int c = d->mList.count();
- for ( int i=0; i < c; ++i ) {
- QGraphicsLayoutItem* item = d->mList.at(i);
+ for (int i = 0; i < c; ++i) {
+ QGraphicsLayoutItem *item = d->mList.at(i);
QSizeF itemSize(item->effectiveSizeHint(which, constraint));
if (item->sizePolicy().horizontalPolicy() == QSizePolicy::Ignored) {
itemSize.setWidth(0);
@@ -245,7 +245,7 @@
if (item->sizePolicy().verticalPolicy() == QSizePolicy::Ignored) {
itemSize.setHeight(0);
}
- if ( itemSize.isValid() ) {
+ if (itemSize.isValid()) {
sizeHint = sizeHint.expandedTo(itemSize);
}
}
@@ -265,24 +265,24 @@
QGraphicsLayout::setGeometry(rect);
int c = d->mList.count();
- for ( int i=0; i < c; ++i ) {
- QGraphicsLayoutItem* item = d->mList.at(i);
+ for (int i = 0; i < c; ++i) {
+ QGraphicsLayoutItem *item = d->mList.at(i);
QSizeF itemMax = item->effectiveSizeHint(Qt::MaximumSize);
QSizeF itemMin = item->effectiveSizeHint(Qt::MinimumSize);
QRectF itemRect(rect);
// Have to check min and max "manually" in order
// to make mirroring work.
- if ( itemMax.width() < itemRect.width() ) {
- itemRect.setWidth( itemMax.width() );
+ if (itemMax.width() < itemRect.width()) {
+ itemRect.setWidth(itemMax.width());
}
- if ( itemMax.height() < itemRect.height() ) {
- itemRect.setHeight( itemMax.height() );
+ if (itemMax.height() < itemRect.height()) {
+ itemRect.setHeight(itemMax.height());
}
- if ( itemMin.width() > itemRect.width() ) {
- itemRect.setWidth( itemMin.width() );
+ if (itemMin.width() > itemRect.width()) {
+ itemRect.setWidth(itemMin.width());
}
- if ( itemMin.height() > itemRect.height() ) {
- itemRect.setHeight( itemMin.height() );
+ if (itemMin.height() > itemRect.height()) {
+ itemRect.setHeight(itemMin.height());
}
alignRect(itemRect, rect);
item->setGeometry(itemRect);
@@ -292,9 +292,9 @@
/*!
\internal
*/
-void HbStackedLayout::alignRect( QRectF &rect, const QRectF &boundingRect )
+void HbStackedLayout::alignRect(QRectF &rect, const QRectF &boundingRect)
{
if (HbApplication::layoutDirection() == Qt::RightToLeft) {
- rect.moveLeft( 2 * boundingRect.x() + boundingRect.width() - rect.x() - rect.width() );
+ rect.moveLeft(2 * boundingRect.x() + boundingRect.width() - rect.x() - rect.width());
}
}
--- a/src/hbcore/layouts/hbstackedlayout.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/layouts/hbstackedlayout.h Fri Jun 11 13:58:22 2010 +0300
@@ -54,7 +54,7 @@
virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
private:
- void alignRect( QRectF &rect, const QRectF &boundingRect );
+ void alignRect(QRectF &rect, const QRectF &boundingRect);
private:
// Disable copy constructor and assignment operator
--- a/src/hbcore/ovgeffects/hbvgbceffect.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgbceffect.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -63,8 +63,9 @@
void HbVgBcEffect::setBrightness(qreal brightness)
{
Q_D(HbVgBcEffect);
- if (d->brightness == brightness)
+ if (d->brightness == brightness) {
return;
+ }
d->brightness = brightness;
updateEffect();
emit brightnessChanged(brightness);
@@ -79,8 +80,9 @@
void HbVgBcEffect::setContrast(qreal contrast)
{
Q_D(HbVgBcEffect);
- if (d->contrast == contrast)
+ if (d->contrast == contrast) {
return;
+ }
d->contrast = contrast;
updateEffect();
emit contrastChanged(contrast);
@@ -92,9 +94,9 @@
}
void HbVgBcEffect::performEffect(QPainter *painter,
- const QPointF &offset,
- const QVariant &vgImage,
- const QSize &vgImageSize)
+ const QPointF &offset,
+ const QVariant &vgImage,
+ const QSize &vgImageSize)
{
#ifdef HB_EFFECTS_OPENVG
QPixmap cachedPm = cached(vgImageSize);
@@ -112,11 +114,11 @@
// brightness [-1, 1]
const VGfloat offset_br = clamp(d->brightness, -1.0f, 1.0f);
const VGfloat scale_br = 1.0f - 0.5f * ((offset_br < 0.0f) ? -offset_br : offset_br);
-
+
// contrast [0, N]
const VGfloat scale_con = clamp(d->contrast, 0.0f, 100.0f);
const VGfloat offset_con = -0.5f * scale_con + 0.5f ;
-
+
// combine the effects of brightness and contrast
const VGfloat off = offset_br + offset_con;
const VGfloat sc = scale_br * scale_con;
@@ -125,7 +127,7 @@
const VGfloat o = (VGfloat) opacity;
const VGfloat oOff = off * o;
const VGfloat oSc = (sc * o) + (1.0f - o);
-
+
d->colorMatrix[0] = oSc;
d->colorMatrix[1] = 0.0f;
d->colorMatrix[2] = 0.0f;
--- a/src/hbcore/ovgeffects/hbvgblureffect.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgblureffect.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -63,8 +63,9 @@
void HbVgBlurEffect::setRadius(const QPointF &radius)
{
Q_D(HbVgBlurEffect);
- if (d->radius == radius)
+ if (d->radius == radius) {
return;
+ }
d->radius = radius;
updateEffectBoundingRect();
emit radiusChanged(radius);
@@ -73,9 +74,9 @@
QRectF HbVgBlurEffect::boundingRectFor(const QRectF &rect) const
{
Q_D(const HbVgBlurEffect);
- QSizeF mappedRadius = d->mapSize(QSizeF(d->radius.x(), d->radius.y()));
- qreal deltaX = mappedRadius.width();
- qreal deltaY = mappedRadius.height();
+ QSizeF mappedRadius = d->mapSize(QSizeF(d->radius.x(), d->radius.y()));
+ qreal deltaX = mappedRadius.width();
+ qreal deltaY = mappedRadius.height();
return rect.adjusted(-deltaX, -deltaY, deltaX, deltaY);
}
@@ -105,8 +106,9 @@
{
#ifdef HB_EFFECTS_OPENVG
QPixmap cachedPm = cached(vgImageSize);
- if (!cachedPm.isNull())
+ if (!cachedPm.isNull()) {
return cachedPm;
+ }
Q_D(HbVgBlurEffect);
VGImage srcImage = vgImage.value<VGImage>();
@@ -119,14 +121,15 @@
VGImage tmpImage = d->ensurePixmap(&d->tmpPixmap, vgImageSize);
vgGaussianBlur(tmpImage, srcImage, blurX, blurY, VG_TILE_PAD);
if (d->paramsChanged) {
- for (int i = 0; i < 256; ++i)
- d->alphaLUT[i] = (VGubyte) (i * opacity);
+ for (int i = 0; i < 256; ++i) {
+ d->alphaLUT[i] = (VGubyte)(i * opacity);
+ }
}
vgLookup(dstImage, tmpImage,
identityLUT, identityLUT, identityLUT, d->alphaLUT,
VG_TRUE, VG_FALSE);
} else {
- vgGaussianBlur(dstImage, srcImage, blurX, blurY, VG_TILE_PAD);
+ vgGaussianBlur(dstImage, srcImage, blurX, blurY, VG_TILE_PAD);
}
tryCache(d->dstPixmap);
--- a/src/hbcore/ovgeffects/hbvgblureffect_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgblureffect_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -45,7 +45,9 @@
public slots:
void setRadius(const QPointF &radius);
- inline void setRadius(qreal x, qreal y) { setRadius(QPointF(x, y)); }
+ inline void setRadius(qreal x, qreal y) {
+ setRadius(QPointF(x, y));
+ }
signals:
void radiusChanged(const QPointF &radius);
--- a/src/hbcore/ovgeffects/hbvgchainedeffect.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgchainedeffect.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -144,23 +144,28 @@
QRectF HbVgChainedEffect::boundingRectFor(const QRectF &rect) const
{
Q_D(const HbVgChainedEffect);
- if (d->effects.empty())
+ if (d->effects.empty()) {
return rect;
+ }
// find out the bounding rect that covers all the effects
QRectF result;
- foreach (HbVgEffect *effect, d->effects) {
+ foreach(HbVgEffect * effect, d->effects) {
QRectF br = effect->boundingRectFor(rect);
if (result.isNull()) {
result = br;
} else {
- if (br.left() < result.left())
+ if (br.left() < result.left()) {
result.setLeft(br.left());
- if (br.top() < result.top())
+ }
+ if (br.top() < result.top()) {
result.setTop(br.top());
- if (br.right() > result.right())
+ }
+ if (br.right() > result.right()) {
result.setRight(br.right());
- if (br.bottom() > result.bottom())
+ }
+ if (br.bottom() > result.bottom()) {
result.setBottom(br.bottom());
+ }
}
}
return result;
@@ -176,7 +181,7 @@
{
#ifdef HB_EFFECTS_OPENVG
Q_D(HbVgChainedEffect);
- foreach (HbVgEffect *effect, d->effects) {
+ foreach(HbVgEffect * effect, d->effects) {
// Set up srcPixmap and others for the individual effects
// because the base class does it only for us, not for the
// contained ones.
@@ -189,8 +194,9 @@
effD->paramsChanged = effD->cacheInvalidated = false;
}
// If there are no effects in the chain then just draw the source.
- if (d->effects.isEmpty())
+ if (d->effects.isEmpty()) {
painter->drawPixmap(offset, d->srcPixmap);
+ }
#else
Q_UNUSED(painter);
@@ -207,7 +213,7 @@
{
// Distribute the new value of cacheInvalidated to all the
// contained effects.
- foreach (HbVgEffect *effect, effects) {
+ foreach(HbVgEffect * effect, effects) {
HbVgEffectPrivate *effD = HbVgEffectPrivate::d_ptr(effect);
effD->cacheInvalidated = true;
effD->notifyCacheInvalidated();
--- a/src/hbcore/ovgeffects/hbvgcolorizeeffect.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgcolorizeeffect.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -63,8 +63,9 @@
void HbVgColorizeEffect::setColor(const QColor &color)
{
Q_D(HbVgColorizeEffect);
- if (d->color == color)
+ if (d->color == color) {
return;
+ }
d->color = color;
updateEffect();
emit colorChanged(color);
@@ -82,25 +83,25 @@
const VGfloat Bw = 0.0820f;
void HbVgColorizeEffectPrivate::getColorMatrix(VGfloat *colorMatrix,
- const QColor &color,
- qreal opacity)
+ const QColor &color,
+ qreal opacity)
{
const VGfloat o = (VGfloat) opacity;
const VGfloat ao = 1 - o;
const VGfloat R = (o / 255.0f) * (VGfloat) color.red();
const VGfloat G = (o / 255.0f) * (VGfloat) color.green();
const VGfloat B = (o / 255.0f) * (VGfloat) color.blue();
- colorMatrix[0] = R*Rw + ao;
- colorMatrix[1] = G*Rw;
- colorMatrix[2] = B*Rw;
+ colorMatrix[0] = R * Rw + ao;
+ colorMatrix[1] = G * Rw;
+ colorMatrix[2] = B * Rw;
colorMatrix[3] = 0.0f;
- colorMatrix[4] = R*Gw;
- colorMatrix[5] = G*Gw + ao;
- colorMatrix[6] = B*Gw;
+ colorMatrix[4] = R * Gw;
+ colorMatrix[5] = G * Gw + ao;
+ colorMatrix[6] = B * Gw;
colorMatrix[7] = 0.0f;
- colorMatrix[8] = R*Bw;
- colorMatrix[9] = G*Bw;
- colorMatrix[10] = B*Bw + ao;
+ colorMatrix[8] = R * Bw;
+ colorMatrix[9] = G * Bw;
+ colorMatrix[10] = B * Bw + ao;
colorMatrix[11] = 0.0f;
colorMatrix[12] = 0.0f;
colorMatrix[13] = 0.0f;
@@ -109,15 +110,15 @@
colorMatrix[16] = 0.0f;
colorMatrix[17] = 0.0f;
colorMatrix[18] = 0.0f;
- colorMatrix[19] = 0.0f;
+ colorMatrix[19] = 0.0f;
}
#endif
void HbVgColorizeEffect::performEffect(QPainter *painter,
- const QPointF &offset,
- const QVariant &vgImage,
- const QSize &vgImageSize)
+ const QPointF &offset,
+ const QVariant &vgImage,
+ const QSize &vgImageSize)
{
#ifdef HB_EFFECTS_OPENVG
QPixmap cachedPm = cached(vgImageSize);
@@ -131,8 +132,9 @@
VGImage dstImage = d->ensurePixmap(&d->dstPixmap, vgImageSize);
qreal opacity = clamp(d->opacity, 0.0f, 1.0f);
if (opacity > HBVG_EPSILON) {
- if (d->paramsChanged)
+ if (d->paramsChanged) {
HbVgColorizeEffectPrivate::getColorMatrix(d->colorMatrix, d->color, opacity);
+ }
vgColorMatrix(dstImage, srcImage, d->colorMatrix);
painter->drawPixmap(offset, d->dstPixmap);
tryCache(d->dstPixmap);
--- a/src/hbcore/ovgeffects/hbvgeffect.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgeffect.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -40,7 +40,7 @@
* \brief Abstract base class for OpenVG effects.
*
* \internal
- *
+ *
* Brief guide for creating new effects:
* <ul>
*
@@ -122,10 +122,11 @@
*
* \internal
*/
-VGImage HbVgEffectPrivate::ensurePixmap(QPixmap *pixmap, const QSize& size)
+VGImage HbVgEffectPrivate::ensurePixmap(QPixmap *pixmap, const QSize &size)
{
- if (pixmap->size() != size)
+ if (pixmap->size() != size) {
*pixmap = QPixmap(size);
+ }
return qPixmapToVGImage(*pixmap);
}
#endif
@@ -165,10 +166,11 @@
QGraphicsScene *scene = srcItem->scene();
if (scene) {
QList<QGraphicsView *> views = scene->views();
- foreach (QGraphicsView *view, views) {
+ foreach(QGraphicsView * view, views) {
mainWindow = qobject_cast<HbMainWindow *>(view);
- if (mainWindow)
+ if (mainWindow) {
break;
+ }
}
}
}
@@ -190,7 +192,7 @@
}
return lastRotationTransform;
}
-
+
/*!
* Maps the given translation offset to an offset that is based on the current
* rotation of the graphics view. Effects are drawing directly, in device
@@ -349,8 +351,9 @@
void HbVgEffect::setOpacity(qreal opacity)
{
Q_D(HbVgEffect);
- if (d->opacity == opacity)
+ if (d->opacity == opacity) {
return;
+ }
d->opacity = opacity;
updateEffect();
emit opacityChanged(opacity);
@@ -367,7 +370,8 @@
{
// Just draw the source without effects if the painter's paint engine
// is not using OpenVG.
- if (painter->paintEngine()->type() != QPaintEngine::OpenVG) {
+ QPaintEngine *paintEngine = painter->paintEngine();
+ if (!paintEngine || paintEngine->type() != QPaintEngine::OpenVG) {
drawSource(painter);
return;
}
@@ -462,8 +466,9 @@
void HbVgEffect::setCaching(bool caching)
{
Q_D(HbVgEffect);
- if (d->caching == caching)
+ if (d->caching == caching) {
return;
+ }
d->caching = caching;
emit cachingChanged(caching);
}
@@ -492,8 +497,7 @@
// causes a clipping to the device viewport, therefore the cached
// pixmap for an item that was/is clipped should not be used.
if (QPixmapCache::find(key, &cachedPm)
- && (size.isNull() || cachedPm.size() == size))
- {
+ && (size.isNull() || cachedPm.size() == size)) {
#ifdef HBVG_TRACES
qDebug("HbVgEffect [%x]: cache hit", (int) this);
#endif
@@ -534,7 +538,7 @@
void HbVgEffect::releaseCachedResources()
{
QSet<QString> *keys = cacheKeys();
- foreach (const QString &key, *keys) {
+ foreach(const QString & key, *keys) {
QPixmapCache::remove(key);
}
keys->clear();
--- a/src/hbcore/ovgeffects/hbvgeffect_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgeffect_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -84,7 +84,7 @@
void draw(QPainter *painter);
void sourceChanged(ChangeFlags flags);
- HbVgEffectPrivate * const d_ptr;
+ HbVgEffectPrivate *const d_ptr;
Q_DECLARE_PRIVATE_D(d_ptr, HbVgEffect)
Q_DISABLE_COPY(HbVgEffect)
};
--- a/src/hbcore/ovgeffects/hbvgeffect_p_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgeffect_p_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -74,7 +74,9 @@
QPointF mapOffset(const QPointF &point) const;
QSizeF mapSize(const QSizeF &size) const;
- static HbVgEffectPrivate *d_ptr(HbVgEffect *effect) { return effect->d_func(); }
+ static HbVgEffectPrivate *d_ptr(HbVgEffect *effect) {
+ return effect->d_func();
+ }
void ensureCacheInvalidated();
@@ -113,7 +115,7 @@
QPixmap dstPixmap;
QPixmap tmpPixmap;
-
+
// Root of the chain, null by default. If non-null then updates are
// delegated to this effect. Note that the sourceXxxx() functions in
// QGraphicsEffect are not valid for chained effects so call those functions
--- a/src/hbcore/ovgeffects/hbvgframeeffect.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgframeeffect.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -80,26 +80,30 @@
* \internal
*/
QRectF HbVgFrameEffectPrivate::deviceRectForSource(DeviceRectType type,
- QPaintDevice *pdev)
+ QPaintDevice *pdev)
{
Q_Q(HbVgFrameEffect);
QRectF br = type == IncludeChildren
- ? q->sourceBoundingRectForRoot()
- : q->sourceItemForRoot()->boundingRect();
+ ? q->sourceBoundingRectForRoot()
+ : q->sourceItemForRoot()->boundingRect();
QRect result = worldTransform.mapRect(br).toAlignedRect();
if (pdev) {
int left, top, right, bottom;
result.getCoords(&left, &top, &right, &bottom);
- if (left < 0)
+ if (left < 0) {
result.setX(0);
- if (top < 0)
+ }
+ if (top < 0) {
result.setY(0);
+ }
int deviceWidth = pdev->width();
int deviceHeight = pdev->height();
- if (right > deviceWidth - 1)
+ if (right > deviceWidth - 1) {
result.setRight(deviceWidth - 1);
- if (bottom > deviceHeight - 1)
+ }
+ if (bottom > deviceHeight - 1) {
result.setBottom(deviceHeight - 1);
+ }
}
return result;
}
@@ -127,8 +131,9 @@
void HbVgFrameEffect::setColor(const QColor &color)
{
Q_D(HbVgFrameEffect);
- if (d->color == color)
+ if (d->color == color) {
return;
+ }
d->color = color;
updateEffect();
emit colorChanged(color);
@@ -159,8 +164,9 @@
Q_UNUSED(vgImageSize);
Q_D(HbVgFrameEffect);
- if (d->hints & DrawSourceHint)
+ if (d->hints & DrawSourceHint) {
painter->drawPixmap(offset, d->srcPixmap);
+ }
painter->setOpacity(d->opacity);
painter->setPen(d->color);
painter->drawRect(d->deviceRectForSource(
--- a/src/hbcore/ovgeffects/hbvghsleffect.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvghsleffect.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -64,8 +64,9 @@
void HbVgHslEffect::setHue(qreal hue)
{
Q_D(HbVgHslEffect);
- if (d->hue == hue)
+ if (d->hue == hue) {
return;
+ }
d->hue = hue;
updateEffect();
emit hueChanged(hue);
@@ -80,8 +81,9 @@
void HbVgHslEffect::setSaturation(qreal saturation)
{
Q_D(HbVgHslEffect);
- if (d->saturation == saturation)
+ if (d->saturation == saturation) {
return;
+ }
d->saturation = saturation;
updateEffect();
emit saturationChanged(saturation);
@@ -96,8 +98,9 @@
void HbVgHslEffect::setLightness(qreal lightness)
{
Q_D(HbVgHslEffect);
- if (d->lightness == lightness)
+ if (d->lightness == lightness) {
return;
+ }
d->lightness = lightness;
updateEffect();
emit lightnessChanged(lightness);
@@ -118,28 +121,28 @@
#ifdef HB_EFFECTS_OPENVG
inline void getSaturationRotationMatrix(VGfloat *effectMatrix, VGfloat opacity,
- VGfloat saturation, VGfloat angle)
+ VGfloat saturation, VGfloat angle)
{
- const VGfloat sa = saturation;
+ const VGfloat sa = saturation;
const VGfloat as = 1.0f - saturation;
-
+
const VGfloat o = opacity;
const VGfloat ao = 1.0f - o;
-
+
const VGfloat c = qCos(angle);
const VGfloat s = qSin(angle);
-
- effectMatrix[0] = o * ((-0.02473f*as+0.66667f*sa)*c+ (0.30450f*as*s+(0.33333f*as+0.33333f*sa))) + ao;
- effectMatrix[1] = o * ((-0.02473f*as-0.33333f*sa)*c+((0.30450f*as+0.57736f*sa)*s+(0.33333f*as+0.33333f*sa)));
- effectMatrix[2] = o * ((-0.02473f*as-0.33333f*sa)*c+((0.30450f*as-0.57736f*sa)*s+(0.33333f*as+0.33333f*sa)));
+
+ effectMatrix[0] = o * ((-0.02473f * as + 0.66667f * sa) * c + (0.30450f * as * s + (0.33333f * as + 0.33333f * sa))) + ao;
+ effectMatrix[1] = o * ((-0.02473f * as - 0.33333f * sa) * c + ((0.30450f * as + 0.57736f * sa) * s + (0.33333f * as + 0.33333f * sa)));
+ effectMatrix[2] = o * ((-0.02473f * as - 0.33333f * sa) * c + ((0.30450f * as - 0.57736f * sa) * s + (0.33333f * as + 0.33333f * sa)));
effectMatrix[3] = 0.0f;
- effectMatrix[4] = o * ((0.27607f*as-0.33333f*sa)*c+((-0.13083f*as-0.57736f*sa)*s+(0.33333f*as+0.33333f*sa)));
- effectMatrix[5] = o * ((0.27607f*as+0.66667f*sa)*c+ (-0.13083f*as*s+(0.33333f*as+0.33333f*sa))) + ao;
- effectMatrix[6] = o * ((0.27607f*as-0.33333f*sa)*c+((-0.13083f*as+0.57736f*sa)*s+(0.33333f*as+0.33333f*sa)));
+ effectMatrix[4] = o * ((0.27607f * as - 0.33333f * sa) * c + ((-0.13083f * as - 0.57736f * sa) * s + (0.33333f * as + 0.33333f * sa)));
+ effectMatrix[5] = o * ((0.27607f * as + 0.66667f * sa) * c + (-0.13083f * as * s + (0.33333f * as + 0.33333f * sa))) + ao;
+ effectMatrix[6] = o * ((0.27607f * as - 0.33333f * sa) * c + ((-0.13083f * as + 0.57736f * sa) * s + (0.33333f * as + 0.33333f * sa)));
effectMatrix[7] = 0.0f;
- effectMatrix[8] = o * ((-0.25134f*as-0.33333f*sa)*c+((-0.17367f*as+0.57736f*sa)*s+(0.33333f*as+0.33333f*sa)));
- effectMatrix[9] = o * ((-0.25134f*as-0.33333f*sa)*c+((-0.17367f*as-0.57736f*sa)*s+(0.33333f*as+0.33333f*sa)));
- effectMatrix[10] = o * ((-0.25134f*as+0.66667f*sa)*c+ (-0.17367f*as*s+(0.33333f*as+0.33333f*sa))) + ao;
+ effectMatrix[8] = o * ((-0.25134f * as - 0.33333f * sa) * c + ((-0.17367f * as + 0.57736f * sa) * s + (0.33333f * as + 0.33333f * sa)));
+ effectMatrix[9] = o * ((-0.25134f * as - 0.33333f * sa) * c + ((-0.17367f * as - 0.57736f * sa) * s + (0.33333f * as + 0.33333f * sa)));
+ effectMatrix[10] = o * ((-0.25134f * as + 0.66667f * sa) * c + (-0.17367f * as * s + (0.33333f * as + 0.33333f * sa))) + ao;
effectMatrix[11] = 0.0f;
effectMatrix[12] = 0.0f;
effectMatrix[13] = 0.0f;
@@ -153,16 +156,16 @@
inline void getSaturationMatrix(VGfloat *effectMatrix, VGfloat opacity, VGfloat saturation)
{
- const VGfloat sa = saturation;
+ const VGfloat sa = saturation;
const VGfloat as = 1.0f - saturation;
-
+
const VGfloat o = opacity;
const VGfloat ao = 1.0f - o;
const VGfloat asRw = o * as * Rw;
const VGfloat asGw = o * as * Gw;
const VGfloat asBw = o * as * Bw;
-
+
effectMatrix[0] = asRw + sa + ao;
effectMatrix[1] = asRw;
effectMatrix[2] = asRw;
@@ -185,21 +188,21 @@
{
const VGfloat o = opacity;
const VGfloat ao = 1.0f - o;
-
+
const VGfloat c = qCos(angle);
const VGfloat s = qSin(angle);
-
- effectMatrix[0] = o * ( 0.66667f*c+0.33333f) + ao;
- effectMatrix[1] = o * (-0.33333f*c+(0.57736f*s+0.33333f));
- effectMatrix[2] = o * (-0.33333f*c+(-0.57736f*s+0.33333f));
+
+ effectMatrix[0] = o * (0.66667f * c + 0.33333f) + ao;
+ effectMatrix[1] = o * (-0.33333f * c + (0.57736f * s + 0.33333f));
+ effectMatrix[2] = o * (-0.33333f * c + (-0.57736f * s + 0.33333f));
effectMatrix[3] = 0.0f;
- effectMatrix[4] = o * (-0.33333f*c+(-0.57736f*s+0.33333f));
- effectMatrix[5] = o * ( 0.66667f*c+0.33333f) + ao;
- effectMatrix[6] = o * (-0.33333f*c+(0.57736f*s+0.33333f));
+ effectMatrix[4] = o * (-0.33333f * c + (-0.57736f * s + 0.33333f));
+ effectMatrix[5] = o * (0.66667f * c + 0.33333f) + ao;
+ effectMatrix[6] = o * (-0.33333f * c + (0.57736f * s + 0.33333f));
effectMatrix[7] = 0.0f;
- effectMatrix[8] = o * (-0.33333f*c+(0.57736f*s+0.33333f));
- effectMatrix[9] = o * (-0.33333f*c+(-0.57736f*s+0.33333f));
- effectMatrix[10] = o * (0.66667f*c+0.33333f) + ao;
+ effectMatrix[8] = o * (-0.33333f * c + (0.57736f * s + 0.33333f));
+ effectMatrix[9] = o * (-0.33333f * c + (-0.57736f * s + 0.33333f));
+ effectMatrix[10] = o * (0.66667f * c + 0.33333f) + ao;
effectMatrix[11] = 0.0f;
effectMatrix[12] = 0.0f;
effectMatrix[13] = 0.0f;
@@ -230,9 +233,9 @@
#endif // HB_EFFECTS_OPENVG
void HbVgHslEffect::performEffect(QPainter *painter,
- const QPointF &offset,
- const QVariant &vgImage,
- const QSize &vgImageSize)
+ const QPointF &offset,
+ const QVariant &vgImage,
+ const QSize &vgImageSize)
{
#ifdef HB_EFFECTS_OPENVG
QPixmap cachedPm = cached(vgImageSize);
@@ -250,13 +253,13 @@
// a helpful constant
const qreal radsPerDeg = 2.0f * (qreal) M_PI / 360.0f;
- // make sure parametres are in range
+ // make sure parameters are in range
const VGfloat o = (VGfloat) opacity;
const VGfloat angle = (VGfloat) clamp(d->hue * radsPerDeg, 0.0f, 2.0f * (qreal) M_PI); // angle [0, 2*pi]
const VGfloat saturation = (VGfloat) clamp(d->saturation, 0.0f, 100.0f); // saturation [0, N]
const VGfloat lightness = (VGfloat) clamp(d->lightness, -1.0f, 1.0f); // lightness [-1, 1]
-
- // check parametres which precalculated matrix we have to use.
+
+ // check parameters which precalculated matrix we have to use.
// Note: lightness affects offset and not matrix so we don't bother optimising that.
const bool enableSaturation = (saturation < 1.0f - HBVG_EPSILON || saturation > 1.0f + HBVG_EPSILON);
const bool enableHueRotation = (HBVG_EPSILON < angle && angle < (2.0f * (qreal) M_PI - HBVG_EPSILON));
@@ -265,12 +268,12 @@
// contains SaturateT*PrerotationT*HuerotationT*PostrotationT*I*opacity+I*(1-opacity) matrices
// --- ugly, but saves lot of operations in FPU.
// note: there are plenty of redundancy in these calculations
- // --- let compiler optimise them.
+ // --- let compiler optimize them.
getSaturationRotationMatrix(&d->colorMatrix[0], o, saturation, angle);
} else if (enableSaturation && !enableHueRotation) {
// saturationT*I*opacity+I*(1 - opacity) matrix without hue rotation
getSaturationMatrix(&d->colorMatrix[0], o, saturation);
- } else if(!enableSaturation && enableHueRotation) {
+ } else if (!enableSaturation && enableHueRotation) {
// PrerotationT*HuerotationT*PostrotationT*I*opacity+I*(1-opacity) matrices without saturation matrix
getRotationMatrix(&d->colorMatrix[0], o, angle);
} else {
--- a/src/hbcore/ovgeffects/hbvgmaskeffect.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgmaskeffect.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -141,8 +141,9 @@
void HbVgMaskEffect::setMaskCallback(MaskCallback callback, void *param)
{
Q_D(HbVgMaskEffect);
- if (d->maskCallback == callback)
+ if (d->maskCallback == callback) {
return;
+ }
clear();
d->maskCallback = callback;
d->maskCallbackParam = param;
@@ -176,8 +177,9 @@
void HbVgMaskEffect::setMaskRect(const QRectF &rect)
{
Q_D(HbVgMaskEffect);
- if (rect == d->maskRect && !d->maskRectIsInDeviceCoords)
+ if (rect == d->maskRect && !d->maskRectIsInDeviceCoords) {
return;
+ }
clear();
d->maskRect = rect;
d->maskRectIsInDeviceCoords = false;
@@ -193,8 +195,9 @@
void HbVgMaskEffect::setMaskDeviceRect(const QRectF &rect)
{
Q_D(HbVgMaskEffect);
- if (rect == d->maskRect && d->maskRectIsInDeviceCoords)
+ if (rect == d->maskRect && d->maskRectIsInDeviceCoords) {
return;
+ }
clear();
d->maskRect = rect;
d->maskRectIsInDeviceCoords = true;
@@ -233,15 +236,21 @@
Q_UNUSED(vgImage);
Q_D(HbVgMaskEffect);
+ if (!painter->paintEngine()) {
+ return;
+ }
+
// Initialize scaledMask if the mask has changed or the size of the source
// is different than before.
if (!d->mask.isNull()) {
- if (d->scaledMask.isNull())
+ if (d->scaledMask.isNull()) {
d->scaledMask = d->mask;
+ }
// Scale only when really needed, i.e. when the size is different than
// before (or there is a new mask).
- if (d->scaledMask.size() != vgImageSize)
+ if (d->scaledMask.size() != vgImageSize) {
d->scaledMask = d->mask.scaled(vgImageSize);
+ }
}
vgSeti(VG_MASKING, VG_TRUE);
@@ -276,8 +285,9 @@
} else if (d->maskCallback) {
// Invoke the callback but only if it has just been set or the size of
// the source is different than before.
- if (d->callbackResult.isNull() || d->callbackResult.size() != vgImageSize)
+ if (d->callbackResult.isNull() || d->callbackResult.size() != vgImageSize) {
d->callbackResult = d->maskCallback(vgImageSize, d->maskCallbackParam);
+ }
maskPtr = &d->callbackResult;
}
--- a/src/hbcore/ovgeffects/hbvgmaskeffect_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgmaskeffect_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -43,7 +43,7 @@
QRectF boundingRectFor(const QRectF &rect) const;
- typedef QPixmap (*MaskCallback)(const QSize &, void *);
+ typedef QPixmap(*MaskCallback)(const QSize &, void *);
QPixmap mask() const;
QPixmap scaledMask() const;
@@ -59,8 +59,12 @@
void setMask(const QPixmap &mask);
void setMaskRect(const QRectF &rect);
void setMaskDeviceRect(const QRectF &rect);
- inline void setMaskRect(int x, int y, int w, int h) { setMaskRect(QRectF(x, y, w, h)); }
- inline void setMaskDeviceRect(int x, int y, int w, int h) { setMaskDeviceRect(QRectF(x, y, w, h)); }
+ inline void setMaskRect(int x, int y, int w, int h) {
+ setMaskRect(QRectF(x, y, w, h));
+ }
+ inline void setMaskDeviceRect(int x, int y, int w, int h) {
+ setMaskDeviceRect(QRectF(x, y, w, h));
+ }
void setMaskCallback(MaskCallback callback, void *param = 0);
signals:
--- a/src/hbcore/ovgeffects/hbvgoutlineeffect.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgoutlineeffect.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -63,8 +63,9 @@
void HbVgOutlineEffect::setOutline(const QPointF &outline)
{
Q_D(HbVgOutlineEffect);
- if (d->outline == outline)
+ if (d->outline == outline) {
return;
+ }
d->outline = outline;
updateEffectBoundingRect();
emit outlineChanged(outline);
@@ -79,8 +80,9 @@
void HbVgOutlineEffect::setColor(const QColor &color)
{
Q_D(HbVgOutlineEffect);
- if (d->color == color)
+ if (d->color == color) {
return;
+ }
d->color = color;
updateEffect();
emit colorChanged(color);
@@ -95,8 +97,9 @@
void HbVgOutlineEffect::setSteepness(qreal steepness)
{
Q_D(HbVgOutlineEffect);
- if (d->steepness == steepness)
+ if (d->steepness == steepness) {
return;
+ }
d->steepness = steepness;
updateEffect();
emit steepnessChanged(steepness);
@@ -111,8 +114,9 @@
void HbVgOutlineEffect::setOffset(const QPointF &offset)
{
Q_D(HbVgOutlineEffect);
- if (d->offset == offset)
+ if (d->offset == offset) {
return;
+ }
d->offset = offset;
updateEffectBoundingRect();
emit offsetChanged(offset);
@@ -141,8 +145,9 @@
{
#ifdef HB_EFFECTS_OPENVG
QPixmap cachedPm = cached(vgImageSize);
- if (!cachedPm.isNull())
+ if (!cachedPm.isNull()) {
return cachedPm;
+ }
Q_D(HbVgOutlineEffect);
VGImage srcImage = vgImage.value<VGImage>();
@@ -150,14 +155,14 @@
if (d->paramsChanged) {
VGubyte stpc = (VGubyte) clamp(d->steepness, 0.0f, 32.0f);
- VGubyte unnormalisedOpacity = (VGubyte) (clamp(d->opacity, 0.0f, 1.0f) * 255.0f);
+ VGubyte unnormalisedOpacity = (VGubyte)(clamp(d->opacity, 0.0f, 1.0f) * 255.0f);
for (int i = 0; i < 256; ++i) {
- VGubyte alpha = (i*stpc > unnormalisedOpacity) ? unnormalisedOpacity : i*stpc;
+ VGubyte alpha = (i * stpc > unnormalisedOpacity) ? unnormalisedOpacity : i * stpc;
d->lut[i] = 0x00000000
- | (d->color.red() << 24)
- | (d->color.green() << 16)
- | (d->color.blue() << 8)
- | alpha;
+ | (d->color.red() << 24)
+ | (d->color.green() << 16)
+ | (d->color.blue() << 8)
+ | alpha;
}
}
--- a/src/hbcore/ovgeffects/hbvgoutlineeffect_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgoutlineeffect_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -52,11 +52,15 @@
public slots:
void setOutline(const QPointF &outline);
- inline void setOutline(qreal x, qreal y) { setOutline(QPointF(x, y)); }
+ inline void setOutline(qreal x, qreal y) {
+ setOutline(QPointF(x, y));
+ }
void setColor(const QColor &color);
void setSteepness(qreal steepness);
void setOffset(const QPointF &offset);
- inline void setOffset(qreal x, qreal y) { setOffset(QPointF(x, y)); }
+ inline void setOffset(qreal x, qreal y) {
+ setOffset(QPointF(x, y));
+ }
signals:
void outlineChanged(const QPointF &outline);
--- a/src/hbcore/ovgeffects/hbvgreflectioneffect.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgreflectioneffect.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -35,13 +35,13 @@
* \class HbVgReflectionEffect
*
* \brief OpenVG-based reflection effect.
- *
+ *
* \internal
*/
HbVgReflectionEffectPrivate::HbVgReflectionEffectPrivate()
: fade(0), fadeInited(false)
-{
+{
}
HbVgReflectionEffectPrivate::~HbVgReflectionEffectPrivate()
@@ -76,8 +76,9 @@
void HbVgReflectionEffect::setOffset(const QPointF &offset)
{
Q_D(HbVgReflectionEffect);
- if (offset == d->offset)
+ if (offset == d->offset) {
return;
+ }
d->offset = offset;
updateEffectBoundingRect();
emit offsetChanged(offset);
@@ -100,8 +101,9 @@
void HbVgReflectionEffect::setFade(qreal fade)
{
Q_D(HbVgReflectionEffect);
- if (fade == d->fade)
+ if (fade == d->fade) {
return;
+ }
d->fade = fade;
updateEffect();
emit fadeChanged(fade);
@@ -116,8 +118,9 @@
void HbVgReflectionEffect::setColor(const QColor &color)
{
Q_D(HbVgReflectionEffect);
- if (color == d->color)
+ if (color == d->color) {
return;
+ }
d->color = color;
updateEffect();
emit colorChanged(color);
@@ -129,27 +132,28 @@
Q_D(const HbVgReflectionEffect);
QRectF r(rect);
QPointF mappedOffset = d->mapOffset(d->offset);
- qreal rotationAngle = d->mainWindowRotation();
-
- if (rotationAngle == 0)
+ qreal rotationAngle = d->mainWindowRotation();
+
+ if (rotationAngle == 0) {
r.adjust(0, 0, 0, r.height());
- else if (rotationAngle == 90 || rotationAngle == -270)
+ } else if (rotationAngle == 90 || rotationAngle == -270) {
r.adjust(-r.width(), 0, 0, 0);
- else if (rotationAngle == -90 || rotationAngle == 270)
+ } else if (rotationAngle == -90 || rotationAngle == 270) {
r.adjust(0, 0, r.width(), 0);
-
+ }
+
qreal x1 = qMin(r.left(), r.left() + mappedOffset.x());
qreal y1 = qMin(r.top(), r.top() + mappedOffset.y());
qreal x2 = qMax(r.right(), r.right() + mappedOffset.x());
qreal y2 = qMax(r.bottom(), r.bottom() + mappedOffset.y());
-
+
return QRectF(x1, y1, x2 - x1 + 1, y2 - y1 + 1);
}
void HbVgReflectionEffect::performEffect(QPainter *painter,
- const QPointF &offset,
- const QVariant &vgImage,
- const QSize &vgImageSize)
+ const QPointF &offset,
+ const QVariant &vgImage,
+ const QSize &vgImageSize)
{
#ifdef HB_EFFECTS_OPENVG
Q_D(HbVgReflectionEffect);
@@ -162,11 +166,11 @@
QPaintDevice *pdev = painter->device();
QRectF rectWithChildren = d->deviceRectForSource(
- HbVgFrameEffectPrivate::IncludeChildren,
- pdev);
+ HbVgFrameEffectPrivate::IncludeChildren,
+ pdev);
QRectF rectWithoutChildren = d->deviceRectForSource(
- HbVgFrameEffectPrivate::ExcludeChildren,
- pdev);
+ HbVgFrameEffectPrivate::ExcludeChildren,
+ pdev);
VGImage srcImage = vgImage.value<VGImage>();
VGImage dstImage = d->ensurePixmap(&d->dstPixmap, vgImageSize);
@@ -174,60 +178,63 @@
// IMAGE_USER_TO_SURFACE matrix.
painter->drawPixmap(offset, d->srcPixmap);
- // Prepare the mirrored image.
+ // Prepare the mirrored image.
qreal rotationAngle = d->mainWindowRotation();
qreal absRotationAngle = qAbs(rotationAngle);
-
+
VGfloat m[9];
vgGetMatrix(m);
vgLoadIdentity();
- if (absRotationAngle == 0)
+ if (absRotationAngle == 0) {
m[4] *= -1.0f;
- else if (absRotationAngle == 90 || absRotationAngle == 270)
+ } else if (absRotationAngle == 90 || absRotationAngle == 270) {
m[0] *= -1.0f;
+ }
vgMultMatrix(m);
-
+
// Must move the mirrored image to have it on top of the original and then down
// again to have it below in portrait-mode. Rotation angles -90 or 270 causes image to be moved to right,
// and in rotation angles -90 and 270, image is in correct place initially.
// Try to take the exclude-children hint into account when performing the second move.
-
+
VGfloat trans;
- if (absRotationAngle == 0) {
- if (d->hints & ExcludeChildrenHint)
+ if (absRotationAngle == 0) {
+ if (d->hints & ExcludeChildrenHint) {
trans = -rectWithChildren.height() - rectWithoutChildren.height();
- else
+ } else {
trans = -2.0f * rectWithChildren.height();
-
+ }
+
vgTranslate(0.0f, trans);
- }
- else if (absRotationAngle == 90 || absRotationAngle == 270) {
- if (d->hints & ExcludeChildrenHint)
+ } else if (absRotationAngle == 90 || absRotationAngle == 270) {
+ if (d->hints & ExcludeChildrenHint) {
trans = -rectWithChildren.width() - rectWithoutChildren.width();
- else
+ } else {
trans = -2.0f * rectWithChildren.width();
-
+ }
+
vgTranslate(trans, 0.0f);
}
-
+
// Apply the additional offset. Note: down = minus, right = plus.
- QPointF mappedOffset = d->mapOffset(d->offset);
+ QPointF mappedOffset = d->mapOffset(d->offset);
VGfloat ox = (VGfloat) mappedOffset.x();
VGfloat oy = (VGfloat) mappedOffset.y();
- if (rotationAngle == 0)
- vgTranslate(ox, -oy);
- else if (rotationAngle == 90 || rotationAngle == -270)
- vgTranslate(-ox, oy);
- else if (rotationAngle == -90 || rotationAngle == 270)
- vgTranslate(-ox, oy);
-
+ if (rotationAngle == 0) {
+ vgTranslate(ox, -oy);
+ } else if (rotationAngle == 90 || rotationAngle == -270) {
+ vgTranslate(-ox, oy);
+ } else if (rotationAngle == -90 || rotationAngle == 270) {
+ vgTranslate(-ox, oy);
+ }
+
// Apply the opacity and the color. When no color was set and the opacity is 1, the
// source image will be used as it is. This is the only place where we can try to use
// the pixmap cache.
VGImage imgToDraw = srcImage;
QPixmap cachedPm = cached(vgImageSize);
- if (cachedPm.isNull()) {
+ if (cachedPm.isNull()) {
VGImage tmpImage = VG_INVALID_HANDLE;
if (d->color.isValid()) {
// Perform a colorize effect (ignore the opacity here because it must be set for
@@ -242,8 +249,9 @@
if (d->opacity < 1.0f - HBVG_EPSILON) {
// Apply the opacity, i.e. modify the alpha channel.
if (d->paramsChanged) {
- for (int i = 0; i < 256; ++i)
- d->alphaLUT[i] = (VGubyte) (i * opacity);
+ for (int i = 0; i < 256; ++i) {
+ d->alphaLUT[i] = (VGubyte)(i * opacity);
+ }
}
vgLookup(dstImage, imgToDraw,
identityLUT, identityLUT, identityLUT, d->alphaLUT,
@@ -251,10 +259,11 @@
imgToDraw = dstImage;
}
// If colorize and/or opacity was used then try to cache the result.
- if (imgToDraw == tmpImage)
+ if (imgToDraw == tmpImage) {
tryCache(d->tmpPixmap);
- else if (imgToDraw == dstImage)
+ } else if (imgToDraw == dstImage) {
tryCache(d->dstPixmap);
+ }
} else {
imgToDraw = qPixmapToVGImage(cachedPm);
}
@@ -289,22 +298,18 @@
// Set up the linear gradient based on the (transformed) size of the source.
VGfloat sw = (VGfloat) rectWithChildren.width();
VGfloat sh = (VGfloat) rectWithChildren.height();
- // must be bottom-up to get the proper effect
- if (rotationAngle == 0) {
+ // must be bottom-up to get the proper effect
+ if (absRotationAngle == 0) {
VGfloat grad[] = { sw / 2.0f, sh,
- sw / 2.0f, 0.0f };
+ sw / 2.0f, 0.0f
+ };
+ vgSetParameterfv(d->fadePaint, VG_PAINT_LINEAR_GRADIENT, 4, grad);
+ } else if (absRotationAngle == 90 || absRotationAngle == 270) {
+ VGfloat grad[] = { sw, sh / 2.0f,
+ 0.0f, sh / 2.0f
+ };
vgSetParameterfv(d->fadePaint, VG_PAINT_LINEAR_GRADIENT, 4, grad);
}
- else if (rotationAngle == -90 || rotationAngle == 270){
- VGfloat grad[] = { sw, sh / 2.0f,
- 0.0f, sh / 2.0f };
- vgSetParameterfv(d->fadePaint, VG_PAINT_LINEAR_GRADIENT, 4, grad);
- }
- else if (rotationAngle == 90 || rotationAngle == -270){
- VGfloat grad[] = { 0.0f, sh / 2.0f,
- sw, sh / 2.0f };
- vgSetParameterfv(d->fadePaint, VG_PAINT_LINEAR_GRADIENT, 4, grad);
- }
// Draw the mirrored image by using the paint to get a gradual fade-out effect.
vgSeti(VG_MATRIX_MODE, VG_MATRIX_FILL_PAINT_TO_USER);
--- a/src/hbcore/ovgeffects/hbvgreflectioneffect_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgreflectioneffect_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -49,7 +49,9 @@
public slots:
void setOffset(const QPointF &offset);
- void setOffset(qreal x, qreal y) { setOffset(QPointF(x, y)); }
+ void setOffset(qreal x, qreal y) {
+ setOffset(QPointF(x, y));
+ }
void setFade(qreal fade);
void setColor(const QColor &color);
--- a/src/hbcore/ovgeffects/hbvgshadoweffect.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgshadoweffect.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -50,9 +50,9 @@
}
void HbVgShadowEffect::performEffect(QPainter *painter,
- const QPointF &offset,
- const QVariant &vgImage,
- const QSize &vgImageSize)
+ const QPointF &offset,
+ const QVariant &vgImage,
+ const QSize &vgImageSize)
{
#ifdef HB_EFFECTS_OPENVG
Q_D(HbVgOutlineEffect);
--- a/src/hbcore/primitives/hbframeitem.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/primitives/hbframeitem.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -30,11 +30,11 @@
#include <QGraphicsWidget>
/*!
- @stable
+ @stable
@hbcore
\class HbFrameItem
\brief A graphics item that draws a frame using the given HbFrameDrawer instance.
-
+
This class is not intended to be derived from.
Example of how to create a graphics frame item and use it.
@@ -79,7 +79,7 @@
}
HbFrameItemPrivate::HbFrameItemPrivate(HbFrameItem *q, HbFrameDrawer *drawer)
- : item(q),
+ : item(q),
frameDrawer(drawer)
{
init();
@@ -101,9 +101,9 @@
void HbFrameItemPrivate::init()
{
- item->setSizePolicy( QSizePolicy::Ignored, QSizePolicy::Ignored );
+ item->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
- if ( QGraphicsWidget *parent = item->parentWidget() ) {
+ if (QGraphicsWidget *parent = item->parentWidget()) {
frameDrawer->setLayoutDirection(parent->layoutDirection());
}
@@ -202,16 +202,16 @@
d->frameDrawer->paint(painter, boundingRect());
}
- /*!
- \reimp
- */
+/*!
+ \reimp
+*/
void HbFrameItem::changeEvent(QEvent *event)
{
- if ( event->type() == QEvent::LayoutDirectionChange ) {
- if ( QGraphicsWidget *parent = parentWidget() ) {
- d->frameDrawer->setLayoutDirection( parent->layoutDirection() );
+ if (event->type() == QEvent::LayoutDirectionChange) {
+ if (QGraphicsWidget *parent = parentWidget()) {
+ d->frameDrawer->setLayoutDirection(parent->layoutDirection());
}
- } else if ( event->type() == HbEvent::ThemeChanged ) {
+ } else if (event->type() == HbEvent::ThemeChanged) {
d->frameDrawer->themeChanged();
}
@@ -223,7 +223,7 @@
break;
case QEvent::StyleChange: // flow through
default:
- HbWidgetBase::changeEvent( event );
+ HbWidgetBase::changeEvent(event);
break;
}
}
@@ -232,11 +232,11 @@
QSizeF HbFrameItem::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
{
if (which == Qt::MinimumSize) {
- return QSizeF( 0, 0 );
- } else if (which == Qt::PreferredSize ) {
- return QSizeF( 0, 0 );
+ return QSizeF(0, 0);
+ } else if (which == Qt::PreferredSize) {
+ return QSizeF(0, 0);
} else {
- return HbWidgetBase::sizeHint( which, constraint );
+ return HbWidgetBase::sizeHint(which, constraint);
}
}
--- a/src/hbcore/primitives/hbframeitem.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/primitives/hbframeitem.h Fri Jun 11 13:58:22 2010 +0300
@@ -59,7 +59,9 @@
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
enum { Type = Hb::ItemType_FrameItem };
- int type() const { return Type; }
+ int type() const {
+ return Type;
+ }
protected:
void changeEvent(QEvent *event);
--- a/src/hbcore/primitives/hbiconitem.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/primitives/hbiconitem.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -36,7 +36,7 @@
@stable
@hbcore
\class HbIconItem
- \brief HbIconItem displays an HbIcon instance.
+ \brief HbIconItem displays an icon provided in form of an HbIcon
HbIconItem derives from HbWidgetBase and so can be added to a layout.
@@ -61,7 +61,7 @@
icon->setPos(10,150);
icon->setSize(icon->defaultSize());
\endcode
-
+
Example of how to add HbIconItem to a layout.
\code
HbButton *button = new HbButton("Button 1");
@@ -102,28 +102,40 @@
const QIcon::Mode HbIconItem::defaultMode = QIcon::Normal;
const QIcon::State HbIconItem::defaultState = QIcon::Off;
const Qt::AspectRatioMode HbIconItem::defaultAspectRatioMode = Qt::KeepAspectRatio;
-const Qt::Alignment HbIconItem::defaultAlignment = Qt::AlignCenter;
+
+// Note: No center aligning by default to prevent interesting rounding issues
+// in certain cases (e.g. 50.25x50.25 sized icon item would lead to having an
+// icon sized 50x50 drawn at (0.12499, 0.12499) which may or may not fit visually
+// the other primitives of the same widget).
+const Qt::Alignment HbIconItem::defaultAlignment = 0;
bool HbIconItemPrivate::outlinesEnabled = false;
HbIconItemPrivate::HbIconItemPrivate(const HbIcon &icon) :
- mIcon(icon),
- mAnimator(),
- mAlignment(HbIconItem::defaultAlignment),
- mAspectRatioMode(HbIconItem::defaultAspectRatioMode),
- mState(HbIconItem::defaultState),
- mMode(HbIconItem::defaultMode)
+ mIcon(icon),
+ mAnimator(),
+ mAlignment(HbIconItem::defaultAlignment),
+ mAspectRatioMode(HbIconItem::defaultAspectRatioMode),
+ mState(HbIconItem::defaultState),
+ mMode(HbIconItem::defaultMode)
{
q_ptr = 0;
}
-HbIconItemPrivate::~HbIconItemPrivate ()
+HbIconItemPrivate::~HbIconItemPrivate()
{
}
void HbIconItemPrivate::updateIconItem()
{
Q_Q(HbIconItem);
+ if (!mIcon.isNull()) {
+ // This must be done before the setIcon() call below due to the
+ // 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);
+ }
const QRectF boundingRect = q->rect();
if (!boundingRect.size().isEmpty()) {
mIconRect = boundingRect;
@@ -131,9 +143,18 @@
mAnimator.setIcon(mIcon);
q->update();
}
- if (!mIcon.isNull() && HbIconPrivate::d_ptr(&mIcon)->themedColor() != mThemedColor) {
- HbIconPrivate::d_ptr_detached(&mIcon)->setThemedColor(mThemedColor);
+}
+
+void HbIconItemPrivate::updateIconParams()
+{
+ Q_Q(HbIconItem);
+ if (mIconRect.isValid()) {
+ if (!mIcon.isNull()) {
+ HbIconPrivate::d_ptr_detached(&mIcon)->setThemedColor(mThemedColor);
+ }
+ mAnimator.setIcon(mIcon);
}
+ q->update();
}
void HbIconItemPrivate::setThemedColor(const QColor &color)
@@ -141,7 +162,7 @@
mThemedColor = color;
updateIconItem();
}
-
+
/*!
Constructs a new HbIconItem with \a iconName and \a parent.
\param iconName the name of the icon.
@@ -151,7 +172,7 @@
HbIconItem::HbIconItem(const QString &iconName, QGraphicsItem *parent) :
HbWidgetBase(*new HbIconItemPrivate(iconName), parent)
{
- Q_D( HbIconItem );
+ Q_D(HbIconItem);
d->q_ptr = this;
// Set this graphics item to be updated on icon animations
d->mAnimator.setGraphicsItem(this);
@@ -166,7 +187,7 @@
HbIconItem::HbIconItem(const HbIcon &icon, QGraphicsItem *parent) :
HbWidgetBase(*new HbIconItemPrivate(icon), parent)
{
- Q_D( HbIconItem );
+ Q_D(HbIconItem);
d->q_ptr = this;
// Set this graphics item to be updated on icon animations
d->mAnimator.setGraphicsItem(this);
@@ -180,7 +201,7 @@
HbIconItem::HbIconItem(QGraphicsItem *parent) :
HbWidgetBase(*new HbIconItemPrivate(QString()), parent)
{
- Q_D( HbIconItem );
+ Q_D(HbIconItem);
d->q_ptr = this;
// Set this graphics item to be updated on icon animations
d->mAnimator.setGraphicsItem(this);
@@ -191,7 +212,7 @@
/*!
\internal
*/
-HbIconItem::HbIconItem(HbIconItemPrivate &dd, QGraphicsItem * parent) :
+HbIconItem::HbIconItem(HbIconItemPrivate &dd, QGraphicsItem *parent) :
HbWidgetBase(dd, parent)
{
// Set this graphics item to be updated on icon animations
@@ -217,13 +238,17 @@
*/
HbIcon HbIconItem::icon() const
{
- Q_D(const HbIconItem );
+ Q_D(const HbIconItem);
return d->mIcon;
}
/*!
Sets the HbIcon instance associated with this HbIconItem.
+ Calling any function on \a icon after this one may not have any effect on the
+ icon displayed by the HbIconItem. Use the setters in HbIconItem instead. Of course
+ the settings set on \a icon before calling setIcon() will all be taken into account.
+
\param icon the HbIcon instance that this HbIconItem displays.
\sa icon()
@@ -265,7 +290,7 @@
*/
void HbIconItem::setAlignment(Qt::Alignment alignment)
{
- Q_D(HbIconItem );
+ Q_D(HbIconItem);
if (d->mAlignment != alignment) {
d->mAlignment = alignment;
update();
@@ -283,7 +308,7 @@
*/
void HbIconItem::setAspectRatioMode(Qt::AspectRatioMode aspectRatioMode)
{
- Q_D(HbIconItem );
+ Q_D(HbIconItem);
d->setApiProtectionFlag(HbWidgetBasePrivate::AC_IconAspectRatioMode, true);
if (d->mAspectRatioMode != aspectRatioMode) {
d->mAspectRatioMode = aspectRatioMode;
@@ -296,13 +321,13 @@
If this method is not called, the icon uses the default mode which is QIcon::Normal.
\param mode the new icon mode.
- \warning Currently this method makes use of pixmap() routine in case of NVG icons.
+ \warning Currently this method makes use of pixmap() routine in case of NVG icons.
pixmap() slows down the hardware accelerated rendering.
\sa mode
*/
void HbIconItem::setMode(QIcon::Mode mode)
{
- Q_D(HbIconItem );
+ Q_D(HbIconItem);
if (d->mMode != mode) {
d->mMode = mode;
update();
@@ -319,7 +344,7 @@
*/
void HbIconItem::setState(QIcon::State state)
{
- Q_D(HbIconItem );
+ Q_D(HbIconItem);
if (d->mState != state) {
d->mState = state;
update();
@@ -336,7 +361,7 @@
*/
void HbIconItem::setIconName(const QString &iconName)
{
- Q_D(HbIconItem );
+ Q_D(HbIconItem);
if (d->mIcon.iconName() != iconName) {
d->mIcon.setIconName(iconName);
d->updateIconItem();
@@ -355,9 +380,7 @@
Q_D(HbIconItem);
if (d->mIcon.flags() != flags) {
d->mIcon.setFlags(flags);
- if (d->mIconRect.isValid())
- d->mAnimator.setIcon(d->mIcon);
- update();
+ d->updateIconParams();
}
}
@@ -374,9 +397,7 @@
Q_D(HbIconItem);
if (d->mIcon.mirroringMode() != mode) {
d->mIcon.setMirroringMode(mode);
- if (d->mIconRect.isValid())
- d->mAnimator.setIcon(d->mIcon);
- update();
+ d->updateIconParams();
}
}
@@ -409,7 +430,7 @@
*/
void HbIconItem::setIconName(const QString &iconName, QIcon::Mode mode, QIcon::State state)
{
- Q_D( HbIconItem );
+ Q_D(HbIconItem);
d->mIcon.setIconName(iconName, mode, state);
d->updateIconItem();
}
@@ -427,12 +448,10 @@
*/
void HbIconItem::setColor(const QColor &color)
{
- Q_D( HbIconItem );
+ Q_D(HbIconItem);
if (d->mIcon.color() != color) {
d->mIcon.setColor(color);
- if (d->mIconRect.isValid())
- d->mAnimator.setIcon(d->mIcon);
- update();
+ d->updateIconParams();
}
}
@@ -442,20 +461,20 @@
*/
QColor HbIconItem::color() const
{
- Q_D(const HbIconItem );
+ Q_D(const HbIconItem);
return d->mIcon.color();
}
/*!
Returns the default size of the icon.
-
+
For raster images this is the original size of the image.
\sa HbIcon::defaultSize()
*/
QSizeF HbIconItem::defaultSize() const
{
- Q_D(const HbIconItem );
+ Q_D(const HbIconItem);
return d->mIcon.defaultSize();
}
@@ -476,7 +495,7 @@
*/
Qt::AspectRatioMode HbIconItem::aspectRatioMode() const
{
- Q_D(const HbIconItem );
+ Q_D(const HbIconItem);
return d->mAspectRatioMode;
}
@@ -487,7 +506,7 @@
*/
Qt::Alignment HbIconItem::alignment() const
{
- Q_D(const HbIconItem );
+ Q_D(const HbIconItem);
return d->mAlignment;
}
@@ -498,7 +517,7 @@
*/
QIcon::Mode HbIconItem::mode() const
{
- Q_D(const HbIconItem );
+ Q_D(const HbIconItem);
return d->mMode;
}
@@ -509,7 +528,7 @@
*/
QIcon::State HbIconItem::state() const
{
- Q_D(const HbIconItem );
+ Q_D(const HbIconItem);
return d->mState;
}
@@ -521,7 +540,7 @@
*/
QString HbIconItem::iconName() const
{
- Q_D(const HbIconItem );
+ Q_D(const HbIconItem);
return d->mIcon.iconName();
}
@@ -535,7 +554,7 @@
*/
QString HbIconItem::iconName(QIcon::Mode mode, QIcon::State state) const
{
- Q_D(const HbIconItem );
+ Q_D(const HbIconItem);
return d->mIcon.iconName(mode, state);
}
@@ -579,7 +598,7 @@
*/
bool HbIconItem::isNull() const
{
- Q_D(const HbIconItem );
+ Q_D(const HbIconItem);
return d->mIcon.isNull();
}
@@ -594,9 +613,12 @@
Q_UNUSED(option)
Q_D(HbIconItem);
const QRectF rect(boundingRect());
- if (!rect.isEmpty()){
+ if (!rect.isEmpty()) {
if (d->mIconRect != rect) {
d->mIconRect = rect;
+ if (!d->mIcon.isNull()) {
+ HbIconPrivate::d_ptr_detached(&d->mIcon)->setThemedColor(d->mThemedColor);
+ }
d->mIcon.setSize(d->mIconRect.size());
d->mAnimator.setIcon(d->mIcon);
}
@@ -607,7 +629,7 @@
}
if (HbIconItemPrivate::outlinesEnabled) {
painter->setBrush(QBrush(QColor(0, 255, 0, 50)));
- painter->drawRect(contentsRect());
+ painter->drawRect(contentsRect());
}
}
@@ -629,13 +651,13 @@
}
}
- /*!
- \reimp
- */
+/*!
+ \reimp
+*/
QVariant HbIconItem::itemChange(GraphicsItemChange change, const QVariant &value)
{
Q_D(HbIconItem);
- if (QGraphicsItem::ItemEnabledHasChanged==change) {
+ if (QGraphicsItem::ItemEnabledHasChanged == change) {
d->mMode = value.toBool() ? QIcon::Normal : QIcon::Disabled;
}
--- a/src/hbcore/primitives/hbiconitem.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/primitives/hbiconitem.h Fri Jun 11 13:58:22 2010 +0300
@@ -34,12 +34,12 @@
class HbIconItemPrivate;
class HbIconAnimator;
-class HB_CORE_EXPORT HbIconItem: public HbWidgetBase
+class HB_CORE_EXPORT HbIconItem: public HbWidgetBase
{
Q_OBJECT
public:
- explicit HbIconItem(const QString& iconName, QGraphicsItem *parent = 0);
+ explicit HbIconItem(const QString &iconName, QGraphicsItem *parent = 0);
explicit HbIconItem(const HbIcon &icon, QGraphicsItem *parent = 0);
explicit HbIconItem(QGraphicsItem *parent = 0);
virtual ~HbIconItem();
@@ -56,8 +56,8 @@
void setMirroringMode(HbIcon::MirroringMode mode);
void setBrush(const QBrush &brush);
- void setColor(const QColor &color);
- QColor color() const;
+ void setColor(const QColor &color);
+ QColor color() const;
HbIcon icon() const;
QSizeF defaultSize() const;
QSizeF iconItemSize() const;
@@ -83,7 +83,9 @@
HbIconAnimator &animator();
enum { Type = Hb::ItemType_IconItem };
- int type() const { return Type; }
+ int type() const {
+ return Type;
+ }
protected:
HbIconItem(HbIconItemPrivate &dd, QGraphicsItem *parent);
@@ -93,7 +95,7 @@
private:
Q_DECLARE_PRIVATE_D(d_ptr, HbIconItem)
Q_DISABLE_COPY(HbIconItem)
-
+
friend class HbStylePrivate;
};
--- a/src/hbcore/primitives/hbiconitem_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/primitives/hbiconitem_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -43,8 +43,11 @@
~HbIconItemPrivate();
void clearStoredIconContent();
void updateIconItem();
+ void updateIconParams();
void setThemedColor(const QColor &color);
- static HbIconItemPrivate *d_ptr(HbIconItem *item) { return item->d_func(); }
+ static HbIconItemPrivate *d_ptr(HbIconItem *item) {
+ return item->d_func();
+ }
HbIcon mIcon;
HbIconAnimator mAnimator;
Qt::Alignment mAlignment;
--- a/src/hbcore/primitives/hbtoucharea.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/primitives/hbtoucharea.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -62,7 +62,7 @@
// Because this method is static we need to toggle QGraphicsItem::ItemHasNoContents flag
// value hard way. This is RnD feature anyway.
foreach (HbMainWindow *window, hbInstance->allMainWindows()) {
- QGraphicsScene *scene = static_cast<QGraphicsScene*>(window->scene());
+ QGraphicsScene *scene = static_cast<QGraphicsScene*>(window->scene()); //krazy:exclude=qclasses
foreach( QGraphicsItem *item, scene->items() ) {
if (HbTouchArea *widget = qgraphicsitem_cast<HbTouchArea *>(item)) {
widget->setFlag(QGraphicsItem::ItemHasNoContents, !enabled);
@@ -132,7 +132,7 @@
// The paint method is called only if HbTouchAreaPrivate::outlinesEnabled is true (RnD feature)
// because flag QGraphicsItem::ItemHasNoContents is set otherwise.
if (HbTouchAreaPrivate::outlinesEnabled) {
- painter->setPen(Qt::red);
+ painter->setPen(Qt::red); //krazy:exclude=qenums
painter->drawLine(contentsRect().topLeft(), contentsRect().bottomRight());
painter->drawLine(contentsRect().topRight(), contentsRect().bottomLeft());
painter->setBrush(QBrush(QColor(255, 0, 0, 50)));
Binary file src/hbcore/resources/keymaps/120.txt has changed
Binary file src/hbcore/resources/keymaps/132.txt has changed
Binary file src/hbcore/resources/keymaps/58.txt has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/animations/hbdefault/qtg_anim_mono_loading.axml Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,12 @@
+<animations>
+<icon name="qtg_anim_mono_loading" frame_duration="50" playmode="loop">
+<frame>qtg_anim_mono_loading_1</frame>
+<frame>qtg_anim_mono_loading_2</frame>
+<frame>qtg_anim_mono_loading_3</frame>
+<frame>qtg_anim_mono_loading_4</frame>
+<frame>qtg_anim_mono_loading_5</frame>
+<frame>qtg_anim_mono_loading_6</frame>
+<frame>qtg_anim_mono_loading_7</frame>
+<frame>qtg_anim_mono_loading_8</frame>
+</icon>
+</animations>
--- a/src/hbcore/resources/themes/effects/hbdefault/dialog_rotate.fxml Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<layers>
- <visual>
- <param name="opacity" type="anim">
- <duration>0.3</duration>
- <style>inoutquad</style>
- <keyframe at="0.0">1.0</keyframe>
- <keyframe at="0.2">0.0</keyframe>
- <keyframe at="0.8">0.0</keyframe>
- <keyframe at="1.0">1.0</keyframe>
- </param>
- </visual>
-</layers>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/effects/hbdefault/popup_orient_appear.fxml Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,10 @@
+<layers>
+ <visual>
+ <param name="opacity" type="anim">
+ <duration>0.3</duration>
+ <style>inoutquad</style>
+ <keyframe at="0.0">0.0</keyframe>
+ <keyframe at="1.0">1.0</keyframe>
+ </param>
+ </visual>
+</layers>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/effects/hbdefault/popup_orient_disappear.fxml Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,10 @@
+<layers>
+ <visual>
+ <param name="opacity" type="anim">
+ <duration>0.4</duration>
+ <style>inoutquad</style>
+ <keyframe at="0.0">1.0</keyframe>
+ <keyframe at="1.0">0.0</keyframe>
+ </param>
+ </visual>
+</layers>
\ No newline at end of file
Binary file src/hbcore/resources/themes/hbdefault.themeindex has changed
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_1.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_1.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<g>
<radialGradient cx="37.875" cy="9.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="21.1896">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_10.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_10.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<g>
<radialGradient cx="31.375" cy="8.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="22.4099">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_2.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_2.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<g>
<radialGradient cx="50.125" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="21.5193">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_3.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_3.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<g>
<radialGradient cx="49.875" cy="38.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="21.3373">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_4.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_4.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<g>
<radialGradient cx="38.5" cy="49.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="20.7308">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_5.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_5.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<g>
<radialGradient cx="21.75" cy="49.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="21.7313">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_6.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_6.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<g>
<radialGradient cx="10" cy="38" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="21.5657">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_7.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_7.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<g>
<radialGradient cx="10" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="22.3299">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_8.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_8.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<g>
<radialGradient cx="21.75" cy="10.25" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="21.6348">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_9.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_9.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<g>
<radialGradient cx="28.625" cy="8.625" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="21.9264">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_1.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_1.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" y="0px">
+<svg baseProfile="tiny" height="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="0" x2="19.814" y1="23.1826" y2="23.1826">
<stop offset="0" style="stop-color:#3B87C0"/>
<stop offset="1" style="stop-color:#0069B2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_2.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_2.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" y="0px">
+<svg baseProfile="tiny" height="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="0" x2="19.814" y1="23.1826" y2="23.1826">
<stop offset="0" style="stop-color:#3B87C0"/>
<stop offset="1" style="stop-color:#0069B2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_3.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_3.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" y="0px">
+<svg baseProfile="tiny" height="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="0" x2="19.814" y1="23.1826" y2="23.1826">
<stop offset="0" style="stop-color:#3B87C0"/>
<stop offset="1" style="stop-color:#0069B2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_4.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_4.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" y="0px">
+<svg baseProfile="tiny" height="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M13.8,35.3c0.2-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.2,25.9,0,35.3H13.8z" fill="#424242"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="11.0552" x2="35.3105" y1="9.9063" y2="9.9063">
<stop offset="0" style="stop-color:#3B87C0"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_5.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_5.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" y="0px">
+<svg baseProfile="tiny" height="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M13.8,35.3c0.2-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.2,25.9,0,35.3H13.8z" fill="#424242"/>
<path d="M20.8,19.8c3.8-3.6,8.9-5.8,14.5-6V0c-9.4,0.2-17.9,4-24.3,10L20.8,19.8z" fill="#424242"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="36.7383" x2="60.9922" y1="9.9063" y2="9.9063">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_6.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_6.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" y="0px">
+<svg baseProfile="tiny" height="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M13.8,35.3c0.2-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.2,25.9,0,35.3H13.8z" fill="#424242"/>
<path d="M20.8,19.8c3.8-3.6,8.9-5.8,14.5-6V0c-9.4,0.2-17.9,4-24.3,10L20.8,19.8z" fill="#424242"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="36.7383" x2="60.9922" y1="9.9063" y2="9.9063">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_7.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_7.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" y="0px">
+<svg baseProfile="tiny" height="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M13.8,35.3c0.2-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.2,25.9,0,35.3H13.8z" fill="#424242"/>
<path d="M20.8,19.8c3.8-3.6,8.9-5.8,14.5-6V0c-9.4,0.2-17.9,4-24.3,10L20.8,19.8z" fill="#424242"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="36.7383" x2="60.9922" y1="9.9063" y2="9.9063">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_8.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_8.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" y="0px">
+<svg baseProfile="tiny" height="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="0" x2="19.814" y1="23.1826" y2="23.1826">
<stop offset="0" style="stop-color:#3B87C0"/>
<stop offset="1" style="stop-color:#0069B2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_9.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_9.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" y="0px">
+<svg baseProfile="tiny" height="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="0" x2="19.814" y1="23.1826" y2="23.1826">
<stop offset="0" style="stop-color:#3B87C0"/>
<stop offset="1" style="stop-color:#0069B2"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_1.svg Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="30" width="30"/>
+<path d="M9.006,8.3c1.476-1.321,3.387-2.158,5.494-2.274v-5c-3.487,0.124-6.644,1.517-9.03,3.739L9.006,8.3z M6.026,15.5h-5 c0.124,3.487,1.517,6.644,3.739,9.029l3.536-3.536C6.979,19.518,6.142,17.607,6.026,15.5z M8.299,9.007L4.764,5.472 C2.542,7.857,1.149,11.013,1.026,14.5h5C6.142,12.393,6.979,10.483,8.299,9.007z M23.975,14.5h5 c-0.123-3.487-1.517-6.644-3.738-9.029L21.7,9.007C23.021,10.483,23.858,12.393,23.975,14.5z M5.472,25.236 c2.385,2.222,5.542,3.615,9.029,3.738v-5c-2.107-0.116-4.018-0.953-5.493-2.274L5.472,25.236z M21.699,20.993l3.537,3.536 c2.222-2.385,3.615-5.542,3.738-9.029h-5C23.858,17.607,23.021,19.518,21.699,20.993z M15.5,23.975v5 c3.487-0.123,6.643-1.517,9.029-3.738L20.992,21.7C19.517,23.021,17.606,23.858,15.5,23.975z"/>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_2.svg Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="30" width="30"/>
+<path d="M9.006,8.3c1.476-1.321,3.387-2.158,5.494-2.274v-5c-3.487,0.124-6.644,1.517-9.03,3.739L9.006,8.3z M24.529,4.764 c-2.386-2.222-5.542-3.615-9.029-3.739v5c2.107,0.116,4.017,0.953,5.493,2.274L24.529,4.764z M6.026,15.5h-5 c0.124,3.487,1.517,6.644,3.739,9.029l3.536-3.536C6.979,19.518,6.142,17.607,6.026,15.5z M8.299,9.007L4.764,5.472 C2.542,7.857,1.149,11.013,1.026,14.5h5C6.142,12.393,6.979,10.483,8.299,9.007z M5.472,25.236c2.385,2.222,5.542,3.615,9.029,3.738 v-5c-2.107-0.116-4.018-0.953-5.493-2.274L5.472,25.236z M21.699,20.993l3.537,3.536c2.222-2.385,3.615-5.542,3.738-9.029h-5 C23.858,17.607,23.021,19.518,21.699,20.993z M15.5,23.975v5c3.487-0.123,6.643-1.517,9.029-3.738L20.992,21.7 C19.517,23.021,17.606,23.858,15.5,23.975z"/>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_3.svg Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="30" width="30"/>
+<path d="M9.006,8.3c1.476-1.321,3.387-2.158,5.494-2.274v-5c-3.487,0.124-6.644,1.517-9.03,3.739L9.006,8.3z M24.529,4.764 c-2.386-2.222-5.542-3.615-9.029-3.739v5c2.107,0.116,4.017,0.953,5.493,2.274L24.529,4.764z M6.026,15.5h-5 c0.124,3.487,1.517,6.644,3.739,9.029l3.536-3.536C6.979,19.518,6.142,17.607,6.026,15.5z M8.299,9.007L4.764,5.472 C2.542,7.857,1.149,11.013,1.026,14.5h5C6.142,12.393,6.979,10.483,8.299,9.007z M23.975,14.5h5 c-0.123-3.487-1.517-6.644-3.738-9.029L21.7,9.007C23.021,10.483,23.858,12.393,23.975,14.5z M5.472,25.236 c2.385,2.222,5.542,3.615,9.029,3.738v-5c-2.107-0.116-4.018-0.953-5.493-2.274L5.472,25.236z M15.5,23.975v5 c3.487-0.123,6.643-1.517,9.029-3.738L20.992,21.7C19.517,23.021,17.606,23.858,15.5,23.975z"/>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_4.svg Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="30" width="30"/>
+<path d="M9.006,8.3c1.476-1.321,3.387-2.158,5.494-2.274v-5c-3.487,0.124-6.644,1.517-9.03,3.739L9.006,8.3z M24.529,4.764 c-2.386-2.222-5.542-3.615-9.029-3.739v5c2.107,0.116,4.017,0.953,5.493,2.274L24.529,4.764z M6.026,15.5h-5 c0.124,3.487,1.517,6.644,3.739,9.029l3.536-3.536C6.979,19.518,6.142,17.607,6.026,15.5z M8.299,9.007L4.764,5.472 C2.542,7.857,1.149,11.013,1.026,14.5h5C6.142,12.393,6.979,10.483,8.299,9.007z M23.975,14.5h5 c-0.123-3.487-1.517-6.644-3.738-9.029L21.7,9.007C23.021,10.483,23.858,12.393,23.975,14.5z M5.472,25.236 c2.385,2.222,5.542,3.615,9.029,3.738v-5c-2.107-0.116-4.018-0.953-5.493-2.274L5.472,25.236z M21.699,20.993l3.537,3.536 c2.222-2.385,3.615-5.542,3.738-9.029h-5C23.858,17.607,23.021,19.518,21.699,20.993z"/>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_5.svg Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="30" width="30"/>
+<path d="M9.006,8.3c1.476-1.321,3.387-2.158,5.494-2.274v-5c-3.487,0.124-6.644,1.517-9.03,3.739L9.006,8.3z M24.529,4.764 c-2.386-2.222-5.542-3.615-9.029-3.739v5c2.107,0.116,4.017,0.953,5.493,2.274L24.529,4.764z M6.026,15.5h-5 c0.124,3.487,1.517,6.644,3.739,9.029l3.536-3.536C6.979,19.518,6.142,17.607,6.026,15.5z M8.299,9.007L4.764,5.472 C2.542,7.857,1.149,11.013,1.026,14.5h5C6.142,12.393,6.979,10.483,8.299,9.007z M23.975,14.5h5 c-0.123-3.487-1.517-6.644-3.738-9.029L21.7,9.007C23.021,10.483,23.858,12.393,23.975,14.5z M21.699,20.993l3.537,3.536 c2.222-2.385,3.615-5.542,3.738-9.029h-5C23.858,17.607,23.021,19.518,21.699,20.993z M15.5,23.975v5 c3.487-0.123,6.643-1.517,9.029-3.738L20.992,21.7C19.517,23.021,17.606,23.858,15.5,23.975z"/>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_6.svg Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="30" width="30"/>
+<path d="M9.006,8.3c1.476-1.321,3.387-2.158,5.494-2.274v-5c-3.487,0.124-6.644,1.517-9.03,3.739L9.006,8.3z M24.529,4.764 c-2.386-2.222-5.542-3.615-9.029-3.739v5c2.107,0.116,4.017,0.953,5.493,2.274L24.529,4.764z M8.299,9.007L4.764,5.472 C2.542,7.857,1.149,11.013,1.026,14.5h5C6.142,12.393,6.979,10.483,8.299,9.007z M23.975,14.5h5 c-0.123-3.487-1.517-6.644-3.738-9.029L21.7,9.007C23.021,10.483,23.858,12.393,23.975,14.5z M5.472,25.236 c2.385,2.222,5.542,3.615,9.029,3.738v-5c-2.107-0.116-4.018-0.953-5.493-2.274L5.472,25.236z M21.699,20.993l3.537,3.536 c2.222-2.385,3.615-5.542,3.738-9.029h-5C23.858,17.607,23.021,19.518,21.699,20.993z M15.5,23.975v5 c3.487-0.123,6.643-1.517,9.029-3.738L20.992,21.7C19.517,23.021,17.606,23.858,15.5,23.975z"/>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_7.svg Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="30" width="30"/>
+<path d="M9.006,8.3c1.476-1.321,3.387-2.158,5.494-2.274v-5c-3.487,0.124-6.644,1.517-9.03,3.739L9.006,8.3z M24.529,4.764 c-2.386-2.222-5.542-3.615-9.029-3.739v5c2.107,0.116,4.017,0.953,5.493,2.274L24.529,4.764z M6.026,15.5h-5 c0.124,3.487,1.517,6.644,3.739,9.029l3.536-3.536C6.979,19.518,6.142,17.607,6.026,15.5z M23.975,14.5h5 c-0.123-3.487-1.517-6.644-3.738-9.029L21.7,9.007C23.021,10.483,23.858,12.393,23.975,14.5z M5.472,25.236 c2.385,2.222,5.542,3.615,9.029,3.738v-5c-2.107-0.116-4.018-0.953-5.493-2.274L5.472,25.236z M21.699,20.993l3.537,3.536 c2.222-2.385,3.615-5.542,3.738-9.029h-5C23.858,17.607,23.021,19.518,21.699,20.993z M15.5,23.975v5 c3.487-0.123,6.643-1.517,9.029-3.738L20.992,21.7C19.517,23.021,17.606,23.858,15.5,23.975z"/>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_mono_loading_8.svg Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="30" width="30"/>
+<path d="M24.529,4.764c-2.386-2.222-5.542-3.615-9.029-3.739v5c2.107,0.116,4.017,0.953,5.493,2.274L24.529,4.764z M6.026,15.5h-5 c0.124,3.487,1.517,6.644,3.739,9.029l3.536-3.536C6.979,19.518,6.142,17.607,6.026,15.5z M8.299,9.007L4.764,5.472 C2.542,7.857,1.149,11.013,1.026,14.5h5C6.142,12.393,6.979,10.483,8.299,9.007z M23.975,14.5h5 c-0.123-3.487-1.517-6.644-3.738-9.029L21.7,9.007C23.021,10.483,23.858,12.393,23.975,14.5z M5.472,25.236 c2.385,2.222,5.542,3.615,9.029,3.738v-5c-2.107-0.116-4.018-0.953-5.493-2.274L5.472,25.236z M21.699,20.993l3.537,3.536 c2.222-2.385,3.615-5.542,3.738-9.029h-5C23.858,17.607,23.021,19.518,21.699,20.993z M15.5,23.975v5 c3.487-0.123,6.643-1.517,9.029-3.738L20.992,21.7C19.517,23.021,17.606,23.858,15.5,23.975z"/>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_1.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_1.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="60" width="60"/>
<g transform="translate(-29.999,-66.081)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_10.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_10.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="60" width="60"/>
<g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_11.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_11.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="60" width="60"/>
<g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_12.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_12.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="60" width="60"/>
<g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_13.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_13.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="60" width="60"/>
<g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_14.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_14.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="60" width="60"/>
<g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_15.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_15.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="60" width="60"/>
<g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_16.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_16.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="60" width="60"/>
<g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_2.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_2.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="60" width="60"/>
<g fill-opacity="0.75" stroke-opacity="0.75" transform="translate(-29.999,-66.081)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_3.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_3.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="60" width="60"/>
<g fill-opacity="0.5" stroke-opacity="0.5" transform="translate(-29.999,-65.999)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_4.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_4.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="60" width="60"/>
<g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_5.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_5.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="60" width="60"/>
<g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_6.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_6.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="60" width="60"/>
<g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_7.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_7.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="60" width="60"/>
<g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-65.999)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_8.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_8.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="60" width="60"/>
<g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_9.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_9.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="60" width="60"/>
<g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_1.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_1.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<path d="M15,3C8.373,3,3,8.373,3,15c0,6.628,5.373,12,12,12s12-5.372,12-12 C27,8.373,21.627,3,15,3z M15,22.291c-4.027,0-7.291-3.264-7.291-7.291c0-4.027,3.264-7.291,7.291-7.291 c4.025,0,7.291,3.264,7.291,7.291C22.291,19.027,19.025,22.291,15,22.291z" fill-opacity="0.6" stroke-opacity="0.6"/>
<g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_10.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_10.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<path d="M15,3C8.373,3,3,8.373,3,15c0,6.628,5.373,12,12,12s12-5.372,12-12 C27,8.373,21.627,3,15,3z M15,22.291c-4.027,0-7.291-3.264-7.291-7.291c0-4.027,3.264-7.291,7.291-7.291 c4.025,0,7.291,3.264,7.291,7.291C22.291,19.027,19.025,22.291,15,22.291z" fill-opacity="0.6" stroke-opacity="0.6"/>
<g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_2.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_2.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<path d="M15,3C8.373,3,3,8.373,3,15c0,6.628,5.373,12,12,12s12-5.372,12-12 C27,8.373,21.627,3,15,3z M15,22.291c-4.027,0-7.291-3.264-7.291-7.291c0-4.027,3.264-7.291,7.291-7.291 c4.025,0,7.291,3.264,7.291,7.291C22.291,19.027,19.025,22.291,15,22.291z" fill-opacity="0.6" stroke-opacity="0.6"/>
<g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_3.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_3.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<path d="M15,3C8.373,3,3,8.373,3,15c0,6.628,5.373,12,12,12s12-5.372,12-12 C27,8.373,21.627,3,15,3z M15,22.291c-4.027,0-7.291-3.264-7.291-7.291c0-4.027,3.264-7.291,7.291-7.291 c4.025,0,7.291,3.264,7.291,7.291C22.291,19.027,19.025,22.291,15,22.291z" fill-opacity="0.6" stroke-opacity="0.6"/>
<g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_4.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_4.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<path d="M15,3C8.373,3,3,8.373,3,15c0,6.628,5.373,12,12,12s12-5.372,12-12 C27,8.373,21.627,3,15,3z M15,22.291c-4.027,0-7.291-3.264-7.291-7.291c0-4.027,3.264-7.291,7.291-7.291 c4.025,0,7.291,3.264,7.291,7.291C22.291,19.027,19.025,22.291,15,22.291z" fill-opacity="0.6" stroke-opacity="0.6"/>
<g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_5.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_5.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<path d="M15,3C8.373,3,3,8.373,3,15c0,6.628,5.373,12,12,12s12-5.372,12-12 C27,8.373,21.627,3,15,3z M15,22.291c-4.027,0-7.291-3.264-7.291-7.291c0-4.027,3.264-7.291,7.291-7.291 c4.025,0,7.291,3.264,7.291,7.291C22.291,19.027,19.025,22.291,15,22.291z" fill-opacity="0.6" stroke-opacity="0.6"/>
<g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_6.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_6.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<path d="M15,3C8.373,3,3,8.373,3,15c0,6.628,5.373,12,12,12s12-5.372,12-12 C27,8.373,21.627,3,15,3z M15,22.291c-4.027,0-7.291-3.264-7.291-7.291c0-4.027,3.264-7.291,7.291-7.291 c4.025,0,7.291,3.264,7.291,7.291C22.291,19.027,19.025,22.291,15,22.291z" fill-opacity="0.6" stroke-opacity="0.6"/>
<g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_7.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_7.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<path d="M15,3C8.373,3,3,8.373,3,15c0,6.628,5.373,12,12,12s12-5.372,12-12 C27,8.373,21.627,3,15,3z M15,22.291c-4.027,0-7.291-3.264-7.291-7.291c0-4.027,3.264-7.291,7.291-7.291 c4.025,0,7.291,3.264,7.291,7.291C22.291,19.027,19.025,22.291,15,22.291z" fill-opacity="0.6" stroke-opacity="0.6"/>
<g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_8.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_8.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<path d="M15,3C8.373,3,3,8.373,3,15c0,6.628,5.373,12,12,12s12-5.372,12-12 C27,8.373,21.627,3,15,3z M15,22.291c-4.027,0-7.291-3.264-7.291-7.291c0-4.027,3.264-7.291,7.291-7.291 c4.025,0,7.291,3.264,7.291,7.291C22.291,19.027,19.025,22.291,15,22.291z" fill-opacity="0.6" stroke-opacity="0.6"/>
<g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_9.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_9.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<path d="M15,3C8.373,3,3,8.373,3,15c0,6.628,5.373,12,12,12s12-5.372,12-12 C27,8.373,21.627,3,15,3z M15,22.291c-4.027,0-7.291-3.264-7.291-7.291c0-4.027,3.264-7.291,7.291-7.291 c4.025,0,7.291,3.264,7.291,7.291C22.291,19.027,19.025,22.291,15,22.291z" fill-opacity="0.6" stroke-opacity="0.6"/>
<g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="10" width="50"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="50" y="9"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0,0v6c0,2.2,1.8,4,4,4h6V0H0z" fill="url(#SVGID_1_)"/>
<path d="M4,9C2.346,9,1,7.654,1,6V0H0v6c0,2.2,1.8,4,4,4h6V9H4z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0,0v10h6c2.201,0,4-1.8,4-4V0H0z" fill="url(#SVGID_1_)"/>
<path d="M9,0v6c0,1.654-1.346,3-3,3H0v1h6c2.201,0,4-1.8,4-4V0H9z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="10 0 50 30" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="10 0 50 30" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="50" x="10"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="35" x2="35" y1="40" y2="-9.8396">
<stop offset="0" style="stop-color:#D2D2D2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10" x="0"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="0"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="10" width="50"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="50"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M4,0C1.8,0,0,1.8,0,4v6h10V0H4z" fill="url(#SVGID_1_)"/>
<path d="M4,0C1.8,0,0,1.8,0,4v6h1V4c0-1.654,1.346-3,3-3h6V0H4z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M10,4c0-2.2-1.799-4-4-4H0v10h10V4z" fill="url(#SVGID_1_)"/>
<path d="M6,0H0v1h6c1.654,0,3,1.346,3,3v6h1V4C10,1.8,8.201,0,6,0z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="10" width="50"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="50" y="9"/>
<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="50" y="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0,0v6c0,2.2,1.8,4,4,4h6V0H0z" fill="url(#SVGID_1_)"/>
<path d="M4,9C2.346,9,1,7.654,1,6V0H0v6c0,2.2,1.8,4,4,4h6V9H4z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0,0v10h6c2.201,0,4-1.8,4-4V0H0z" fill="url(#SVGID_1_)"/>
<path d="M9,0v6c0,1.654-1.346,3-3,3H0v1h6c2.201,0,4-1.8,4-4V0H9z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="10 0 50 30" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="10 0 50 30" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="50" x="10"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="34.9995" x2="34.9995" y1="-9.875" y2="40.1658">
<stop offset="0" style="stop-color:#66B8CC"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10" x="0"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="0"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="10" width="50"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="50"/>
<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="50" y="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M4,0C1.8,0,0,1.8,0,4v6h10V0H4z" fill="url(#SVGID_1_)"/>
<path d="M4,1C2.346,1,1,2.346,1,4v6h1V4c0-1.103,0.896-2,2-2h6V1H4z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M10,4c0-2.2-1.799-4-4-4H0v10h10V4z" fill="url(#SVGID_1_)"/>
<path d="M6,0H0v1h6c1.654,0,3,1.346,3,3v6h1V4C10,1.8,8.201,0,6,0z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="10" width="50"/>
<rect fill="#9696A0" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="50" y="9"/>
<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="50" y="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0,0v6c0,2.2,1.8,4,4,4h6V0H0z" fill="url(#SVGID_1_)"/>
<path d="M4,9C2.346,9,1,7.654,1,6V0H0v6c0,2.2,1.8,4,4,4h6V9H4z" fill="#9696A0" fill-opacity="0.5" stroke-opacity="0.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0,0v10h6c2.201,0,4-1.8,4-4V0H0z" fill="url(#SVGID_1_)"/>
<path d="M9,0v6c0,1.654-1.346,3-3,3H0v1h6c2.201,0,4-1.8,4-4V0H9z" fill="#9696A0" fill-opacity="0.5" stroke-opacity="0.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="10 0 50 30" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="10 0 50 30" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="50" x="10"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="34.9995" x2="34.9995" y1="-10" y2="40.1476">
<stop offset="0" style="stop-color:#C8C8D2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10" x="0"/>
<rect fill="#9696A0" fill-opacity="0.5" height="30" stroke-opacity="0.5" width="1" x="0"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<rect fill="#9696A0" fill-opacity="0.5" height="30" stroke-opacity="0.5" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="10" width="50"/>
<rect fill="#9696A0" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="50"/>
<rect fill="#FFFFFF" fill-opacity="0.4" height="3" stroke-opacity="0.4" width="50" y="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M4,0C1.8,0,0,1.8,0,4v6h10V0H4z" fill="url(#SVGID_1_)"/>
<path d="M4,0C1.8,0,0,1.8,0,4v6h1V4c0-1.654,1.346-3,3-3h6V0H4z" fill="#9696A0" fill-opacity="0.5" stroke-opacity="0.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M10,4c0-2.2-1.799-4-4-4H0v10h10V4z" fill="url(#SVGID_1_)"/>
<path d="M6,0H0v1h6c1.654,0,3,1.346,3,3v6h1V4C10,1.8,8.201,0,6,0z" fill="#9696A0" fill-opacity="0.5" stroke-opacity="0.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="50"/>
<rect fill="url(#SVGID_1_)" height="10" width="50"/>
<rect fill="#9696A0" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="50" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0,0v6c0,2.2,1.8,4,4,4h6V0H0z" fill="url(#SVGID_1_)"/>
<path d="M4,9C2.346,9,1,7.654,1,6V0H0v6c0,2.2,1.8,4,4,4h6V9H4z" fill="#9696A0" fill-opacity="0.5" stroke-opacity="0.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0,0v10h6c2.2,0,4-1.8,4-4V0H0z" fill="url(#SVGID_1_)"/>
<path d="M9,0v6c0,1.654-1.346,3-3,3H0v1h6c2.2,0,4-1.8,4-4V0H9z" fill="#9696A0" fill-opacity="0.5" stroke-opacity="0.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="50"/>
<rect fill="url(#SVGID_1_)" height="30" width="50"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<rect fill="#9696A0" fill-opacity="0.5" height="30" stroke-opacity="0.5" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<rect fill="#9696A0" fill-opacity="0.5" height="30" stroke-opacity="0.5" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="50"/>
<rect fill="url(#SVGID_1_)" height="10" width="50"/>
<rect fill="#9696A0" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="50"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M4,0C1.8,0,0,1.8,0,4v6h10V0H4z" fill="url(#SVGID_1_)"/>
<path d="M4,0C1.8,0,0,1.8,0,4v6h1V4c0-1.654,1.346-3,3-3h6V0H4z" fill="#9696A0" fill-opacity="0.5" stroke-opacity="0.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M10,4c0-2.2-1.8-4-4-4H0v10h10V4z" fill="url(#SVGID_1_)"/>
<path d="M6,0H0v1h6c1.654,0,3,1.346,3,3v6h1V4C10,1.8,8.2,0,6,0z" fill="#9696A0" fill-opacity="0.5" stroke-opacity="0.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="10" width="50"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="50" y="9"/>
<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="50" y="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0,0v6c0,2.2,1.8,4,4,4h6V0H0z" fill="url(#SVGID_1_)"/>
<path d="M4,9C2.346,9,1,7.654,1,6V0H0v6c0,2.2,1.8,4,4,4h6V9H4z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0,0v10h6c2.201,0,4-1.8,4-4V0H0z" fill="url(#SVGID_1_)"/>
<path d="M9,0v6c0,1.654-1.346,3-3,3H0v1h6c2.201,0,4-1.8,4-4V0H9z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="10 0 50 30" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="10 0 50 30" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="50" x="10"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="35" x2="35" y1="40" y2="-9.7498">
<stop offset="0" style="stop-color:#65B8CC"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10" x="0"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="0"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="10" width="50"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="50"/>
<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="50" y="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M4,0C1.8,0,0,1.8,0,4v6h10V0H4z" fill="url(#SVGID_1_)"/>
<path d="M4,1C2.346,1,1,2.346,1,4v6h1V4c0-1.103,0.897-2,2-2h6V1H4z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M10,4c0-2.2-1.799-4-4-4H0v10h10V4z" fill="url(#SVGID_1_)"/>
<path d="M6,0H0v1h6c1.654,0,3,1.346,3,3v6h1V4C10,1.8,8.201,0,6,0z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="70px" version="1.1" viewBox="0 0 10 70" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="70px" version="1.1" viewBox="0 0 10 70" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="70" width="10"/>
<rect fill-opacity="0.2" height="70" stroke-opacity="0.2" width="10"/>
<rect fill-opacity="0.2" height="9" stroke-opacity="0.2" width="10" y="60"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="70px" version="1.1" viewBox="0 0 10 70" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="70px" version="1.1" viewBox="0 0 10 70" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="70" width="10"/>
<path d="M9,0C4.037,0,0,4.037,0,9v51c0,4.963,4.037,10,9,10h1V0H9z" fill-opacity="0.2" stroke-opacity="0.2"/>
<path d="M1,60v1c0,4.4,3.6,8,8,8h1v-9H1z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="70px" version="1.1" viewBox="0 0 10 70" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="70px" version="1.1" viewBox="0 0 10 70" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="70" width="10"/>
<path d="M1,0H0v70h1c4.963,0,9-5.037,9-10V9C10,4.037,5.963,0,1,0z" fill-opacity="0.2" stroke-opacity="0.2"/>
<path d="M0,60v9h1c4.4,0,8-3.6,8-8v-1H0z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<rect fill="#AAAAAA" fill-opacity="0.8" height="38" stroke-opacity="0.8" width="38"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="38" y="37"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<path d="M4,0C1.8,0,0,1.8,0,4v30c0,2.2,1.8,4,4,4h34V0H4z" fill="#AAAAAA" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M4,37c-1.654,0-3-1.346-3-3V4c0-1.654,1.346-3,3-3h34V0H4C1.8,0,0,1.8,0,4v30c0,2.2,1.8,4,4,4h34v-1H4z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<rect fill="#AAAAAA" fill-opacity="0.8" height="38" stroke-opacity="0.8" width="38"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="38" y="37"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_edit_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_edit_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<rect fill="url(#SVGID_1_)" height="38" width="38"/>
<rect fill="#BEBEC8" height="1" width="38" y="37"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_edit_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_edit_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<path d="M4,0C1.8,0,0,1.8,0,4v30c0,2.2,1.8,4,4,4h34V0H4z" fill="url(#SVGID_1_)"/>
<path d="M4,37c-1.654,0-3-1.346-3-3V4c0-1.654,1.346-3,3-3h34V0H4C1.8,0,0,1.8,0,4v30c0,2.2,1.8,4,4,4h34v-1H4z" fill="#BEBEC8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_edit_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_edit_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<rect fill="url(#SVGID_1_)" height="38" width="38"/>
<rect fill="#BEBEC8" height="1" width="38" y="37"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19" x2="19" y1="2" y2="36.0005">
<stop offset="0" style="stop-color:#DCDCDC"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="2" y2="36.0005">
<stop offset="0" style="stop-color:#DCDCDC"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19" x2="19" y1="2" y2="36.0005">
<stop offset="0" style="stop-color:#DCDCDC"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<rect fill="url(#SVGID_1_)" height="38" width="38"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="38" y="37"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<path d="M4,0C1.8,0,0,1.8,0,4v30c0,2.2,1.8,4,4,4h34V0H4z" fill="url(#SVGID_1_)"/>
<path d="M4,37c-1.654,0-3-1.346-3-3V4c0-1.654,1.346-3,3-3h34V0H4C1.8,0,0,1.8,0,4v30c0,2.2,1.8,4,4,4h34v-1H4z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<rect fill="url(#SVGID_1_)" height="38" width="38"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="38" y="37"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<rect fill="url(#SVGID_1_)" height="38" width="38"/>
<rect fill="#BEBEC8" height="1" width="38" y="37"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<path d="M4,0C1.8,0,0,1.8,0,4v30c0,2.2,1.8,4,4,4h34V0H4z" fill="url(#SVGID_1_)"/>
<path d="M4,37c-1.654,0-3-1.346-3-3V4c0-1.654,1.346-3,3-3h34V0H4C1.8,0,0,1.8,0,4v30c0,2.2,1.8,4,4,4h34v-1H4z" fill="#BEBEC8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<rect fill="url(#SVGID_1_)" height="38" width="38"/>
<rect fill="#BEBEC8" height="1" width="38" y="37"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<rect fill="url(#SVGID_1_)" height="38" width="38"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="38" y="37"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_pressed_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_pressed_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<path d="M4,0C1.8,0,0,1.8,0,4v30c0,2.2,1.8,4,4,4h34V0H4z" fill="url(#SVGID_1_)"/>
<path d="M4,37c-1.654,0-3-1.346-3-3V4c0-1.654,1.346-3,3-3h34V0H4C1.8,0,0,1.8,0,4v30c0,2.2,1.8,4,4,4h34v-1H4z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_pressed_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_pressed_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<rect fill="url(#SVGID_1_)" height="38" width="38"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="38" y="37"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<rect fill="url(#SVGID_1_)" height="10" width="80"/>
<rect fill="#DCDCDC" height="1" width="80" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<rect fill="#DCDCDC" height="1" width="10" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<rect fill="#DCDCDC" height="1" width="10" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="80"/>
<rect fill="url(#SVGID_1_)" height="80" width="80"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<rect fill="url(#SVGID_1_)" height="80" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<rect fill="url(#SVGID_1_)" height="80" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<rect fill="url(#SVGID_1_)" height="10" width="80"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<rect fill="url(#SVGID_1_)" height="10" width="80"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M0,0v4c0,3.3,2.7,6,6,6h4V0H0z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M0,0v10h4c3.301,0,6-2.7,6-6V0H0z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<rect fill="url(#SVGID_1_)" height="80" width="80"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<g>
<rect fill="url(#SVGID_1_)" height="80" width="10" x="0"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<g>
<rect fill="url(#SVGID_1_)" height="80" width="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<rect fill="url(#SVGID_1_)" height="10" width="80"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M6,0c-3.3,0-6,2.7-6,6v4h10V0H6z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M10,6c0-3.3-2.699-6-6-6H0v10h10V6z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<g>
<rect fill="url(#SVGID_1_)" height="10" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M0,0v4c0,3.3,2.7,6,6,6h4V0H0z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M0,0v10h4c3.3,0,6-2.7,6-6V0H0z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="80"/>
<g>
<rect fill="url(#SVGID_1_)" height="80" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<g>
<rect fill="url(#SVGID_1_)" height="80" width="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<g>
<rect fill="url(#SVGID_1_)" height="80" width="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<g>
<rect fill="url(#SVGID_1_)" height="10" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M6,0C2.7,0,0,2.7,0,6v4h10V0H6z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M10,6c0-3.3-2.7-6-6-6H0v10h10V6z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<g>
<rect fill="url(#SVGID_1_)" height="10" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M0,0v4c0,3.3,2.7,6,6,6h4V0H0z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M0,0v10h4c3.3,0,6-2.7,6-6V0H0z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="80"/>
<g>
<rect fill="url(#SVGID_1_)" height="80" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<g>
<rect fill="url(#SVGID_1_)" height="80" width="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<g>
<rect fill="url(#SVGID_1_)" height="80" width="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<g>
<rect fill="url(#SVGID_1_)" height="10" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M6,0C2.7,0,0,2.7,0,6v4h10V0H6z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M10,6c0-3.3-2.7-6-6-6H0v10h10V6z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="39.9995" x2="39.9995" y1="-88.7495" y2="-80.4844">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-88.7495" y2="-80.4844">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-88.7495" y2="-80.4844">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="80"/>
<g>
<rect fill="url(#SVGID_1_)" height="80" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-8.75" y2="-0.4848">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-8.75" y2="-0.4848">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="39.9995" x2="39.9995" y1="1.25" y2="9.5151">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="1.25" y2="9.5151">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="1.25" y2="9.5151">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<g>
<rect fill="url(#SVGID_1_)" height="10" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M0,0v4c0,3.3,2.7,6,6,6h4V0H0z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M0,0v10h4c3.301,0,6-2.7,6-6V0H0z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="80"/>
<g>
<rect fill="url(#SVGID_1_)" height="80" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<g>
<rect fill="url(#SVGID_1_)" height="80" width="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<g>
<rect fill="url(#SVGID_1_)" height="80" width="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<g>
<rect fill="url(#SVGID_1_)" height="10" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M6,0C2.7,0,0,2.7,0,6v4h10V0H6z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M10,6c0-3.3-2.699-6-6-6H0v10h10V6z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<g fill-opacity="0.2" stroke-opacity="0.2">
<rect height="10" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g fill-opacity="0.2" stroke-opacity="0.2">
<path d="M0,0v4c0,3.3,2.7,6,6,6h4V0H0z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g fill-opacity="0.2" stroke-opacity="0.2">
<path d="M0,0v10h4c3.301,0,6-2.7,6-6V0H0z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="80"/>
<g fill-opacity="0.2" stroke-opacity="0.2">
<rect height="80" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<g>
<rect fill="url(#SVGID_1_)" height="10" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M0,0v4c0,3.3,2.7,6,6,6h4V0H0z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M0,0v10h4c3.3,0,6-2.7,6-6V0H0z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="80"/>
<g>
<rect fill="url(#SVGID_1_)" height="80" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<g>
<rect fill="url(#SVGID_1_)" height="80" width="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<g>
<rect fill="url(#SVGID_1_)" height="80" width="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<g>
<rect fill="url(#SVGID_1_)" height="10" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M6,0C2.7,0,0,2.7,0,6v4h10V0H6z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M10,6c0-3.3-2.7-6-6-6H0v10h10V6z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<g fill-opacity="0.2" stroke-opacity="0.2">
<rect height="80" width="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<g>
<rect fill="url(#SVGID_1_)" height="10" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M0,0v4c0,3.3,2.7,6,6,6h4V0H0z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M0,0v10h4c3.3,0,6-2.7,6-6V0H0z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="80"/>
<g>
<rect fill="url(#SVGID_1_)" height="80" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<g>
<rect fill="url(#SVGID_1_)" height="80" width="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<g>
<rect fill="url(#SVGID_1_)" height="80" width="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<g>
<rect fill="url(#SVGID_1_)" height="10" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M6,0C2.7,0,0,2.7,0,6v4h10V0H6z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M10,6c0-3.3-2.7-6-6-6H0v10h10V6z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<g>
<rect fill="url(#SVGID_1_)" height="10" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M0,0v4c0,3.3,2.7,6,6,6h4V0H0z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M0,0v10h4c3.299,0,6-2.7,6-6V0H0z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="80"/>
<g>
<rect fill="url(#SVGID_1_)" height="80" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<g>
<rect fill="url(#SVGID_1_)" height="80" width="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<g>
<rect fill="url(#SVGID_1_)" height="80" width="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<g>
<rect fill="url(#SVGID_1_)" height="10" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M6,0C2.7,0,0,2.7,0,6v4h10V0H6z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g>
<path d="M10,6c0-3.3-2.701-6-6-6H0v10h10V6z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<g fill-opacity="0.2" stroke-opacity="0.2">
<rect height="80" width="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<g fill-opacity="0.2" stroke-opacity="0.2">
<rect height="10" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g fill-opacity="0.2" stroke-opacity="0.2">
<path d="M6,0C2.7,0,0,2.7,0,6v4h10V0H6z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<g fill-opacity="0.2" stroke-opacity="0.2">
<path d="M10,6c0-3.3-2.699-6-6-6H0v10h10V6z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="50"/>
<rect fill="#AAAAAF" fill-opacity="0.8" height="7" stroke-opacity="0.8" width="50"/>
<rect fill-opacity="0.2" height="3" stroke-opacity="0.2" width="50" y="6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M2,0v2c0,2.757,2.243,5,5,5h3V0H2z" fill="#AAAAAF" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M7,6C4.794,6,3,4.205,3,2V0H1v3c0,3.3,2.7,6,6,6h3V6H7z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0,0v7h3c2.757,0,5-2.243,5-5V0H0z" fill="#AAAAAF" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M7,0v2c0,2.205-1.794,4-4,4H0v3h3c3.3,0,6-2.7,6-6V0H7z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="50"/>
<rect fill="#AAAAAF" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="50"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="#AAAAAF" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="8" x="2"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="2" x="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="#AAAAAF" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="8"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="2" x="7"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="50"/>
<rect fill="#AAAAAF" fill-opacity="0.8" height="8" stroke-opacity="0.8" width="50" y="2"/>
<rect fill-opacity="0.2" height="2" stroke-opacity="0.2" width="50" y="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M7,2C4.243,2,2,4.243,2,7v3h8V2H7z" fill="#AAAAAF" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M7,1C3.7,1,1,3.7,1,7v3h2V7c0-2.205,1.794-4,4-4h3V1H7z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M8,7c0-2.757-2.243-5-5-5H0v8h8V7z" fill="#AAAAAF" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M3,1H0v2h3c2.206,0,4,1.795,4,4v3h2V7C9,3.7,6.3,1,3,1z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="50"/>
<rect fill="#14141E" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="7"/>
<rect fill-opacity="0.2" height="6" stroke-opacity="0.2" width="50" y="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M7,7C4.794,7,3,5.206,3,3V0H1v3c0,3.3,2.7,6,6,6h3V7H7z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M2,2v1c0,2.757,2.243,5,5,5h3V2H2z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M7,0v3c0,2.206-1.795,4-4,4H0v2h3c3.3,0,6-2.7,6-6V0H7z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M0,2v6h3c2.757,0,5-2.243,5-5V2H0z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="50"/>
<rect fill="url(#SVGID_1_)" height="30" width="50"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="#14141E" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="1"/>
<rect fill="url(#SVGID_1_)" height="30" width="8" x="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="#14141E" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="7"/>
<rect fill="url(#SVGID_1_)" height="30" width="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="50"/>
<rect fill="#14141E" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="1"/>
<rect fill="url(#SVGID_1_)" height="8" width="50" y="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M7,1C3.7,1,1,3.7,1,7v3h2V7c0-2.206,1.794-4,4-4h3V1H7z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M7,2C4.243,2,2,4.243,2,7v3h8V2H7z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M3,1H0v2h3c2.205,0,4,1.794,4,4v3h2V7C9,3.7,6.3,1,3,1z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M8,7c0-2.757-2.243-5-5-5H0v8h8V7z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="50"/>
<rect fill="#14141E" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="7"/>
<rect fill-opacity="0.2" height="6" stroke-opacity="0.2" width="50" y="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M7,7C4.794,7,3,5.206,3,3V0H1v3c0,3.3,2.7,6,6,6h3V7H7z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M2,2v1c0,2.757,2.243,5,5,5h3V2H2z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M7,0v3c0,2.206-1.795,4-4,4H0v2h3c3.3,0,6-2.7,6-6V0H7z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M0,2v6h3c2.757,0,5-2.243,5-5V2H0z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="50"/>
<rect fill="url(#SVGID_1_)" height="30" width="50"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="#14141E" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="1"/>
<rect fill="url(#SVGID_1_)" height="30" width="8" x="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="#14141E" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="7"/>
<rect fill="url(#SVGID_1_)" height="30" width="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="50"/>
<rect fill="#14141E" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="1"/>
<rect fill="url(#SVGID_1_)" height="8" width="50" y="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M7,1C3.7,1,1,3.7,1,7v3h2V7c0-2.206,1.794-4,4-4h3V1H7z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M7,2C4.243,2,2,4.243,2,7v3h8V2H7z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M3,1H0v2h3c2.205,0,4,1.794,4,4v3h2V7C9,3.7,6.3,1,3,1z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M8,7c0-2.757-2.243-5-5-5H0v8h8V7z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="50"/>
<rect fill="#14141E" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="7"/>
<rect fill-opacity="0.2" height="6" stroke-opacity="0.2" width="50" y="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M1,0v3c0,3.3,2.7,6,6,6h3V7H7C4.794,7,3,5.206,3,3V0H1z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M2,2v1c0,2.757,2.243,5,5,5h3V2H2z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M7,3c0,2.206-1.795,4-4,4H0v2h3c3.3,0,6-2.7,6-6V0H7V3z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M0,2v6h3c2.757,0,5-2.243,5-5V2H0z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="50"/>
<rect fill="url(#SVGID_1_)" height="30" width="50"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="#14141E" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="1"/>
<rect fill="url(#SVGID_1_)" height="30" width="8" x="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="#14141E" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="7"/>
<rect fill="url(#SVGID_1_)" height="30" width="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="50"/>
<rect fill="#14141E" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="1"/>
<rect fill="url(#SVGID_1_)" height="8" width="50" y="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M3,7c0-2.206,1.794-4,4-4h3V1H7C3.7,1,1,3.7,1,7v3h2V7z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M10,2H7C4.243,2,2,4.243,2,7v3h8V2z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M9,7c0-3.3-2.7-6-6-6H0v2h3c2.205,0,4,1.794,4,4v3h2V7z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M8,7c0-2.757-2.243-5-5-5H0v8h8V7z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="50"/>
<rect fill="#141414" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="7"/>
<rect fill-opacity="0.2" height="6" stroke-opacity="0.2" width="50" y="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M7,7C4.794,7,3,5.206,3,3V0H1v3c0,3.3,2.7,6,6,6h3V7H7z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M2,2v1c0,2.757,2.243,5,5,5h3V2H2z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M7,0v3c0,2.206-1.795,4-4,4H0v2h3c3.3,0,6-2.7,6-6V0H7z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M0,2v6h3c2.757,0,5-2.243,5-5V2H0z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="50"/>
<rect fill="url(#SVGID_1_)" height="30" width="50"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="#141414" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="1"/>
<rect fill="url(#SVGID_1_)" height="30" width="8" x="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="#141414" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="7"/>
<rect fill="url(#SVGID_1_)" height="30" width="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="50"/>
<rect fill="#141414" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="1"/>
<rect fill="url(#SVGID_1_)" height="8" width="50" y="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M7,1C3.7,1,1,3.7,1,7v3h2V7c0-2.206,1.794-4,4-4h3V1H7z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M7,2C4.243,2,2,4.243,2,7v3h8V2H7z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M3,1H0v2h3c2.205,0,4,1.794,4,4v3h2V7C9,3.7,6.3,1,3,1z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M8,7c0-2.757-2.243-5-5-5H0v8h8V7z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="50"/>
<rect fill="#AAAAAF" fill-opacity="0.8" height="7" stroke-opacity="0.8" width="50"/>
<rect fill-opacity="0.2" height="3" stroke-opacity="0.2" width="50" y="6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M2,0v2c0,2.757,2.243,5,5,5h3V0H2z" fill="#AAAAAF" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M7,6C4.794,6,3,4.205,3,2V0H1v3c0,3.3,2.7,6,6,6h3V6H7z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0,0v7h3c2.757,0,5-2.243,5-5V0H0z" fill="#AAAAAF" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M7,0v2c0,2.205-1.794,4-4,4H0v3h3c3.3,0,6-2.7,6-6V0H7z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="50"/>
<rect fill="#AAAAAF" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="50"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="#AAAAAF" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="8" x="2"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="2" x="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="#AAAAAF" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="8"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="2" x="7"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="50"/>
<rect fill="#AAAAAF" fill-opacity="0.8" height="8" stroke-opacity="0.8" width="50" y="2"/>
<rect fill-opacity="0.2" height="2" stroke-opacity="0.2" width="50" y="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M7,2C4.243,2,2,4.243,2,7v3h8V2H7z" fill="#AAAAAF" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M7,1C3.7,1,1,3.7,1,7v3h2V7c0-2.205,1.794-4,4-4h3V1H7z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M8,7c0-2.757-2.243-5-5-5H0v8h8V7z" fill="#AAAAAF" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M3,1H0v2h3c2.206,0,4,1.795,4,4v3h2V7C9,3.7,6.3,1,3,1z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="50"/>
<rect fill="#14141E" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="7"/>
<rect fill-opacity="0.2" height="6" stroke-opacity="0.2" width="50" y="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M7,7C4.794,7,3,5.206,3,3V0H1v3c0,3.3,2.7,6,6,6h3V7H7z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M2,2v1c0,2.757,2.243,5,5,5h3V2H2z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M7,0v3c0,2.206-1.795,4-4,4H0v2h3c3.3,0,6-2.7,6-6V0H7z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M0,2v1v5h3c2.757,0,5-2.243,5-5V2H0z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="50"/>
<rect fill="url(#SVGID_1_)" height="30" width="50"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="#14141E" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="1"/>
<rect fill="url(#SVGID_1_)" height="30" width="8" x="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="#14141E" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="7"/>
<rect fill="url(#SVGID_1_)" height="30" width="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="50"/>
<rect fill="#14141E" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="1"/>
<rect fill="url(#SVGID_1_)" height="8" width="50" y="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M7,1C3.7,1,1,3.7,1,7v3h2V7c0-2.206,1.794-4,4-4h3V1H7z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M7,2C4.243,2,2,4.243,2,7v3h8V2H7z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M3,1H0v2h3c2.205,0,4,1.794,4,4v3h2V7C9,3.7,6.3,1,3,1z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M8,7c0-2.757-2.243-5-5-5H0v8h8V7z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="50"/>
<rect fill="#141414" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="7"/>
<rect fill-opacity="0.2" height="6" stroke-opacity="0.2" width="50" y="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M7,7C4.794,7,3,5.206,3,3V0H1v3c0,3.3,2.7,6,6,6h3V7H7z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M2,2v1c0,2.757,2.243,5,5,5h3V2H2z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M7,0v3c0,2.206-1.795,4-4,4H0v2h3c3.3,0,6-2.7,6-6V0H7z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M0,2v6h3c2.757,0,5-2.243,5-5V2H0z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="50"/>
<rect fill="url(#SVGID_1_)" height="30" width="50"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="#141414" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="1"/>
<rect fill="url(#SVGID_1_)" height="30" width="8" x="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="#141414" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="7"/>
<rect fill="url(#SVGID_1_)" height="30" width="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="50"/>
<rect fill="#141414" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="1"/>
<rect fill="url(#SVGID_1_)" height="8" width="50" y="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M7,1C3.7,1,1,3.7,1,7v3h2V7c0-2.206,1.794-4,4-4h3V1H7z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M7,2C4.243,2,2,4.243,2,7v3h8V2H7z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M3,1H0v2h3c2.205,0,4,1.794,4,4v3h2V7C9,3.7,6.3,1,3,1z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M8,7c0-2.757-2.243-5-5-5H0v8h8V7z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="50"/>
<rect fill="#141414" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="7"/>
<rect fill-opacity="0.2" height="6" stroke-opacity="0.2" width="50" y="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M7,7C4.794,7,3,5.206,3,3V0H1v3c0,3.3,2.7,6,6,6h3V7H7z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M2,2v1c0,2.757,2.243,5,5,5h3V2H2z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M7,0v3c0,2.206-1.795,4-4,4H0v2h3c3.3,0,6-2.7,6-6V0H7z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M0,2v6h3c2.757,0,5-2.243,5-5V2H0z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="50"/>
<rect fill="url(#SVGID_1_)" height="30" width="50"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="#141414" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="1"/>
<rect fill="url(#SVGID_1_)" height="30" width="8" x="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="#141414" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="7"/>
<rect fill="url(#SVGID_1_)" height="30" width="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="50"/>
<rect fill="#141414" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="1"/>
<rect fill="url(#SVGID_1_)" height="8" width="50" y="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M7,1C3.7,1,1,3.7,1,7v3h2V7c0-2.206,1.794-4,4-4h3V1H7z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M7,2C4.243,2,2,4.243,2,7v3h8V2H7z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M3,1H0v2h3c2.205,0,4,1.794,4,4v3h2V7C9,3.7,6.3,1,3,1z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M8,7c0-2.757-2.243-5-5-5H0v8h8V7z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 15 15" width="15px" x="0px" y="0px">
+<svg baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 15 15" width="15px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="15" width="15"/>
<rect fill="#AAAAAF" height="15" width="15"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 15 15" width="15px" x="0px" y="0px">
+<svg baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 15 15" width="15px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="15" width="15"/>
<rect fill="url(#SVGID_1_)" height="15" width="15"/>
<rect fill="#969696" height="15" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 15 15" width="15px" x="0px" y="0px">
+<svg baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 15 15" width="15px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="15" width="15"/>
<rect fill="#AAAAAF" height="15" width="15"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 15 15" width="15px" x="0px" y="0px">
+<svg baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 15 15" width="15px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="15" width="15" x="0"/>
<rect fill="#AAAAAF" height="15" width="15"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 15 15" width="15px" x="0px" y="0px">
+<svg baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 15 15" width="15px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="15" width="15" x="0"/>
<rect fill="#AAAAAF" height="15" width="15"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 15 15" width="15px" x="0px" y="0px">
+<svg baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 15 15" width="15px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="15" width="15" x="0"/>
<rect fill="url(#SVGID_1_)" height="15" width="15"/>
<rect fill="#969696" height="1" width="15"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="-27.9995" y2="7.6726">
<stop offset="0" style="stop-color:#E6E6EB"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="-27.9995" y2="7.6726">
<stop offset="0" style="stop-color:#E6E6EB"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="-27.9995" y2="7.6726">
<stop offset="0" style="stop-color:#E6E6EB"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 300 20" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 300 20" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="300"/>
<rect fill="url(#SVGID_1_)" height="20" width="300"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 10 20" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 10 20" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="10"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="-8" y2="27.6731">
<stop offset="0" style="stop-color:#E6E6EB"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 10 20" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 10 20" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="10"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="-8" y2="27.6731">
<stop offset="0" style="stop-color:#E6E6EB"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="2" y2="37.6721">
<stop offset="0" style="stop-color:#E6E6EB"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="2" y2="37.6721">
<stop offset="0" style="stop-color:#E6E6EB"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="2" y2="37.6721">
<stop offset="0" style="stop-color:#E6E6EB"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="url(#SVGID_1_)" height="9.5" width="300"/>
<rect fill="#B4B4B9" height="1" width="300" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0.5,6c0,1.93,1.57,3.5,3.5,3.5h6V0H0.5V6z" fill="url(#SVGID_1_)"/>
<path d="M0,0v6c0,2.2,1.8,4,4,4h6V9H4C2.346,9,1,7.654,1,6V0H0z" fill="#B4B4B9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0,9.5h6c1.93,0,3.5-1.57,3.5-3.5V0H0V9.5z" fill="url(#SVGID_1_)"/>
<path d="M9,6c0,1.654-1.346,3-3,3H0v1h6c2.2,0,4-1.8,4-4V0H9V6z" fill="#B4B4B9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 300 20" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 300 20" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="300"/>
<rect fill="url(#SVGID_1_)" height="20" width="300"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 10 20" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 10 20" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="10"/>
<rect fill="url(#SVGID_1_)" height="20" width="9.5" x="0.5"/>
<rect fill="#B4B4B9" height="20" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 10 20" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 10 20" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="10"/>
<rect fill="url(#SVGID_1_)" height="20" width="9.5"/>
<rect fill="#B4B4B9" height="20" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="url(#SVGID_1_)" height="9.5" width="300" y="0.5"/>
<rect fill="#B4B4B9" height="1" width="300"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M10,0.5H4C2.07,0.5,0.5,2.07,0.5,4v6H10V0.5z" fill="url(#SVGID_1_)"/>
<path d="M1,4c0-1.654,1.346-3,3-3h6V0H4C1.8,0,0,1.8,0,4v6h1V4z" fill="#B4B4B9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M9.5,4c0-1.93-1.57-3.5-3.5-3.5H0V10h9.5V4z" fill="url(#SVGID_1_)"/>
<path d="M10,4c0-2.2-1.8-4-4-4H0v1h6c1.654,0,3,1.346,3,3v6h1V4z" fill="#B4B4B9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="url(#SVGID_1_)" height="10" width="300"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="300" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<polygon fill-opacity="0.2" points="1,9 1,0 0,0 0,10 10,10 10,9 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<polygon fill-opacity="0.2" points="10,0 9,0 9,9 0,9 0,10 10,10 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="300"/>
<rect fill="url(#SVGID_1_)" height="30" width="300"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="url(#SVGID_1_)" height="10" width="300"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="300"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<polygon fill-opacity="0.2" points="0,0 0,10 1,10 1,1 10,1 10,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<polygon fill-opacity="0.2" points="0,0 0,1 9,1 9,10 10,10 10,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="url(#SVGID_1_)" height="10" width="300"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="300" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<polygon fill-opacity="0.2" points="1,9 1,0 0,0 0,10 10,10 10,9 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<polygon fill-opacity="0.2" points="10,0 9,0 9,9 0,9 0,10 10,10 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="300"/>
<rect fill="url(#SVGID_1_)" height="30" width="300"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="url(#SVGID_1_)" height="10" width="300"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="300"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<polygon fill-opacity="0.2" points="0,0 0,10 1,10 1,1 10,1 10,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<polygon fill-opacity="0.2" points="0,0 0,1 9,1 9,10 10,10 10,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_new_item_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_new_item_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="none" height="10" width="10" x="0"/>
<path d="M2,0h6v6c0,1.656-1.342,3-3,3l0,0C3.343,9,2,7.656,2,6V0z" fill="#3F89A9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_new_item_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_new_item_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="#3F89A9" height="10" width="6" x="2"/>
<rect fill="none" height="10" width="10" x="0"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_new_item_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_new_item_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="none" height="10" width="10" x="0"/>
<path d="M8,10H2V4c0-1.657,1.343-3,3-3l0,0c1.658,0,3,1.343,3,3V10z" fill="#3F89A9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="url(#SVGID_1_)" height="10" width="300"/>
<rect fill="#FFFFFF" height="1" width="300" y="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<rect fill="#FFFFFF" height="1" width="10" y="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<rect fill="#FFFFFF" height="1" width="10" y="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="300"/>
<rect fill="url(#SVGID_1_)" height="30" width="300"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="url(#SVGID_1_)" height="10" width="300"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="url(#SVGID_1_)" height="10" width="300"/>
<rect fill="#FFFFFF" height="1" width="300" y="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<rect fill="#FFFFFF" height="1" width="10" y="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<rect fill="#FFFFFF" height="1" width="10" y="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="300"/>
<rect fill="url(#SVGID_1_)" height="30" width="300"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="url(#SVGID_1_)" height="10" width="300"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="10" width="300"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="300" y="9"/>
<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="300" y="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10" x="0"/>
<polygon fill-opacity="0.2" points="1,9 1,0 0,0 0,10 10,10 10,9 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<polygon fill-opacity="0.2" points="10,0 9,0 9,9 0,9 0,10 10,10 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="30" width="300"/>
<defs>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="150" x2="150" y1="40" y2="-9.5093">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10" x="0"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="0"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="10" width="300"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="300"/>
<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="300" y="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10" x="0"/>
<polygon fill-opacity="0.2" points="0,0 0,10 1,10 1,1 10,1 10,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<polygon fill-opacity="0.2" points="0,0 0,1 9,1 9,10 10,10 10,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="url(#SVGID_1_)" height="10" width="300"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="300" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="300"/>
<rect fill="url(#SVGID_1_)" height="30" width="300"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="url(#SVGID_1_)" height="10" width="300"/>
<rect fill="#FFFFFF" height="1" width="300"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<rect fill="#FFFFFF" height="1" width="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<rect fill="#FFFFFF" height="1" width="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<rect fill="#FFFFFF" height="10" width="80"/>
<rect fill="#BEBEC8" height="1" width="80" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M10,10C4.477,10,0,5.522,0,0h10V10z" fill="#FFFFFF"/>
<path d="M9.998,9c-4.961,0-9-4.039-9-9H0c0,5.523,4.478,10,9.999,10L9.998,9z" fill="#BEBEC8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0,10c5.523,0,10-4.478,10-10H0V10z" fill="#FFFFFF"/>
<path d="M9,0.001c0,4.961-4.038,9-9,9v0.998c5.523,0,10-4.478,10-9.999L9,0.001z" fill="#BEBEC8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="80"/>
<rect fill="#FFFFFF" height="80" width="80"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 30 10" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 30 10" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="30"/>
<rect fill="url(#SVGID_1_)" height="10" width="30"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="30" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<rect fill="url(#SVGID_1_)" height="30" width="30"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10" y="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 30 10" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 30 10" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="30"/>
<rect fill="url(#SVGID_1_)" height="10" width="30"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 30 10" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 30 10" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="30"/>
<rect fill="url(#SVGID_1_)" height="10" width="30"/>
<rect fill="#D9D9D9" height="1" width="30" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<rect fill="#D9D9D9" height="1" width="10" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<polygon fill="#D9D9D9" points="9,0 9,9 0,9 0,10 10,10 10,0 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="30" width="30"/>
<defs>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="-9.8335" y2="40.0078">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10" y="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<rect fill="#D9D9D9" height="30" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 30 10" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 30 10" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="10" width="30"/>
<defs>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="0.1665" y2="50.0094">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<rect fill="#D9D9D9" height="10" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 30 10" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 30 10" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="30"/>
<rect fill="none" height="10" width="30"/>
<rect fill="#BEBEC8" height="1" width="30" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="none" height="10" width="10"/>
<rect fill="#BEBEC8" height="1" width="10" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="none" height="10" width="10"/>
<polygon fill="#BEBEC8" points="9,0 9,9 0,9 0,10 10,10 10,0 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<rect fill="none" height="30" width="30"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="none" height="30" width="10"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10" y="0"/>
<rect fill="none" height="30" width="10"/>
<rect fill="#BEBEC8" height="30" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 30 10" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 30 10" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="30"/>
<rect fill="none" height="10" width="30"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="none" height="10" width="10"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="none" height="10" width="10"/>
<rect fill="#BEBEC8" height="10" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 30 10" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 30 10" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="10" width="30"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="30" y="9"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="30" width="30"/>
<defs>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.0005" x2="15.0005" y1="40" y2="-9.8999">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10" y="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 30 10" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 30 10" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="10" width="30"/>
<defs>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.0005" x2="15.0005" y1="49.998" y2="0.0998">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 52 52" width="52px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 52 52" width="52px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="52" width="52"/>
<rect fill="#BEBEC8" fill-rule="evenodd" height="52" width="52"/>
<rect fill="url(#SVGID_1_)" fill-rule="evenodd" height="51" width="52" y="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 52 52" width="52px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 52 52" width="52px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M52,0H10C4.477,0,0,4.478,0,10v42h52V0z" fill="#BEBEC8" fill-rule="evenodd"/>
<path d="M1,52V10c0-4.963,4.038-9,9-9h42v51H1z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
<rect fill="#FFFFFF" height="1" width="51" x="1" y="50"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 52 52" width="52px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 52 52" width="52px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="52" width="52"/>
<path d="M0,0h42c5.523,0,10,4.478,10,10v42H0V0z" fill="#BEBEC8" fill-rule="evenodd"/>
<path d="M0,52V1h42c4.962,0,9,4.037,9,9v42H0z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<rect fill="#FFFFFF" height="80" width="10"/>
<rect fill="#BEBEC8" height="80" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="url(#SVGID_1_)" height="10" width="300"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="300" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<polygon fill-opacity="0.2" points="1,9 1,0 0,0 0,10 10,10 10,9 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<polygon fill-opacity="0.2" points="10,0 9,0 9,9 0,9 0,10 10,10 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="300"/>
<rect fill="url(#SVGID_1_)" height="30" width="300"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="url(#SVGID_1_)" height="10" width="300"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="300"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<polygon fill-opacity="0.2" points="0,0 0,10 1,10 1,1 10,1 10,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<polygon fill-opacity="0.2" points="0,0 0,1 9,1 9,10 10,10 10,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="url(#SVGID_1_)" height="10" width="300"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="300" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<polygon fill-opacity="0.2" points="1,9 1,0 0,0 0,10 10,10 10,9 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<polygon fill-opacity="0.2" points="10,0 9,0 9,9 0,9 0,10 10,10 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="300"/>
<rect fill="url(#SVGID_1_)" height="30" width="300"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="url(#SVGID_1_)" height="10" width="300"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="300"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<polygon fill-opacity="0.2" points="0,0 0,10 1,10 1,1 10,1 10,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<polygon fill-opacity="0.2" points="0,0 0,1 9,1 9,10 10,10 10,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="none" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="300"/>
<rect fill="#DCDCDC" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="300" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="none" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
<rect fill="#DCDCDC" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="none" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
<rect fill="#DCDCDC" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="300"/>
<rect fill="none" fill-opacity="0.2" height="30" stroke-opacity="0.2" width="300"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="none" fill-opacity="0.2" height="30" stroke-opacity="0.2" width="10"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="none" fill-opacity="0.2" height="30" stroke-opacity="0.2" width="10"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="none" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="300"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="none" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="none" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="#FAFAFA" height="10" width="300"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="300" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="#FAFAFA" height="10" width="10"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="#FAFAFA" height="10" width="10"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="300"/>
<rect fill="#FAFAFA" height="30" width="300"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="#FAFAFA" height="30" width="10"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="#FAFAFA" height="30" width="10"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="#FAFAFA" height="10" width="300"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="#FAFAFA" height="10" width="10"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="#FAFAFA" height="10" width="10"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="10" width="300"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="300" y="9"/>
<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="300" y="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10" x="0"/>
<polygon fill-opacity="0.2" points="1,9 1,0 0,0 0,10 10,10 10,9 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<polygon fill-opacity="0.2" points="10,0 9,0 9,9 0,9 0,10 10,10 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="30" width="300"/>
<defs>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="150" x2="150" y1="40" y2="-9.5093">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10" x="0"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="0"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="url(#SVGID_1_)" height="30" width="10"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="10" width="300"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="300"/>
<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="300" y="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10" x="0"/>
<polygon fill-opacity="0.2" points="0,0 0,10 1,10 1,1 10,1 10,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="url(#SVGID_1_)" height="10" width="10"/>
<polygon fill-opacity="0.2" points="0,0 0,1 9,1 9,10 10,10 10,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<rect fill-opacity="0.8" height="10" stroke-opacity="0.8" width="80"/>
<rect height="1" width="80" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M10,10C4.477,10,0,5.522,0,0h10V10z" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M9.998,9c-4.961,0-9-4.039-9-9H0c0,5.523,4.478,10,9.999,10L9.998,9z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0,10c5.523,0,10-4.478,10-10H0V10z" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M9,0.001c0,4.961-4.038,9-9,9v0.998c5.523,0,10-4.478,10-9.999L9,0.001z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="80"/>
<rect fill-opacity="0.8" height="80" stroke-opacity="0.8" width="80"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<rect fill-opacity="0.8" height="80" stroke-opacity="0.8" width="10"/>
<rect height="80" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<rect fill-opacity="0.8" height="80" stroke-opacity="0.8" width="10"/>
<rect height="80" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<rect fill-opacity="0.8" height="10" stroke-opacity="0.8" width="80"/>
<rect height="1" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M10,0C4.477,0,0,4.477,0,10h10V0z" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M1,9.998c0-4.961,4.038-9,9-9L10,0C4.477,0,0,4.478,0,9.999L1,9.998z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0,0c5.523,0,10,4.477,10,10H0V0z" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M0.001,1c4.961,0,9,4.037,9,8.999L9.999,10C9.999,4.477,5.521,0,0,0L0.001,1z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<rect fill="#FFFFFF" height="80" width="10"/>
<rect fill="#BEBEC8" height="80" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<rect fill="#F0F0FA" height="10" width="80"/>
<rect fill="#BEBEC8" height="1" width="80" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M10,10C4.477,10,0,5.522,0,0h10V10z" fill="#F0F0FA"/>
<path d="M9.998,9c-4.961,0-9-4.039-9-9H0c0,5.523,4.478,10,9.999,10L9.998,9z" fill="#BEBEC8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0,10c5.523,0,10-4.478,10-10H0V10z" fill="#F0F0FA"/>
<path d="M9,0.001c0,4.961-4.038,9-9,9v0.998c5.523,0,10-4.478,10-9.999L9,0.001z" fill="#BEBEC8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="80"/>
<rect fill="#F0F0FA" height="80" width="80"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<rect fill="#F0F0FA" height="80" width="10"/>
<rect fill="#BEBEC8" height="80" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<rect fill="#F0F0FA" height="80" width="10"/>
<rect fill="#BEBEC8" height="80" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<rect fill="#F0F0FA" height="10" width="80"/>
<rect fill="#BEBEC8" height="1" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M10,0C4.477,0,0,4.477,0,10h10V0z" fill="#F0F0FA"/>
<path d="M1,9.998c0-4.961,4.038-9,9-9L10,0C4.477,0,0,4.478,0,9.999L1,9.998z" fill="#BEBEC8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0,0c5.523,0,10,4.477,10,10H0V0z" fill="#F0F0FA"/>
<path d="M0.001,1c4.961,0,9,4.037,9,8.999L9.999,10C9.999,4.477,5.521,0,0,0L0.001,1z" fill="#BEBEC8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="52" width="26" y="0"/>
<rect fill="url(#SVGID_1_)" fill-rule="evenodd" height="52" width="26"/>
<rect fill="#9696A0" fill-opacity="0.5" fill-rule="evenodd" height="1" stroke-opacity="0.5" width="26"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_cl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_cl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="52" width="26" y="0"/>
<rect fill="url(#SVGID_1_)" fill-rule="evenodd" height="52" width="26"/>
<rect fill="#9696A0" fill-opacity="0.5" fill-rule="evenodd" height="1" stroke-opacity="0.5" width="26"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_cr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_cr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="52" width="26" y="0"/>
<rect fill="url(#SVGID_1_)" fill-rule="evenodd" height="52" width="26"/>
<rect fill="#9696A0" fill-opacity="0.5" fill-rule="evenodd" height="1" stroke-opacity="0.5" width="26"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="52" width="26" y="0"/>
<path d="M26,52H10C4.477,52,0,47.521,0,42V0h26V52z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
<path d="M26,1V0H0v42c0,5.521,4.477,10,10,10h16v-1H10 c-4.963,0-9-4.037-9-9V1H26z" fill="#9696A0" fill-opacity="0.5" fill-rule="evenodd" stroke-opacity="0.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="52" width="26" y="0"/>
<path d="M0,52h16c5.523,0,10-4.479,10-10V0H0V52z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
<path d="M0,0v1h25v41c0,4.963-4.037,9-9,9H0v1h16 c5.523,0,10-4.479,10-10V0H0z" fill="#9696A0" fill-opacity="0.5" fill-rule="evenodd" stroke-opacity="0.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="52" width="26" y="0"/>
<rect fill="#BEBEC8" fill-rule="evenodd" height="52" width="26"/>
<rect fill="url(#SVGID_1_)" fill-rule="evenodd" height="51" width="26"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_cl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_cl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="52" width="26" y="0"/>
<rect fill="#BEBEC8" fill-rule="evenodd" height="52" width="26"/>
<rect fill="url(#SVGID_1_)" fill-rule="evenodd" height="51" width="26"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_cr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_cr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="52" width="26" y="0"/>
<rect fill="#BEBEC8" fill-rule="evenodd" height="52" width="26"/>
<rect fill="url(#SVGID_1_)" fill-rule="evenodd" height="51" width="26"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="52" width="26" y="0"/>
<path d="M26,52H10C4.477,52,0,47.522,0,42V0h26V52z" fill="#BEBEC8" fill-rule="evenodd"/>
<path d="M10,51c-4.962,0-9-4.037-9-9V0h25v51H10z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="52" width="26" y="0"/>
<path d="M0,52h16c5.523,0,10-4.478,10-10V0H0V52z" fill="#BEBEC8" fill-rule="evenodd"/>
<path d="M16,51c4.963,0,9-4.037,9-9V0H0v51H16z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="52" width="26" y="0"/>
<rect fill="#BEBEC8" fill-rule="evenodd" height="52" width="26"/>
<rect fill="url(#SVGID_1_)" fill-rule="evenodd" height="51" width="26"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_cl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_cl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="52" width="26" y="0"/>
<rect fill="#BEBEC8" fill-rule="evenodd" height="52" width="26"/>
<rect fill="url(#SVGID_1_)" fill-rule="evenodd" height="51" width="26"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_cr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_cr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="52" width="26" y="0"/>
<rect fill="#BEBEC8" fill-rule="evenodd" height="52" width="26"/>
<rect fill="url(#SVGID_1_)" fill-rule="evenodd" height="51" width="26"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="52" width="26" y="0"/>
<path d="M26,52H10C4.477,52,0,47.522,0,42V0h26V52z" fill="#BEBEC8" fill-rule="evenodd"/>
<path d="M10,51c-4.962,0-9-4.037-9-9V0h25v51H10z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="52" width="26" y="0"/>
<path d="M0,52h16c5.523,0,10-4.478,10-10V0H0V52z" fill="#BEBEC8" fill-rule="evenodd"/>
<path d="M16,51c4.963,0,9-4.037,9-9V0H0v51H16z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="52" width="26" x="0" y="0"/>
<rect fill="#BEBEC8" fill-rule="evenodd" height="52" width="26"/>
<rect fill="url(#SVGID_1_)" fill-rule="evenodd" height="51" width="26"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_cl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_cl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="52" width="26" y="0"/>
<rect fill="#BEBEC8" fill-rule="evenodd" height="52" width="26"/>
<rect fill="url(#SVGID_1_)" fill-rule="evenodd" height="51" width="26"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_cr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_cr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="52" width="26" y="0"/>
<rect fill="#BEBEC8" fill-rule="evenodd" height="52" width="26"/>
<rect fill="url(#SVGID_1_)" fill-rule="evenodd" height="51" width="26"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="52" width="26" y="0"/>
<path d="M26,52H10C4.477,52,0,47.522,0,42V0h26V52z" fill="#BEBEC8" fill-rule="evenodd"/>
<path d="M10,51c-4.962,0-9-4.037-9-9V0h25v51H10z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" y="0px">
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 26 52" width="26px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="52" width="26" y="0"/>
<path d="M0,52h16c5.523,0,10-4.478,10-10V0H0V52z" fill="#BEBEC8" fill-rule="evenodd"/>
<path d="M16,51c4.963,0,9-4.037,9-9V0H0v51H16z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<rect fill="#FFFFFF" height="10" width="80"/>
<rect fill="#BEBEC8" height="1" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M10,0C4.477,0,0,4.477,0,10h10V0z" fill="#FFFFFF"/>
<path d="M1,9.998c0-4.961,4.038-9,9-9L10,0C4.477,0,0,4.478,0,9.999L1,9.998z" fill="#BEBEC8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0,0c5.523,0,10,4.477,10,10H0V0z" fill="#FFFFFF"/>
<path d="M0.001,1c4.961,0,9,4.037,9,8.999L9.999,10C9.999,4.477,5.521,0,0,0L0.001,1z" fill="#BEBEC8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<rect fill-opacity="0.8" height="10" stroke-opacity="0.8" width="80"/>
<rect height="1" width="80" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill-opacity="0.8" height="10" stroke-opacity="0.8" width="10"/>
<polygon points="0,0 0,10 10,10 10,9 1,9 1,0 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill-opacity="0.8" height="10" stroke-opacity="0.8" width="10"/>
<polygon points="0,10 10,10 10,0 9,0 9,9 0,9 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="80"/>
<rect fill-opacity="0.8" height="80" stroke-opacity="0.8" width="80"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 30 10" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 30 10" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="30"/>
<rect fill="none" height="10" width="30"/>
<rect fill="#D9D9D9" height="1" width="30" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="none" height="10" width="10"/>
<rect fill="#D9D9D9" height="1" width="10" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="none" height="10" width="10"/>
<polygon fill="#D9D9D9" points="9,0 9,9 0,9 0,10 10,10 10,0 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 10 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 10 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="30"/>
<rect fill="none" height="30" width="30" y="10"/>
<rect fill="none" height="30" width="30" y="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="none" height="30" width="10"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10" y="0"/>
<rect fill="none" height="30" width="10"/>
<rect fill="#D9D9D9" height="30" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 30 10" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 30 10" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="30"/>
<rect fill="none" height="10" width="30"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="none" height="10" width="10"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="none" height="10" width="10"/>
<rect fill="#D9D9D9" height="10" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<rect fill-opacity="0.8" height="80" stroke-opacity="0.8" width="10"/>
<rect height="80" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="none" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="300"/>
<rect fill="#DCDCDC" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="300" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="none" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
<rect fill="#DCDCDC" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="none" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
<rect fill="#DCDCDC" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 300 30" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="300"/>
<rect fill="none" fill-opacity="0.2" height="30" stroke-opacity="0.2" width="300"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="none" fill-opacity="0.2" height="30" stroke-opacity="0.2" width="10"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="10"/>
<rect fill="none" fill-opacity="0.2" height="30" stroke-opacity="0.2" width="10"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="none" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="300"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="none" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="none" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="80" width="10"/>
<rect fill-opacity="0.8" height="80" stroke-opacity="0.8" width="10"/>
<rect height="80" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="80"/>
<rect fill-opacity="0.8" height="10" stroke-opacity="0.8" width="80"/>
<rect height="1" width="80"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill-opacity="0.8" height="10" stroke-opacity="0.8" width="10"/>
<polygon points="10,0 0,0 0,10 1,10 1,1 10,1 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill-opacity="0.8" height="10" stroke-opacity="0.8" width="10"/>
<polygon points="10,10 10,0 0,0 0,1 9,1 9,10 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_filled_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_filled_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<rect fill="url(#SVGID_1_)" height="10" width="20" y="5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_filled_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_filled_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M6,5c-2.757,0-5,2.243-5,5s2.243,5,5,5h14V5H6z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_filled_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_filled_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M14,5c2.757,0,5,2.243,5,5s-2.243,5-5,5H0V5H14z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_frame_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_frame_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<rect fill="url(#SVGID_1_)" height="12" width="20" y="4"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_frame_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_frame_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M6,4c-3.3,0-6,2.7-6,6s2.7,6,6,6h14V4H6z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_frame_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_frame_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M14,4c3.3,0,6,2.7,6,6s-2.7,6-6,6H0V4H14z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_mask_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_mask_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<rect height="10" width="20" y="5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_mask_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_mask_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M6,5c-2.757,0-5,2.243-5,5s2.243,5,5,5h14V5H6z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_mask_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_mask_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M14,5c2.758,0,5,2.243,5,5s-2.242,5-5,5H0V5H14z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_filled_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_filled_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M15,14c0,2.757-2.244,5-5,5c-2.758,0-5-2.243-5-5V0h10V14z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_filled_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_filled_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<rect fill="url(#SVGID_1_)" height="20" width="10" x="5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_filled_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_filled_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M15,6c0-2.757-2.244-5-5-5C7.242,1,5,3.243,5,6v14h10V6z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_frame_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_frame_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M16,14c0,3.3-2.701,6-6,6c-3.301,0-6-2.7-6-6V0h12V14z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_frame_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_frame_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<rect fill="url(#SVGID_1_)" height="20" width="12" x="4"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_frame_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_frame_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M16,6c0-3.3-2.701-6-6-6C6.699,0,4,2.7,4,6v14h12V6z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_mask_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_mask_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M5,14c0,2.757,2.244,5,5,5c2.758,0,5-2.243,5-5V0H5V14z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_mask_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_mask_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20" y="0"/>
<rect fill="none" height="20" width="20" x="0"/>
<rect height="20" width="10" x="5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_mask_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_mask_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M5,6c0-2.757,2.244-5,5-5c2.758,0,5,2.243,5,5v14H5V6z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_disabled_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_disabled_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<rect fill="#969696" fill-opacity="0.8" height="18" stroke-opacity="0.8" width="20" y="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_disabled_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_disabled_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M9,19c-4.962,0-9-4.037-9-9s4.038-9,9-9h11v18H9z" fill="#969696" fill-opacity="0.8" stroke-opacity="0.8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_disabled_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_disabled_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M0,19V1h11c4.963,0,9,4.037,9,9s-4.037,9-9,9H0z" fill="#969696" fill-opacity="0.8" stroke-opacity="0.8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<rect fill="url(#SVGID_1_)" height="18" width="20" y="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M9,19c-4.962,0-9-4.037-9-9s4.038-9,9-9h11v18H9z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M0,19V1h11c4.963,0,9,4.037,9,9s-4.037,9-9,9H0z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<rect fill="url(#SVGID_1_)" height="18" width="20" y="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_pressed_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_pressed_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M9,19c-4.962,0-9-4.037-9-9s4.038-9,9-9h11v18H9z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_pressed_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_pressed_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M0,19V1h11c4.963,0,9,4.037,9,9s-4.037,9-9,9H0z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="16" stroke-opacity="0.6" width="20" y="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M20,2H9c-4.4,0-8,3.6-8,8s3.6,8,8,8h11V2z" fill="url(#SVGID_1_)" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M0,2h11c4.4,0,8,3.6,8,8s-3.6,8-8,8H0V2z" fill="url(#SVGID_1_)" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<rect fill="url(#SVGID_1_)" height="16" width="20" y="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M20,2H9c-4.4,0-8,3.6-8,8s3.6,8,8,8h11V2z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M0,2h11c4.4,0,8,3.6,8,8s-3.6,8-8,8H0V2z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" y="0px">
+<svg baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M144.648,144.648C135.781,153.516,123.531,159,110,159s-25.781-5.484-34.648-14.352 l-39.598,39.598C54.755,203.247,81.005,215,110,215c28.994,0,55.244-11.753,74.246-30.754L144.648,144.648z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M110,212c-26.869,0-52.176-10.363-71.38-29.205l36.739-36.739 C84.716,155.056,96.979,160,110,160s25.283-4.944,34.642-13.944l36.739,36.739C162.176,201.637,136.869,212,110,212L110,212z" fill="#BEBEBE" fill-opacity="0.8" stroke-opacity="0.8"/>
<polygon fill="#787878" points="121,176 110,194 99,176 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" y="0px">
+<svg baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<circle cx="110" cy="110" fill="#141414" fill-opacity="0.4" r="49" stroke-opacity="0.4"/>
<circle cx="110" cy="110" fill="#BEBEBE" fill-opacity="0.8" r="47" stroke-opacity="0.8"/>
<path d="M110,126c-8.822,0-16-7.178-16-16s7.178-16,16-16s16,7.178,16,16S118.822,126,110,126L110,126z" fill="#787878"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" y="0px">
+<svg baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M61,110c0-13.531,5.484-25.781,14.352-34.648L35.754,35.754C16.752,54.755,5,81.005,5,110 c0,28.994,11.752,55.244,30.754,74.246l39.598-39.598C66.484,135.781,61,123.531,61,110z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M37.206,181.38C18.363,162.177,8,136.868,8,110s10.363-52.177,29.206-71.38l36.739,36.738 C64.944,84.716,60,96.979,60,110s4.944,25.284,13.944,34.642L37.206,181.38z" fill="#BEBEBE" fill-opacity="0.8" stroke-opacity="0.8"/>
<polygon fill="#787878" points="44,121 26,110 44,99 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" y="0px">
+<svg baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M184.246,35.754l-39.598,39.598C153.516,84.219,159,96.469,159,110 s-5.484,25.781-14.352,34.648l39.598,39.598C203.248,165.244,215,138.994,215,110C215,81.005,203.248,54.755,184.246,35.754z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M146.056,144.642c9-9.357,13.944-21.62,13.944-34.642s-4.944-25.284-13.944-34.642 l36.739-36.738C201.637,57.823,212,83.132,212,110s-10.363,52.177-29.205,71.38L146.056,144.642z" fill="#BEBEBE" fill-opacity="0.8" stroke-opacity="0.8"/>
<rect fill="none" height="220" width="220"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" y="0px">
+<svg baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="220" width="220"/>
<path d="M110,61c13.531,0,25.781,5.484,34.648,14.352l39.598-39.598C165.245,16.752,138.995,5,110,5 S54.755,16.752,35.754,35.754l39.598,39.598C84.219,66.484,96.469,61,110,61z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M38.62,37.205C57.824,18.363,83.131,8,110,8c26.869,0,52.176,10.363,71.381,29.205 l-36.739,36.739C135.283,64.944,123.021,60,110,60s-25.284,4.944-34.642,13.944L38.62,37.205z" fill="#BEBEBE" fill-opacity="0.8" stroke-opacity="0.8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" y="0px">
+<svg baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M144.648,144.648C135.781,153.516,123.531,159,110,159s-25.781-5.484-34.648-14.352 l-39.598,39.598C54.755,203.247,81.005,215,110,215c28.994,0,55.244-11.753,74.246-30.754L144.648,144.648z" fill="#141414" fill-opacity="0.5" stroke-opacity="0.5"/>
<path d="M110,213c28.396,0,54.146-11.552,72.798-30.202l-38.149-38.149C135.781,153.516,123.531,159,110,159 s-25.781-5.484-34.648-14.352l-38.149,38.149C55.853,201.448,81.603,213,110,213z" fill="#B4B4B9"/>
<path d="M110,212c-26.869,0-52.176-10.363-71.38-29.205l36.739-36.739C84.716,155.056,96.979,160,110,160 s25.283-4.944,34.642-13.944l36.739,36.739C162.176,201.637,136.869,212,110,212L110,212z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" y="0px">
+<svg baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<circle cx="110" cy="110" fill="#141414" fill-opacity="0.5" r="49" stroke-opacity="0.5"/>
<path d="M110,157c-25.916,0-47-21.084-47-47s21.084-47,47-47c25.916,0,47,21.084,47,47S135.916,157,110,157 L110,157z" fill="url(#SVGID_1_)"/>
<path d="M110,63c-25.916,0-47,21.084-47,47s21.084,47,47,47c25.916,0,47-21.084,47-47 S135.916,63,110,63z M110,156c-25.364,0-46-20.636-46-46s20.636-46,46-46s46,20.636,46,46S135.364,156,110,156z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" y="0px">
+<svg baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M61,110c0-13.531,5.484-25.781,14.352-34.648L35.754,35.754C16.752,54.755,5,81.005,5,110 c0,28.994,11.752,55.244,30.754,74.246l39.598-39.598C66.484,135.781,61,123.531,61,110z" fill="#141414" fill-opacity="0.5" stroke-opacity="0.5"/>
<path d="M7,110c0,28.396,11.551,54.146,30.202,72.798l38.149-38.149C66.484,135.781,61,123.531,61,110 s5.484-25.781,14.352-34.648L37.202,37.202C18.551,55.854,7,81.604,7,110z" fill="#B4B4B9"/>
<path d="M37.206,181.38C18.363,162.177,8,136.868,8,110s10.363-52.177,29.206-71.38l36.739,36.738 C64.944,84.716,60,96.979,60,110s4.944,25.284,13.944,34.642L37.206,181.38z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" y="0px">
+<svg baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M184.246,35.754l-39.598,39.598C153.516,84.219,159,96.469,159,110 s-5.484,25.781-14.352,34.648l39.598,39.598C203.248,165.244,215,138.994,215,110C215,81.005,203.248,54.755,184.246,35.754z" fill="#141414" fill-opacity="0.5" stroke-opacity="0.5"/>
<path d="M182.798,37.202l-38.149,38.149C153.516,84.219,159,96.469,159,110s-5.484,25.781-14.352,34.648 l38.149,38.149C201.449,164.146,213,138.396,213,110S201.449,55.854,182.798,37.202z" fill="#B4B4B9"/>
<path d="M146.056,144.642c9-9.357,13.944-21.62,13.944-34.642s-4.944-25.284-13.944-34.642l36.739-36.738 C201.637,57.823,212,83.132,212,110s-10.363,52.177-29.205,71.38L146.056,144.642z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" y="0px">
+<svg baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="220" width="220"/>
<path d="M110,61c13.531,0,25.781,5.484,34.648,14.352l39.598-39.598C165.245,16.752,138.995,5,110,5 S54.755,16.752,35.754,35.754l39.598,39.598C84.219,66.484,96.469,61,110,61z" fill="#141414" fill-opacity="0.5" stroke-opacity="0.5"/>
<path d="M110,7C81.603,7,55.853,18.552,37.202,37.202l38.149,38.149C84.219,66.484,96.469,61,110,61 s25.781,5.484,34.648,14.352l38.149-38.149C164.146,18.552,138.396,7,110,7z" fill="#B4B4B9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" y="0px">
+<svg baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M144.648,144.648C135.781,153.516,123.531,159,110,159s-25.781-5.484-34.648-14.352 l-39.598,39.598C54.755,203.247,81.005,215,110,215c28.994,0,55.244-11.753,74.246-30.754L144.648,144.648z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M110,212c-26.869,0-52.176-10.363-71.38-29.205l36.739-36.739C84.716,155.056,96.979,160,110,160 s25.283-4.944,34.642-13.944l36.739,36.739C162.176,201.637,136.869,212,110,212L110,212z" fill="url(#SVGID_1_)"/>
<path d="M144.642,146.056c-9.358,9-21.62,13.944-34.642,13.944s-25.284-4.944-34.642-13.944 L38.62,182.795C57.824,201.637,83.131,212,110,212c26.869,0,52.176-10.363,71.381-29.205L144.642,146.056z M40.044,182.785 l35.334-35.336C84.824,156.196,97.079,161,110,161c12.922,0,25.176-4.804,34.621-13.551l35.335,35.336 C161.037,200.988,136.236,211,110,211C83.764,211,58.962,200.988,40.044,182.785z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" y="0px">
+<svg baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<circle cx="110" cy="110" fill="url(#SVGID_1_)" r="48"/>
<path d="M110,62c-26.51,0-48,21.49-48,48s21.49,48,48,48s48-21.49,48-48S136.51,62,110,62z M110,157 c-25.916,0-47-21.084-47-47s21.084-47,47-47c25.916,0,47,21.084,47,47S135.916,157,110,157z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
<path d="M110,124c-7.72,0-14-6.28-14-14c0-7.721,6.28-14,14-14c7.719,0,14,6.279,14,14 C124,117.72,117.719,124,110,124L110,124z" fill="#FFFFFF"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" y="0px">
+<svg baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M61,110c0-13.531,5.484-25.781,14.352-34.648L35.754,35.754C16.752,54.755,5,81.005,5,110 c0,28.994,11.752,55.244,30.754,74.246l39.598-39.598C66.484,135.781,61,123.531,61,110z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M37.206,181.38C18.363,162.177,8,136.868,8,110s10.363-52.177,29.206-71.38l36.739,36.738 C64.944,84.716,60,96.979,60,110s4.944,25.284,13.944,34.642L37.206,181.38z" fill="url(#SVGID_1_)"/>
<path d="M73.944,75.358L37.206,38.62C18.363,57.823,8,83.132,8,110s10.363,52.177,29.206,71.38 l36.739-36.738C64.944,135.284,60,123.021,60,110S64.944,84.716,73.944,75.358z M72.55,144.621l-35.334,35.334 C19.012,161.039,9,136.237,9,110s10.012-51.039,28.216-69.955L72.55,75.379C63.804,84.823,59,97.078,59,110 S63.804,135.177,72.55,144.621z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" y="0px">
+<svg baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M184.246,35.754l-39.598,39.598C153.516,84.219,159,96.469,159,110 s-5.484,25.781-14.352,34.648l39.598,39.598C203.248,165.244,215,138.994,215,110C215,81.005,203.248,54.755,184.246,35.754z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M146.056,144.642c9-9.357,13.944-21.62,13.944-34.642s-4.944-25.284-13.944-34.642l36.739-36.738 C201.637,57.823,212,83.132,212,110s-10.363,52.177-29.205,71.38L146.056,144.642z" fill="url(#SVGID_1_)"/>
<path d="M182.795,38.62l-36.739,36.738C155.056,84.716,160,96.979,160,110 s-4.944,25.284-13.944,34.642l36.739,36.738C201.637,162.177,212,136.868,212,110S201.637,57.823,182.795,38.62z M182.784,179.955 l-35.335-35.334C156.195,135.177,161,122.922,161,110s-4.805-25.177-13.551-34.621l35.335-35.334C200.988,58.961,211,83.763,211,110 S200.988,161.039,182.784,179.955z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" y="0px">
+<svg baseProfile="tiny" height="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="220" width="220"/>
<path d="M110,61c13.531,0,25.781,5.484,34.648,14.352l39.598-39.598C165.245,16.752,138.995,5,110,5 S54.755,16.752,35.754,35.754l39.598,39.598C84.219,66.484,96.469,61,110,61z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
<path d="M38.62,37.205C57.824,18.363,83.131,8,110,8c26.869,0,52.176,10.363,71.381,29.205l-36.739,36.739 C135.283,64.944,123.021,60,110,60s-25.284,4.944-34.642,13.944L38.62,37.205z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.9" fill-rule="evenodd" height="16" stroke-opacity="0.9" width="20" y="2"/>
<rect fill-opacity="0.2" fill-rule="evenodd" height="1" stroke-opacity="0.2" width="20" y="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" fill-rule="evenodd" height="20" width="20"/>
<path d="M0,10c0-4.419,3.58-8,8-8h12v16H8 C3.58,18,0,14.42,0,10z" fill="url(#SVGID_1_)" fill-opacity="0.9" fill-rule="evenodd" stroke-opacity="0.9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" fill-rule="evenodd" height="20" width="20"/>
<path d="M12,18H0V2h12c4.42,0,8,3.581,8,8 C20,14.42,16.42,18,12,18z" fill="url(#SVGID_1_)" fill-opacity="0.9" fill-rule="evenodd" stroke-opacity="0.9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="url(#SVGID_1_)" fill-rule="evenodd" height="16" width="20" y="2"/>
<rect fill-opacity="0.2" fill-rule="evenodd" height="1" stroke-opacity="0.2" width="20" y="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_pressed_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_pressed_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" fill-rule="evenodd" height="20" width="20"/>
<path d="M0,10c0-4.419,3.58-8,8-8h12v16H8C3.58,18,0,14.42,0,10z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_pressed_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_pressed_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" fill-rule="evenodd" height="20" width="20"/>
<path d="M12,18H0V2h12c4.42,0,8,3.581,8,8C20,14.42,16.42,18,12,18z " fill="url(#SVGID_1_)" fill-rule="evenodd"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill-opacity="0.1" fill-rule="evenodd" height="16" stroke-opacity="0.1" width="20" y="2"/>
<rect fill="#FAFAFA" fill-rule="evenodd" height="14" width="20" y="3"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" fill-rule="evenodd" height="20" width="20"/>
<path d="M20,18H8c-4.411,0-8-3.589-8-8s3.589-8,8-8h12V18z" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" fill-rule="evenodd" height="20" width="20"/>
<path d="M20,10c0,4.411-3.589,8-8,8H0V2h12C16.411,2,20,5.589,20,10L20,10z" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill-opacity="0.1" fill-rule="evenodd" height="16" stroke-opacity="0.1" width="20" y="2"/>
<rect fill="#DCDCE6" fill-rule="evenodd" height="14" width="20" y="3"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_pressed_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_pressed_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" fill-rule="evenodd" height="20" width="20"/>
<path d="M20,18H8c-4.411,0-8-3.589-8-8s3.589-8,8-8h12V18z" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_pressed_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_pressed_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" fill-rule="evenodd" height="20" width="20"/>
<path d="M20,10c0,4.411-3.589,8-8,8H0V2h12C16.411,2,20,5.589,20,10L20,10z" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_frame_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_frame_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10" y="0"/>
<rect fill-opacity="0.35" height="6" stroke-opacity="0.35" width="10" y="2"/>
<rect fill="none" height="10" width="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_frame_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_frame_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10" y="0"/>
<rect fill="none" height="10" width="10"/>
<path d="M10,8H3C1.346,8,0,6.654,0,5s1.346-3,3-3h7V8z" fill-opacity="0.35" stroke-opacity="0.35"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_frame_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_frame_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10" y="0"/>
<rect fill="none" height="10" width="10"/>
<path d="M10,5c0,1.654-1.346,3-3,3H0V2h7C8.654,2,10,3.346,10,5L10,5z" fill-opacity="0.35" stroke-opacity="0.35"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_handle_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_handle_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10" y="0"/>
<rect fill="#FFFFFF" fill-opacity="0.9" height="4" stroke-opacity="0.9" width="10" y="3"/>
<rect fill="none" height="10" width="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_handle_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_handle_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10" y="0"/>
<rect fill="none" height="10" width="10"/>
<path d="M10,3v4H3C1.896,7,1,6.104,1,5l0,0c0-1.104,0.896-2,2-2H10z" fill="#FFFFFF" fill-opacity="0.9" stroke-opacity="0.9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_handle_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_handle_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10" y="0"/>
<rect fill="none" height="10" width="10"/>
<path d="M0,7V3h7c1.104,0,2,0.896,2,2l0,0c0,1.104-0.896,2-2,2H0z" fill="#FFFFFF" fill-opacity="0.9" stroke-opacity="0.9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_normal_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_normal_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" fill-rule="evenodd" height="20" width="20"/>
<path d="M2,12V0h16v12c0,4.42-3.58,8-8,8 S2,16.42,2,12z" fill="url(#SVGID_1_)" fill-opacity="0.9" fill-rule="evenodd" stroke-opacity="0.9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.9" fill-rule="evenodd" height="20" stroke-opacity="0.9" width="16" x="2"/>
<rect fill-opacity="0.2" fill-rule="evenodd" height="20" stroke-opacity="0.2" width="1" x="17"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_normal_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_normal_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" fill-rule="evenodd" height="20" width="20"/>
<path d="M10,0c4.42,0,8,3.58,8,8v12H2V8 C2,3.58,5.58,0,10,0z" fill="url(#SVGID_1_)" fill-opacity="0.9" fill-rule="evenodd" stroke-opacity="0.9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_pressed_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_pressed_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" fill-rule="evenodd" height="20" width="20"/>
<path d="M2,12V0h16v12c0,4.42-3.58,8-8,8S2,16.42,2,12z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="url(#SVGID_1_)" fill-rule="evenodd" height="20" width="16" x="2"/>
<rect fill-opacity="0.2" fill-rule="evenodd" height="20" stroke-opacity="0.2" width="1" x="17"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_pressed_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_pressed_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" fill-rule="evenodd" height="20" width="20"/>
<path d="M10,0c4.42,0,8,3.58,8,8v12H2V8C2,3.58,5.58,0,10,0z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_normal_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_normal_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" fill-rule="evenodd" height="20" width="20"/>
<path d="M10,20c-4.411,0-8-3.589-8-8V0h16v12C18,16.411,14.411,20,10,20 L10,20z" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill-opacity="0.1" fill-rule="evenodd" height="20" stroke-opacity="0.1" width="16" x="2"/>
<rect fill="#FAFAFA" fill-rule="evenodd" height="20" width="14" x="3"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_normal_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_normal_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" fill-rule="evenodd" height="20" width="20"/>
<path d="M2,20V8c0-4.411,3.589-8,8-8s8,3.589,8,8v12H2z" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_pressed_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_pressed_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" fill-rule="evenodd" height="20" width="20"/>
<path d="M10,20c-4.411,0-8-3.589-8-8V0h16v12C18,16.411,14.411,20,10,20 L10,20z" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill-opacity="0.1" fill-rule="evenodd" height="20" stroke-opacity="0.1" width="16" x="2"/>
<rect fill="#DCDCE6" fill-rule="evenodd" height="20" width="14" x="3"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_pressed_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_pressed_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" fill-rule="evenodd" height="20" width="20"/>
<path d="M2,20V8c0-4.411,3.589-8,8-8s8,3.589,8,8v12H2z" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_frame_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_frame_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="none" height="10" width="10"/>
<path d="M5,10c-1.654,0-3-1.346-3-3V0h6v7C8,8.654,6.654,10,5,10L5,10z" fill-opacity="0.35" stroke-opacity="0.35"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_frame_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_frame_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill-opacity="0.35" height="10" stroke-opacity="0.35" width="6" x="2"/>
<rect fill="none" height="10" width="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_frame_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_frame_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="none" height="10" width="10"/>
<path d="M2,10V3c0-1.654,1.346-3,3-3s3,1.346,3,3v7H2z" fill-opacity="0.35" stroke-opacity="0.35"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_handle_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_handle_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="none" height="10" width="10"/>
<path d="M3,0h4v7c0,1.104-0.896,2-2,2l0,0C3.896,9,3,8.104,3,7V0z" fill="#FFFFFF" fill-opacity="0.9" stroke-opacity="0.9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_handle_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_handle_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="#FFFFFF" fill-opacity="0.9" height="10" stroke-opacity="0.9" width="4" x="3"/>
<rect fill="none" height="10" width="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_handle_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_handle_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<rect fill="none" height="10" width="10"/>
<path d="M7,10H3V3c0-1.104,0.896-2,2-2l0,0c1.104,0,2,0.896,2,2V10z" fill="#FFFFFF" fill-opacity="0.9" stroke-opacity="0.9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<rect fill="url(#SVGID_1_)" height="10" width="20" y="5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M10,5c-2.757,0-5,2.243-5,5s2.243,5,5,5h10V5H10z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M10,5c2.757,0,5,2.243,5,5s-2.243,5-5,5H0V5H10z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_disabled_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_disabled_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<rect fill="#AAAAAA" fill-opacity="0.8" height="12" stroke-opacity="0.8" width="20" y="4"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_disabled_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_disabled_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M10,4c-3.3,0-6,2.7-6,6s2.7,6,6,6h10V4H10z" fill="#AAAAAA" fill-opacity="0.8" stroke-opacity="0.8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_disabled_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_disabled_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M10,4c3.3,0,6,2.7,6,6s-2.7,6-6,6H0V4H10z" fill="#AAAAAA" fill-opacity="0.8" stroke-opacity="0.8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<rect fill="url(#SVGID_1_)" height="12" width="20" y="4"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M10,4c-3.3,0-6,2.7-6,6s2.7,6,6,6h10V4H10z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M10,4c3.3,0,6,2.7,6,6s-2.7,6-6,6H0V4H10z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<rect fill="url(#SVGID_1_)" height="12" width="20" y="4"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_pressed_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_pressed_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M10,4c-3.3,0-6,2.7-6,6s2.7,6,6,6h10V4H10z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_pressed_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_pressed_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M10,4c3.3,0,6,2.7,6,6s-2.7,6-6,6H0V4H10z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M15,10c0,2.757-2.244,5-5,5c-2.758,0-5-2.243-5-5V0h10V10z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<rect fill="url(#SVGID_1_)" height="20" width="10" x="5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M15,10c0-2.757-2.244-5-5-5c-2.758,0-5,2.243-5,5v10h10V10z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_disabled_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_disabled_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M16,10c0,3.3-2.7,6-6,6s-6-2.7-6-6V0h12V10z" fill="#AAAAAA" fill-opacity="0.8" stroke-opacity="0.8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_disabled_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_disabled_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<rect fill="#AAAAAA" fill-opacity="0.8" height="20" stroke-opacity="0.8" width="12" x="4"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_disabled_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_disabled_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M16,10c0-3.3-2.7-6-6-6s-6,2.7-6,6v10h12V10z" fill="#AAAAAA" fill-opacity="0.8" stroke-opacity="0.8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_normal_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_normal_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M16,10c0,3.3-2.701,6-6,6c-3.301,0-6-2.7-6-6V0h12V10z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<rect fill="url(#SVGID_1_)" height="20" width="12" x="4"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_normal_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_normal_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M16,10c0-3.3-2.701-6-6-6C6.7,4,4,6.7,4,10v10h12V10z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_pressed_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_pressed_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M16,10c0,3.3-2.701,6-6,6c-3.301,0-6-2.7-6-6V0h12V10z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<rect fill="url(#SVGID_1_)" height="20" width="12" x="4"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_pressed_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_pressed_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M16,10c0-3.3-2.701-6-6-6c-3.301,0-6,2.7-6,6v10h12V10z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect height="20" width="20"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect height="20" width="19" x="1"/>
<rect fill="#FFFFFF" fill-opacity="0.1" height="20" stroke-opacity="0.1" width="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect height="20" width="19"/>
<rect fill="#FFFFFF" fill-opacity="0.1" height="20" stroke-opacity="0.1" width="2" x="18"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill-opacity="0.6" height="20" stroke-opacity="0.6" width="20"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill-opacity="0.6" height="20" stroke-opacity="0.6" width="19" x="1"/>
<rect fill="#FFFFFF" fill-opacity="0.1" height="20" stroke-opacity="0.1" width="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<rect fill-opacity="0.6" height="20" stroke-opacity="0.6" width="19"/>
<rect fill="#FFFFFF" fill-opacity="0.1" height="20" stroke-opacity="0.1" width="2" x="18"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_active_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_active_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" y="0px">
+<svg baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="55" width="55"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.5" fill-rule="evenodd" height="55" stroke-opacity="0.5" width="55"/>
<rect fill="#FFFFFF" fill-opacity="0.4" fill-rule="evenodd" height="1" stroke-opacity="0.4" width="55"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_active_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_active_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" y="0px">
+<svg baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="55" width="55"/>
<path d="M55,0H30c-6.627,0-11.016,4.881-12,12l-6,32 c-1.723,6.381-5.377,11-12,11h55V0z" fill="url(#SVGID_1_)" fill-opacity="0.5" fill-rule="evenodd" stroke-opacity="0.5"/>
<path d="M1.203,54.914C0.813,54.949,0.412,54.967,0,54.967 C0,54.967,0.48,54.962,1.203,54.914z M30,0c-6.627,0-11.016,4.877-12,11.992l-6,31.98c-1.615,5.978-4.928,10.409-10.791,10.94 c1.551-0.104,4.217-0.411,5.696-1.313c2.985-1.82,4.95-4.822,6.173-9.365l6.02-32.057C20.053,5.264,24.273,1,30.114,1H55V0H30z" fill="#FFFFFF" fill-opacity="0.4" fill-rule="evenodd" stroke-opacity="0.4"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_active_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_active_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" y="0px">
+<svg baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="55" width="55"/>
<path d="M0,0h25c6.627,0,11.016,4.881,11.999,12 l6.002,32C44.723,50.381,48.377,55,55,55H0V0z" fill="url(#SVGID_1_)" fill-opacity="0.5" fill-rule="evenodd" stroke-opacity="0.5"/>
<path d="M53.797,54.914c0.389,0.035,0.79,0.053,1.203,0.053 C55,54.967,54.521,54.962,53.797,54.914z M25,0c6.627,0,11.016,4.877,11.999,11.992l6.002,31.98 c1.614,5.978,4.926,10.409,10.79,10.94c-1.552-0.104-4.217-0.411-5.697-1.313c-2.984-1.82-4.949-4.822-6.172-9.365l-6.02-32.057 C34.947,5.264,30.727,1,24.886,1H0V0H25z" fill="#FFFFFF" fill-opacity="0.4" fill-rule="evenodd" stroke-opacity="0.4"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_mask_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_mask_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" y="0px">
+<svg baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="55" width="55"/>
<rect fill-rule="evenodd" height="55" width="55"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_mask_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_mask_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" y="0px">
+<svg baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="55" width="55"/>
<path d="M55,0H30c-6.627,0-11.016,4.881-12,12l-6,32c-1.723,6.381-5.377,11-12,11h55V0z" fill-rule="evenodd"/>
<rect fill="none" fill-rule="evenodd" height="55" width="55"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_mask_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_mask_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" y="0px">
+<svg baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="55" width="55"/>
<path d="M0,0h25c6.627,0,11.016,4.881,11.999,12l6.002,32C44.723,50.381,48.377,55,55,55H0 V0z" fill-rule="evenodd"/>
<rect fill="none" fill-rule="evenodd" height="55" width="55"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" y="0px">
+<svg baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="55" width="55"/>
<rect fill="url(#SVGID_1_)" fill-rule="evenodd" height="55" width="55"/>
<rect fill="#FFFFFF" fill-opacity="0.4" fill-rule="evenodd" height="1" stroke-opacity="0.4" width="55"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" y="0px">
+<svg baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="55" width="55"/>
<path d="M55,0H30c-6.627,0-11.016,4.881-12,12l-6,32 c-1.723,6.381-5.377,11-12,11h55V0z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
<path d="M1.203,54.914C0.813,54.949,0.412,54.967,0,54.967 C0,54.967,0.48,54.962,1.203,54.914z M30,0c-6.627,0-11.016,4.877-12,11.992l-6,31.98c-1.615,5.978-4.928,10.409-10.791,10.94 c1.551-0.104,4.217-0.411,5.696-1.313c2.985-1.82,4.95-4.822,6.173-9.365l6.02-32.057C20.053,5.264,24.273,1,30.114,1H55V0H30z" fill="#FFFFFF" fill-opacity="0.4" fill-rule="evenodd" stroke-opacity="0.4"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" y="0px">
+<svg baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="55" width="55"/>
<path d="M0,0h25c6.627,0,11.016,4.881,11.999,12l6.002,32 C44.723,50.381,48.377,55,55,55H0V0z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
<path d="M53.797,54.914c0.389,0.035,0.79,0.053,1.203,0.053 C55,54.967,54.521,54.962,53.797,54.914z M25,0c6.627,0,11.016,4.877,11.999,11.992l6.002,31.98 c1.614,5.978,4.926,10.409,10.79,10.94c-1.552-0.104-4.217-0.411-5.697-1.313c-2.984-1.82-4.949-4.822-6.172-9.365l-6.02-32.057 C34.947,5.264,30.727,1,24.886,1H0V0H25z" fill="#FFFFFF" fill-opacity="0.4" fill-rule="evenodd" stroke-opacity="0.4"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" y="0px">
+<svg baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="55" width="55"/>
<rect fill="url(#SVGID_1_)" fill-rule="evenodd" height="55" width="55"/>
<rect fill="#FFFFFF" fill-opacity="0.4" fill-rule="evenodd" height="1" stroke-opacity="0.4" width="55"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_pressed_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_pressed_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" y="0px">
+<svg baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="55" width="55"/>
<path d="M55,0H30c-6.627,0-11.016,4.881-12,12l-6,32 c-1.723,6.381-5.377,11-12,11h55V0z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
<path d="M1.203,54.914C0.813,54.949,0.412,54.967,0,54.967 C0,54.967,0.48,54.962,1.203,54.914z M30,0c-6.627,0-11.016,4.877-12,11.992l-6,31.98c-1.615,5.978-4.928,10.409-10.791,10.94 c1.551-0.104,4.217-0.411,5.696-1.313c2.985-1.82,4.95-4.822,6.173-9.365l6.02-32.057C20.053,5.264,24.273,1,30.114,1H55V0H30z" fill="#FFFFFF" fill-opacity="0.4" fill-rule="evenodd" stroke-opacity="0.4"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_pressed_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_pressed_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" y="0px">
+<svg baseProfile="tiny" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="55" width="55"/>
<path d="M0,0h25c6.627,0,11.016,4.881,11.999,12l6.002,32 C44.723,50.381,48.377,55,55,55H0V0z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
<path d="M53.797,54.914c0.389,0.035,0.79,0.053,1.203,0.053 C55,54.967,54.521,54.962,53.797,54.914z M25,0c6.627,0,11.016,4.877,11.999,11.992l6.002,31.98 c1.614,5.978,4.926,10.409,10.79,10.94c-1.552-0.104-4.217-0.411-5.697-1.313c-2.984-1.82-4.949-4.822-6.172-9.365l-6.02-32.057 C34.947,5.264,30.727,1,24.886,1H0V0H25z" fill="#FFFFFF" fill-opacity="0.4" fill-rule="evenodd" stroke-opacity="0.4"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="#AAAAAA" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
<rect fill="#646464" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="30" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_cl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_cl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="#AAAAAA" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
<polygon fill="#646464" fill-opacity="0.5" points="1,59 1,1 30,1 30,0 0,0 0,60 30,60 30,59 " stroke-opacity="0.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_cr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_cr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="#AAAAAA" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
<polygon fill="#646464" fill-opacity="0.5" points="30,0 0,0 0,1 29,1 29,59 0,59 0,60 30,60 " stroke-opacity="0.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="#AAAAAA" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
<polygon fill="#646464" fill-opacity="0.5" points="1,59 1,1 30,1 30,0 0,0 0,60 30,60 30,59 " stroke-opacity="0.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="#AAAAAA" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
<polygon fill="#646464" fill-opacity="0.5" points="30,0 0,0 0,1 29,1 29,59 0,59 0,60 30,60 " stroke-opacity="0.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" height="60" width="30"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_cl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_cl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" height="60" width="30"/>
<polygon fill-opacity="0.2" points="0,0 0,60 1,60 1,1 30,1 30,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_cr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_cr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" height="60" width="30"/>
<polygon fill-opacity="0.2" points="0,0 0,1 29,1 29,60 30,60 30,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" height="60" width="30"/>
<polygon fill-opacity="0.2" points="0,0 0,60 1,60 1,1 30,1 30,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" height="60" width="30"/>
<polygon fill-opacity="0.2" points="0,0 0,1 29,1 29,60 30,60 30,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" height="60" width="30"/>
<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="30" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_cl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_cl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" height="60" width="30"/>
<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="29" x="1" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_cr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_cr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" height="60" width="30"/>
<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="29" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" height="60" width="30"/>
<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="29" x="1" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" height="60" width="30"/>
<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="29" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" height="60" width="30"/>
<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="30" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_cl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_cl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" height="60" width="30"/>
<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="30" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_cr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_cr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" height="60" width="30"/>
<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="30" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="-0.5" y2="59.7705">
<stop offset="0" style="stop-color:#FAFAFF"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="-0.5" y2="59.7705">
<stop offset="0" style="stop-color:#FAFAFF"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" x="0" y="0"/>
<rect fill="url(#SVGID_1_)" height="60" width="30"/>
<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="30" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_cl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_cl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" height="60" width="30"/>
<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="29" x="1" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_cr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_cr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" height="60" width="30"/>
<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="29" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" height="60" width="30"/>
<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="29" x="1" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" height="60" width="30"/>
<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="29" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="#646464" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
<rect fill="#646464" fill-opacity="0.6" height="1" stroke-opacity="0.6" width="30" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_cl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_cl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="#646464" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
<polygon fill="#646464" fill-opacity="0.6" points="1,59 1,1 30,1 30,0 0,0 0,60 30,60 30,59 " stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_cr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_cr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="#646464" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
<polygon fill="#646464" fill-opacity="0.6" points="30,0 0,0 0,1 29,1 29,59 0,59 0,60 30,60 " stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="#646464" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
<polygon fill="#646464" fill-opacity="0.6" points="1,59 1,1 30,1 30,0 0,0 0,60 30,60 30,59 " stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="#646464" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
<polygon fill="#646464" fill-opacity="0.6" points="30,0 0,0 0,1 29,1 29,59 0,59 0,60 30,60 " stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1" y2="59.0005">
<stop offset="0" style="stop-color:#3C3C3C"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_cl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_cl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.5" x2="15.5" y1="1" y2="59.0005">
<stop offset="0" style="stop-color:#3C3C3C"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_cr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_cr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.5" x2="14.5" y1="1" y2="59.0005">
<stop offset="0" style="stop-color:#3C3C3C"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.5" x2="15.5" y1="1" y2="59.0005">
<stop offset="0" style="stop-color:#3C3C3C"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.5" x2="14.5" y1="1" y2="59.0005">
<stop offset="0" style="stop-color:#3C3C3C"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_cl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_cl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_cr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_cr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="60" stroke-opacity="0.7" width="30"/>
<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_cl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_cl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="60" stroke-opacity="0.7" width="30" x="0"/>
<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_cr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_cr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="60" stroke-opacity="0.7" width="30"/>
<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="60" stroke-opacity="0.7" width="30" x="0"/>
<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="60" stroke-opacity="0.7" width="30"/>
<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
<rect fill="#282828" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="30" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_cl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_cl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
<rect fill="#282828" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="30" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_cr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_cr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
<rect fill="#282828" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="30" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
<rect fill="#282828" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="30" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="60" width="30" y="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
<rect fill="#282828" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="30" y="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="#646464" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
<polygon fill="#646464" fill-opacity="0.6" points="59,29 1,29 1,0 0,0 0,30 60,30 60,0 59,0 " stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="#646464" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
<rect fill="#646464" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="1" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_cb.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_cb.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="#646464" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
<polygon fill="#646464" fill-opacity="0.6" points="59,29 1,29 1,0 0,0 0,30 60,30 60,0 59,0 " stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_ct.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_ct.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="#646464" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
<polygon fill="#646464" fill-opacity="0.6" points="0,0 0,30 1,30 1,1 59,1 59,30 60,30 60,0 " stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="#646464" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
<polygon fill="#646464" fill-opacity="0.6" points="0,0 0,30 1,30 1,1 59,1 59,30 60,30 60,0 " stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<linearGradient gradientTransform="matrix(0 -1 -1 0 -1598.5 -1675.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1690.5005" x2="-1690.5005" y1="-1658.4995" y2="-1598.4995">
<stop offset="0" style="stop-color:#3C3C3C"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<linearGradient gradientTransform="matrix(0 -1 -1 0 -1538.5 -1615.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1630.5005" x2="-1630.5005" y1="-1598.4995" y2="-1538.4995">
<stop offset="0" style="stop-color:#3C3C3C"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_cb.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_cb.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<linearGradient gradientTransform="matrix(0 -1 -1 0 -1568.5 -1645.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1660.5005" x2="-1660.5005" y1="-1628.4995" y2="-1568.4995">
<stop offset="0" style="stop-color:#3C3C3C"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_ct.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_ct.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<linearGradient gradientTransform="matrix(0 -1 -1 0 -1508.5 -1585.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1600.5005" x2="-1600.5005" y1="-1568.4995" y2="-1508.4995">
<stop offset="0" style="stop-color:#3C3C3C"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<linearGradient gradientTransform="matrix(0 -1 -1 0 -1478.5 -1555.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1570.5005" x2="-1570.5005" y1="-1538.4995" y2="-1478.4995">
<stop offset="0" style="stop-color:#3C3C3C"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="60"/>
<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="60"/>
<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_cb.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_cb.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="60"/>
<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_ct.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_ct.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="60"/>
<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="60"/>
<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="30" stroke-opacity="0.7" width="60"/>
<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="30" stroke-opacity="0.7" width="60"/>
<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1"/>
<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_cb.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_cb.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="30" stroke-opacity="0.7" width="60"/>
<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_ct.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_ct.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="30" stroke-opacity="0.7" width="60"/>
<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" y="0"/>
<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="59" y="0"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="30" stroke-opacity="0.7" width="60"/>
<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" y="0"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="60"/>
<rect fill="#282828" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="60"/>
<rect fill="#282828" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_cb.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_cb.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="60"/>
<rect fill="#282828" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_ct.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_ct.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="60"/>
<rect fill="#282828" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="60"/>
<rect fill="#282828" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<polygon fill="#9696A0" fill-opacity="0.5" points="59,29 1,29 1,0 0,0 0,30 60,30 60,0 59,0 " stroke-opacity="0.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<rect fill-opacity="0.1" height="30" stroke-opacity="0.1" width="1" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_cb.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_cb.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<polygon fill-opacity="0.1" points="59,29 1,29 1,0 0,0 0,30 60,30 60,0 59,0 " stroke-opacity="0.1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_ct.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_ct.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<polygon fill-opacity="0.1" points="0,0 0,30 1,30 1,1 59,1 59,30 60,30 60,0 " stroke-opacity="0.1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<polygon fill-opacity="0.1" points="0,0 0,30 1,30 1,1 59,1 59,30 60,30 60,0 " stroke-opacity="0.1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<polygon fill-opacity="0.2" points="60,30 0,30 0,29 59,29 59,0 60,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_cb.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_cb.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<polygon fill-opacity="0.2" points="60,30 0,30 0,29 59,29 59,0 60,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_ct.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_ct.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<polygon fill-opacity="0.2" points="60,30 59,30 59,1 0,1 0,0 60,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<polygon fill-opacity="0.2" points="60,30 59,30 59,1 0,1 0,0 60,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<rect fill-opacity="0.1" height="29" stroke-opacity="0.1" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<rect fill-opacity="0.1" height="30" stroke-opacity="0.1" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_cb.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_cb.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<rect fill-opacity="0.1" height="29" stroke-opacity="0.1" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_ct.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_ct.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<rect fill-opacity="0.1" height="29" stroke-opacity="0.1" width="1" y="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<rect fill-opacity="0.1" height="29" stroke-opacity="0.1" width="1" y="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<rect fill-opacity="0.1" height="30" stroke-opacity="0.1" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<rect fill-opacity="0.1" height="30" stroke-opacity="0.1" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_cb.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_cb.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<rect fill-opacity="0.1" height="30" stroke-opacity="0.1" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_ct.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_ct.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<rect fill-opacity="0.1" height="30" stroke-opacity="0.1" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<rect fill-opacity="0.1" height="30" stroke-opacity="0.1" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<rect fill-opacity="0.1" height="30" stroke-opacity="0.1" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<rect fill-opacity="0.1" height="30" stroke-opacity="0.1" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_cb.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_cb.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<rect fill-opacity="0.1" height="30" stroke-opacity="0.1" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_ct.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_ct.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<rect fill-opacity="0.1" height="30" stroke-opacity="0.1" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<rect fill-opacity="0.1" height="30" stroke-opacity="0.1" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="-27.9995" y2="7.6726">
<stop offset="0" style="stop-color:#E6E6EB"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="-27.9995" y2="7.6726">
<stop offset="0" style="stop-color:#E6E6EB"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="-27.9995" y2="7.6726">
<stop offset="0" style="stop-color:#E6E6EB"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 300 20" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 300 20" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="300"/>
<rect fill="url(#SVGID_1_)" height="20" width="300"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 10 20" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 10 20" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="10"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="-8" y2="27.6731">
<stop offset="0" style="stop-color:#E6E6EB"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 10 20" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 10 20" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="10"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="-8" y2="27.6731">
<stop offset="0" style="stop-color:#E6E6EB"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="2" y2="37.6721">
<stop offset="0" style="stop-color:#E6E6EB"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="2" y2="37.6721">
<stop offset="0" style="stop-color:#E6E6EB"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="2" y2="37.6721">
<stop offset="0" style="stop-color:#E6E6EB"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="url(#SVGID_1_)" height="9.5" width="300"/>
<rect fill="#B4B4B9" height="1" width="300" y="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0.5,6c0,1.93,1.57,3.5,3.5,3.5h6V0H0.5V6z" fill="url(#SVGID_1_)"/>
<path d="M0,0v6c0,2.2,1.8,4,4,4h6V9H4C2.346,9,1,7.654,1,6V0H0z" fill="#B4B4B9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0,9.5h6c1.93,0,3.5-1.57,3.5-3.5V0H0V9.5z" fill="url(#SVGID_1_)"/>
<path d="M9,6c0,1.654-1.346,3-3,3H0v1h6c2.2,0,4-1.8,4-4V0H9V6z" fill="#B4B4B9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 300 20" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 300 20" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="300"/>
<rect fill="url(#SVGID_1_)" height="20" width="300"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 10 20" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 10 20" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="10"/>
<rect fill="url(#SVGID_1_)" height="20" width="9.5" x="0.5"/>
<rect fill="#B4B4B9" height="20" width="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 10 20" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 10 20" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="10"/>
<rect fill="url(#SVGID_1_)" height="20" width="9.5"/>
<rect fill="#B4B4B9" height="20" width="1" x="9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="300"/>
<rect fill="url(#SVGID_1_)" height="9.5" width="300" y="0.5"/>
<rect fill="#B4B4B9" height="1" width="300"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M10,0.5H4C2.07,0.5,0.5,2.07,0.5,4v6H10V0.5z" fill="url(#SVGID_1_)"/>
<path d="M1,4c0-1.654,1.346-3,3-3h6V0H4C1.8,0,0,1.8,0,4v6h1V4z" fill="#B4B4B9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M9.5,4c0-1.93-1.57-3.5-3.5-3.5H0V10h9.5V4z" fill="url(#SVGID_1_)"/>
<path d="M10,4c0-2.2-1.8-4-4-4H0v1h6c1.654,0,3,1.346,3,3v6h1V4z" fill="#B4B4B9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19.9995" x2="19.9995" y1="0.2319" y2="39.2324">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_cl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_cl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="0.5" x2="0.5" y1="2" y2="38.0005">
<stop offset="0" style="stop-color:#808080"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_cr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_cr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="0.2319" y2="39.2324">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="60"/>
<path d="M2,30V0H0v30c0,5.5,4.5,10,10,10h50v-2H10C5.589,38,2,34.411,2,30z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.5" x2="30.5" y1="0.2319" y2="39.2319">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="60"/>
<path d="M58,0v30c0,4.411-3.589,8-8,8H0v2h50c5.5,0,10-4.5,10-10V0H58z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1619 0)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1648.5" x2="-1648.5" y1="0.2319" y2="39.2319">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19.9995" x2="19.9995" y1="-0.1704" y2="38.8301">
<stop offset="0" style="stop-color:#646464"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_cl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_cl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="-0.1704" y2="38.8301">
<stop offset="0" style="stop-color:#646464"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_cr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_cr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="-0.1704" y2="38.8301">
<stop offset="0" style="stop-color:#646464"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.5" x2="30.5" y1="-0.1704" y2="38.8301">
<stop offset="0" style="stop-color:#646464"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.5" x2="29.5" y1="-0.1704" y2="38.8301">
<stop offset="0" style="stop-color:#646464"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19.9995" x2="19.9995" y1="0" y2="38.79">
<stop offset="0" style="stop-color:#0D0D0D"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_cl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_cl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="0" y2="38.79">
<stop offset="0" style="stop-color:#0D0D0D"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_cr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_cr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="0" y2="38.79">
<stop offset="0" style="stop-color:#0D0D0D"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.5" x2="30.5" y1="0" y2="38.79">
<stop offset="0" style="stop-color:#0D0D0D"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.5" x2="29.5" y1="0" y2="38.79">
<stop offset="0" style="stop-color:#0D0D0D"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20.0005" x2="20.0005" y1="39" y2="4.882813e-004">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_cl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_cl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="0.5" x2="0.5" y1="2" y2="38.0005">
<stop offset="0" style="stop-color:#808080"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_cr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_cr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="39" y2="4.882813e-004">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="60"/>
<path d="M2,30V0H0v30c0,5.5,4.5,10,10,10h50v-2H10C5.589,38,2,34.411,2,30z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.5" x2="30.5" y1="39" y2="0">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="60"/>
<path d="M58,0v30c0,4.411-3.589,8-8,8H0v2h50c5.5,0,10-4.5,10-10V0H58z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1619 0)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1648.5" x2="-1648.5" y1="39" y2="0">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19.9995" x2="19.9995" y1="3.6216" y2="38.7848">
<stop offset="0" style="stop-color:#4D4D4D"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_cl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_cl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="3.6216" y2="38.7848">
<stop offset="0" style="stop-color:#4D4D4D"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_cr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_cr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="3.6216" y2="38.7848">
<stop offset="0" style="stop-color:#4D4D4D"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.5" x2="30.5" y1="3.6216" y2="38.7848">
<stop offset="0" style="stop-color:#4D4D4D"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.5" x2="29.5" y1="3.6216" y2="38.7848">
<stop offset="0" style="stop-color:#4D4D4D"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="39" stroke-opacity="0.7" width="40"/>
<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_cl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_cl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="0" y2="38.5553">
<stop offset="0" style="stop-color:#828282"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_cr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_cr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="0" y2="38.5553">
<stop offset="0" style="stop-color:#828282"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.5" x2="30.5" y1="0" y2="38.5553">
<stop offset="0" style="stop-color:#828282"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.5" x2="29.5" y1="0" y2="38.5553">
<stop offset="0" style="stop-color:#828282"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19.9995" x2="19.9995" y1="2.6904" y2="38.7789">
<stop offset="0" style="stop-color:#6E6E6E"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_cl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_cl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="2.6904" y2="38.7789">
<stop offset="0" style="stop-color:#6E6E6E"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_cr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_cr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="2.6904" y2="38.7789">
<stop offset="0" style="stop-color:#6E6E6E"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.5" x2="30.5" y1="2.6904" y2="38.7789">
<stop offset="0" style="stop-color:#6E6E6E"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.5" x2="29.5" y1="2.6904" y2="38.7789">
<stop offset="0" style="stop-color:#6E6E6E"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="39" stroke-opacity="0.6" width="40"/>
<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_cl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_cl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="36.3096" y2="0.222">
<stop offset="0" style="stop-color:#6E6E6E"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_cr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_cr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="36.3096" y2="0.222">
<stop offset="0" style="stop-color:#6E6E6E"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.5" x2="30.5" y1="36.3096" y2="0.222">
<stop offset="0" style="stop-color:#6E6E6E"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 60 40" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.5" x2="29.5" y1="36.3096" y2="0.222">
<stop offset="0" style="stop-color:#6E6E6E"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="50"/>
<rect fill="url(#SVGID_1_)" height="9" width="50"/>
<rect fill="#5A5A64" fill-opacity="0.2" height="2" stroke-opacity="0.2" width="50" y="7"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M1,0v4c0,2.757,2.243,5,5,5h4V0H1z" fill="url(#SVGID_1_)"/>
<path d="M6,7C4.346,7,3,5.654,3,4V0H1v4c0,2.757,2.243,5,5,5h4V7H6z" fill="#5A5A64" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M0,0v9h4c2.757,0,5-2.243,5-5V0H0z" fill="url(#SVGID_1_)"/>
<path d="M7,0v4c0,1.654-1.346,3-3,3H0v2h4c2.757,0,5-2.243,5-5V0H7z" fill="#5A5A64" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 50 50" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 50 50" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="50" width="50"/>
<rect fill="url(#SVGID_1_)" height="50" width="50"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 10 50" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 10 50" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="50" width="10"/>
<rect fill="url(#SVGID_1_)" height="50" width="9" x="1"/>
<rect fill="#5A5A64" fill-opacity="0.2" height="50" stroke-opacity="0.2" width="2" x="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 10 50" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 10 50" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="50" width="10"/>
<rect fill="url(#SVGID_1_)" height="50" width="9"/>
<rect fill="#5A5A64" fill-opacity="0.2" height="50" stroke-opacity="0.2" width="2" x="7"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="50"/>
<rect fill="url(#SVGID_1_)" height="9" width="50" y="1"/>
<rect fill="#5A5A64" fill-opacity="0.2" height="2" stroke-opacity="0.2" width="50" y="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M6,1C3.243,1,1,3.243,1,6v4h9V1H6z" fill="url(#SVGID_1_)"/>
<path d="M6,1C3.243,1,1,3.243,1,6v4h2V6c0-1.654,1.346-3,3-3h4V1H6z" fill="#5A5A64" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="10" width="10"/>
<path d="M9,6c0-2.757-2.243-5-5-5H0v9h9V6z" fill="url(#SVGID_1_)"/>
<path d="M4,1H0v2h4c1.654,0,3,1.346,3,3v4h2V6C9,3.243,6.757,1,4,1z" fill="#5A5A64" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 25 50" width="25px" x="0px" y="0px">
+<svg baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 25 50" width="25px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="50" width="25"/>
<rect fill-opacity="0.3" height="5" stroke-opacity="0.3" width="25" y="45"/>
<rect fill-opacity="0.5" height="5" stroke-opacity="0.5" width="25" y="44"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 25 50" width="25px" x="0px" y="0px">
+<svg baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 25 50" width="25px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="50" width="25"/>
<path d="M0,45c0,3,1.8,5,4,5h21v-5H0z" fill-opacity="0.3" stroke-opacity="0.3"/>
<path d="M0,44c0,3,1.8,5,4,5h21v-5H0z" fill-opacity="0.5" stroke-opacity="0.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 25 50" width="25px" x="0px" y="0px">
+<svg baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 25 50" width="25px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="50" width="25"/>
<path d="M0,45v5h21c2.2,0,4-2,4-5H0z" fill-opacity="0.3" stroke-opacity="0.3"/>
<path d="M0,44v5h21c2.2,0,4-2,4-5H0z" fill-opacity="0.5" stroke-opacity="0.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 25 50" width="25px" x="0px" y="0px">
+<svg baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 25 50" width="25px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="50" width="25"/>
<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="48" stroke-opacity="0.8" width="25"/>
<rect fill="none" height="50" width="25"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 25 50" width="25px" x="0px" y="0px">
+<svg baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 25 50" width="25px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="50" width="25"/>
<path d="M4,0C1.8,0,0,1.801,0,4v40c0,2.201,1.8,4,4,4h21V0H4z" fill="url(#SVGID_1_)" fill-opacity="0.8" stroke-opacity="0.8"/>
<rect fill="none" height="50" width="25"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 25 50" width="25px" x="0px" y="0px">
+<svg baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 25 50" width="25px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="50" width="25"/>
<path d="M21,0H0v48h21c2.2,0,4-1.799,4-4V4C25,1.801,23.2,0,21,0z" fill="url(#SVGID_1_)" fill-opacity="0.8" stroke-opacity="0.8"/>
<rect fill="none" height="50" width="25"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_b.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_b.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="9.5" width="50"/>
<rect fill="#FFFFFF" height="1" width="50" y="9"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_bl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_bl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M0.5,0v3.585C0.5,6.852,3.148,9.5,6.414,9.5H10V0H0.5z" fill="url(#SVGID_1_)"/>
<path d="M6,9C3.243,9,1,6.757,1,4V0H0v4c0,3.313,2.687,6,6,6h4V9H6z" fill="#FFFFFF"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_br.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_br.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M9.5,0v3.585C9.5,6.852,6.852,9.5,3.586,9.5H0V0H9.5z" fill="url(#SVGID_1_)"/>
<path d="M4,9c2.757,0,5-2.243,5-5V0h1v4c0,3.313-2.687,6-6,6H0V9H4z" fill="#FFFFFF"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_c.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_c.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 50 50" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 50 50" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="50" width="50"/>
<defs>
<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 27.9308 -57.3724)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-116.8726" x2="-47.8726" y1="-2.9307" y2="-2.9307">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_l.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_l.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 10 50" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 10 50" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="50" width="9.5" x="0.5" y="0"/>
<rect fill="#FFFFFF" height="50" width="1"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_r.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_r.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 10 50" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 10 50" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="50" width="9.5" y="0"/>
<rect fill="#FFFFFF" height="50" width="1" x="9"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_t.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_t.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="9.5" width="50" y="0.5"/>
<rect fill="#FFFFFF" height="1" width="50"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_tl.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_tl.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M10,0.5H6.414C3.148,0.5,0.5,3.148,0.5,6.414V10H10V0.5z" fill="url(#SVGID_1_)"/>
<path d="M1,6c0-2.757,2.243-5,5-5h4V0H6C2.687,0,0,2.687,0,6v4h1V6z" fill="#FFFFFF"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_tr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_tr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M0,0.5h3.586C6.852,0.5,9.5,3.148,9.5,6.414V10H0V0.5z" fill="url(#SVGID_1_)"/>
<path d="M9,6c0-2.757-2.243-5-5-5H0V0h4c3.313,0,6,2.687,6,6v4H9V6z" fill="#FFFFFF"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_bg.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_bg.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 30 15" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 30 15" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="15" width="30"/>
<path d="M5.5,14C4.675,14,4,13.325,4,12.5v-10C4,1.675,4.675,1,5.5,1l0,0C6.325,1,7,1.675,7,2.5v10 C7,13.325,6.325,14,5.5,14L5.5,14z" fill="#BEBEBE"/>
<path d="M10.5,14C9.675,14,9,13.325,9,12.5v-10C9,1.675,9.675,1,10.5,1l0,0C11.325,1,12,1.675,12,2.5v10 C12,13.325,11.325,14,10.5,14L10.5,14z" fill="#BEBEBE"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_full.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_full.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 30 15" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 30 15" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="15" width="30"/>
<path d="M5.5,14C4.675,14,4,13.325,4,12.5v-10C4,1.675,4.675,1,5.5,1l0,0C6.325,1,7,1.675,7,2.5v10 C7,13.325,6.325,14,5.5,14L5.5,14z" fill="#88FF00"/>
<path d="M10.5,14C9.675,14,9,13.325,9,12.5v-10C9,1.675,9.675,1,10.5,1l0,0C11.325,1,12,1.675,12,2.5v10 C12,13.325,11.325,14,10.5,14L10.5,14z" fill="#88FF00"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_low.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_low.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 30 15" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 30 15" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="15" width="30"/>
<path d="M5.5,14C4.675,14,4,13.325,4,12.5v-10C4,1.675,4.675,1,5.5,1l0,0C6.325,1,7,1.675,7,2.5v10 C7,13.325,6.325,14,5.5,14L5.5,14z" fill="#E34D15"/>
<path d="M10.5,14C9.675,14,9,13.325,9,12.5v-10C9,1.675,9.675,1,10.5,1l0,0C11.325,1,12,1.675,12,2.5v10 C12,13.325,11.325,14,10.5,14L10.5,14z" fill="#E34D15"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_medium.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_medium.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 30 15" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 30 15" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="15" width="30"/>
<path d="M5.5,14C4.675,14,4,13.325,4,12.5v-10C4,1.675,4.675,1,5.5,1l0,0C6.325,1,7,1.675,7,2.5v10 C7,13.325,6.325,14,5.5,14L5.5,14z" fill="#FACD40"/>
<path d="M10.5,14C9.675,14,9,13.325,9,12.5v-10C9,1.675,9.675,1,10.5,1l0,0C11.325,1,12,1.675,12,2.5v10 C12,13.325,11.325,14,10.5,14L10.5,14z" fill="#FACD40"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_colorpicker_empty.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_colorpicker_empty.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M25,1H5C2.791,1,1,2.791,1,5v20c0,2.209,1.791,4,4,4h20c2.209,0,4-1.791,4-4V5C29,2.791,27.209,1,25,1z M2.001,5.001 C2.001,3.347,3.347,2,5,2h20c0.461,0,0.893,0.113,1.283,0.3L2.301,26.284c-0.187-0.391-0.3-0.822-0.3-1.283V5.001z M27.999,25.001 c0,1.653-1.345,2.999-2.998,2.999H5c-0.462,0-0.895-0.113-1.286-0.301L27.698,3.715c0.188,0.392,0.301,0.824,0.301,1.286V25.001z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_colorpicker_filled.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_colorpicker_filled.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M29,25c0,2.209-1.791,4-4,4H5c-2.209,0-4-1.791-4-4V5c0-2.209,1.791-4,4-4h20c2.209,0,4,1.791,4,4V25z"/>
<rect fill="none" height="30" width="30"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_colorpicker_mask.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_colorpicker_mask.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M25.001,28H5c-1.654,0-2.999-1.346-2.999-2.999v-20C2.001,3.347,3.347,2,5,2h20c1.652,0,2.998,1.347,2.998,3.001v20 C27.999,26.654,26.654,28,25.001,28L25.001,28z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_disabled.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_disabled.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<path d="M34,0H0v38h34c2.201,0,4-1.8,4-4V4C38,1.8,36.201,0,34,0z" fill="#AAAAAA" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M19,27c-0.412,0-0.795-0.217-0.996-0.576L9.156,14.871c-0.209-0.361-0.207-0.799,0-1.154 c0.203-0.355,0.586-0.576,0.996-0.576h17.693c0.412,0,0.795,0.223,0.998,0.576c0.209,0.355,0.209,0.793,0,1.154l-8.848,11.553 C19.787,26.783,19.41,27,19,27z" fill="#787878" fill-opacity="0.5" stroke-opacity="0.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_highlight.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_highlight.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<path d="M34,0H0v38h34c2.201,0,4-1.8,4-4V4C38,1.8,36.201,0,34,0z" fill="url(#SVGID_1_)"/>
<path d="M19,27c-0.411,0-0.795-0.217-0.996-0.576L9.156,14.871c-0.209-0.361-0.207-0.799,0-1.154 c0.203-0.355,0.586-0.576,0.997-0.576h17.692c0.412,0,0.795,0.223,0.999,0.576c0.208,0.355,0.208,0.793,0,1.154l-8.848,11.553 C19.787,26.783,19.41,27,19,27z" fill="#FFFFFF"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_latched.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_latched.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<path d="M34,0H0v38h34c2.2,0,4-1.8,4-4V4C38,1.8,36.2,0,34,0z" fill="url(#SVGID_1_)"/>
<g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_normal.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_normal.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<path d="M34,0H0v38h34c2.2,0,4-1.8,4-4V4C38,1.8,36.2,0,34,0z" fill="url(#SVGID_1_)"/>
<path d="M34,0H0v1h34c1.654,0,3,1.346,3,3v30c0,1.654-1.346,3-3,3H0v1h34c2.2,0,4-1.8,4-4V4C38,1.8,36.2,0,34,0z" fill="#BEBEC8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_pressed.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_pressed.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" y="0px">
+<svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="38" width="38"/>
<path d="M34,0H0v38h34c2.201,0,4-1.8,4-4V4C38,1.8,36.201,0,34,0z" fill="url(#SVGID_1_)"/>
<path d="M34,1H1v36h33c1.654,0,3-1.346,3-3V4C37,2.346,35.654,1,34,1z M36,34c0,1.103-0.896,2-2,2H2V2 h32c1.104,0,2,0.897,2,2V34z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_dimming_image.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_dimming_image.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="640px" version="1.1" viewBox="0 0 360 640" width="360px" x="0px" y="0px">
+<svg baseProfile="tiny" height="640px" version="1.1" viewBox="0 0 360 640" width="360px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="#00000A" fill-opacity="0.6" height="640" stroke-opacity="0.6" width="360"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_capital.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_capital.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 40 20" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 40 20" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M40,16c0,2.209-1.791,4-4,4H4c-2.209,0-4-1.791-4-4V4c0-2.209,1.791-4,4-4h32c2.209,0,4,1.791,4,4V16z" fill="#828282"/>
<path d="M13.325,16.887l-0.756-2.883H8.605l-0.773,2.883H5.634L9.414,3.782h2.848l3.621,13.105H13.325z M12.208,12.527L10.6,6.014l-1.652,6.513H12.208z" fill="#FFFFFF"/>
<path d="M21.35,16.887h-4.07V3.782h4.376c1.254,0,2.195,0.265,2.822,0.795s0.939,1.323,0.939,2.377 c0,1.5-0.727,2.508-2.18,3.023c1.67,0.381,2.506,1.454,2.506,3.217c0,1.23-0.367,2.152-1.1,2.768S22.814,16.887,21.35,16.887z M19.697,9.345h1.186c0.721,0,1.25-0.173,1.588-0.519c0.336-0.346,0.504-0.894,0.504-1.644c0-0.639-0.152-1.119-0.461-1.441 c-0.307-0.322-0.766-0.483-1.375-0.483h-1.442V9.345z M19.697,15.41h1.327c0.779,0,1.344-0.181,1.693-0.541 c0.348-0.36,0.521-0.953,0.521-1.779c0-0.773-0.18-1.346-0.539-1.715c-0.361-0.369-0.926-0.553-1.693-0.553h-1.309V15.41z" fill="#FFFFFF"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_numeric.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_numeric.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 40 20" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 40 20" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M40,16c0,2.209-1.791,4-4,4H4c-2.209,0-4-1.791-4-4V4c0-2.209,1.791-4,4-4h32c2.209,0,4,1.791,4,4V16z" fill="#828282"/>
<path d="M14.041,15.48v1.406H6.28V15.48h2.76V5.671L6.28,6.304V4.898l3.876-1.222h1.274V15.48H14.041z" fill="#FFFFFF"/>
<path d="M23.832,15.357v1.529h-7.84v-0.959c0-0.914,0.158-1.725,0.475-2.434s0.706-1.314,1.169-1.815 s1.049-1.05,1.758-1.648c0.851-0.715,1.386-1.269,1.608-1.661s0.334-0.782,0.334-1.169c0-0.68-0.18-1.191-0.541-1.534 c-0.359-0.343-0.9-0.514-1.621-0.514c-0.762,0-1.685,0.196-2.769,0.589h-0.018V4.177c1.137-0.357,2.244-0.536,3.322-0.536 c1.331,0,2.341,0.292,3.032,0.875s1.037,1.443,1.037,2.58c0,0.639-0.154,1.267-0.465,1.885s-1.043,1.411-2.197,2.377 c-0.645,0.545-1.149,1-1.513,1.363s-0.669,0.763-0.918,1.199s-0.385,0.916-0.409,1.438H23.832z" fill="#FFFFFF"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_small.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_small.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 40 20" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 40 20" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M40,16c0,2.209-1.791,4-4,4H4c-2.209,0-4-1.791-4-4V4c0-2.209,1.791-4,4-4h32c2.209,0,4,1.791,4,4V16z" fill="#828282"/>
<path d="M12.705,15.41c-0.703,1.078-1.717,1.617-3.041,1.617c-0.973,0-1.729-0.266-2.268-0.795 c-0.539-0.531-0.809-1.273-0.809-2.229c0-0.75,0.168-1.367,0.505-1.85c0.337-0.484,0.875-0.846,1.613-1.086s1.866-0.367,3.384-0.379 V9.688c0-0.58-0.16-1.017-0.479-1.31s-0.795-0.439-1.428-0.439c-0.732,0-1.632,0.167-2.698,0.501V6.911 c1.113-0.299,2.2-0.448,3.261-0.448c1.219,0,2.147,0.28,2.786,0.84s0.958,1.384,0.958,2.474v7.111h-1.389L12.705,15.41z M12.09,11.973h-0.844c-0.768,0-1.343,0.168-1.727,0.502s-0.576,0.832-0.576,1.494c0,0.527,0.114,0.922,0.343,1.186 s0.571,0.396,1.028,0.396c0.574,0,1.014-0.184,1.318-0.549c0.305-0.367,0.457-0.885,0.457-1.553V11.973z" fill="#FFFFFF"/>
<path d="M19.227,7.491c0.65-0.686,1.494-1.028,2.531-1.028c1.166,0,2.041,0.424,2.623,1.271 c0.584,0.847,0.875,2.116,0.875,3.81c0,1.717-0.41,3.055-1.23,4.012c-0.82,0.959-1.982,1.438-3.488,1.438 c-1.278,0-2.509-0.076-3.692-0.229V2.973h2.382V7.491z M19.227,11.631v3.832c0.311,0.047,0.729,0.07,1.258,0.07 c0.785,0,1.367-0.305,1.748-0.914s0.572-1.646,0.572-3.111c0-1.189-0.146-2.082-0.439-2.676s-0.73-0.893-1.311-0.893 c-0.592,0-1.045,0.234-1.358,0.703C19.383,9.111,19.227,10.107,19.227,11.631z" fill="#FFFFFF"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_text.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_text.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 40 20" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 40 20" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M40,16c0,2.209-1.791,4-4,4H4c-2.209,0-4-1.791-4-4V4c0-2.209,1.791-4,4-4h32c2.209,0,4,1.791,4,4V16z" fill="#828282"/>
<path d="M13.628,16.887l-0.756-2.883H8.908l-0.773,2.883H5.938L9.717,3.782h2.848l3.621,13.105H13.628z M12.512,12.527l-1.608-6.513l-1.652,6.513H12.512z" fill="#FFFFFF"/>
<path d="M19.877,7.491c0.65-0.686,1.494-1.028,2.531-1.028c1.166,0,2.041,0.423,2.623,1.27 c0.584,0.847,0.875,2.117,0.875,3.811c0,1.717-0.41,3.054-1.23,4.012s-1.982,1.438-3.488,1.438c-1.278,0-2.509-0.076-3.692-0.229 V2.973h2.382V7.491z M19.877,11.631v3.832c0.311,0.047,0.73,0.07,1.258,0.07c0.785,0,1.367-0.305,1.748-0.914 s0.572-1.646,0.572-3.111c0-1.19-0.146-2.082-0.439-2.677s-0.73-0.892-1.311-0.892c-0.592,0-1.045,0.234-1.357,0.703 C20.033,9.111,19.877,10.107,19.877,11.631z" fill="#FFFFFF"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_handle_begin.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_handle_begin.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
+<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<circle cx="8" cy="8" fill-opacity="0.1" r="8" stroke-opacity="0.1"/>
<path d="M8,15c-3.86,0-7-3.141-7-7c0-3.86,3.14-7,7-7c3.859,0,7,3.14,7,7C15,11.859,11.859,15,8,15L8,15z" fill="url(#SVGID_1_)"/>
<path d="M8,2C4.691,2,2,4.691,2,8s2.691,6,6,6s6-2.691,6-6S11.309,2,8,2z M8,13c-2.757,0-5-2.244-5-5 c0-2.757,2.243-5,5-5s5,2.243,5,5C13,10.756,10.757,13,8,13z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_handle_end.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_handle_end.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
+<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<circle cx="8" cy="8" fill-opacity="0.1" r="8" stroke-opacity="0.1"/>
<path d="M8,15c-3.86,0-7-3.141-7-7c0-3.86,3.14-7,7-7c3.859,0,7,3.14,7,7C15,11.859,11.859,15,8,15L8,15z" fill="url(#SVGID_1_)"/>
<path d="M8,2C4.691,2,2,4.691,2,8s2.691,6,6,6s6-2.691,6-6S11.309,2,8,2z M8,13c-2.757,0-5-2.244-5-5 c0-2.757,2.243-5,5-5s5,2.243,5,5C13,10.756,10.757,13,8,13z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_input_h_swipe.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_input_h_swipe.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="126px" version="1.1" viewBox="0 0 15 126" width="15px" x="0px" y="0px">
+<svg baseProfile="tiny" height="126px" version="1.1" viewBox="0 0 15 126" width="15px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<linearGradient gradientTransform="matrix(0 -1 -1 0 -1234.5195 -3644.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-3707.98" x2="-3707.98" y1="-1234.5195" y2="-1249.0195">
<stop offset="0" style="stop-color:#F5F5FA"/>
<stop offset="1" style="stop-color:#D2D2D7"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_input_v_swipe.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_input_v_swipe.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 126 15" width="126px" x="0px" y="0px">
+<svg baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 126 15" width="126px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="62.9995" x2="62.9995" y1="0" y2="14.5005">
<stop offset="0" style="stop-color:#F5F5FA"/>
<stop offset="1" style="stop-color:#D2D2D7"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progbar_h_wait.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progbar_h_wait.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="9.9995" x2="9.9995" y1="5" y2="15.0005">
<stop offset="0" style="stop-color:#66B8CC"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progbar_v_wait.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progbar_v_wait.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="20"/>
<linearGradient gradientTransform="matrix(0 1 -1 0 -450.9985 1321.0005)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1311.001" x2="-1311.001" y1="-465.9976" y2="-455.998">
<stop offset="0" style="stop-color:#66B8CC"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_disabled.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_disabled.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<circle cx="20" cy="20" fill="#969696" fill-opacity="0.8" r="19.999" stroke-opacity="0.8"/>
<path d="M20,0.999C9.522,0.999,0.999,9.522,0.999,20 c0,10.477,8.522,18.999,19.001,18.999c10.479,0,18.999-8.522,18.999-18.999C38.999,9.522,30.479,0.999,20,0.999z M20,37.273 c-9.523,0-17.274-7.75-17.274-17.273c0-9.524,7.751-17.274,17.274-17.274c9.523,0,17.273,7.75,17.273,17.274 C37.273,29.523,29.523,37.273,20,37.273z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_normal.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_normal.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<circle cx="20" cy="20" fill="url(#SVGID_1_)" r="19.999"/>
<path d="M20,0.999C9.522,0.999,0.999,9.522,0.999,20 c0,10.476,8.522,18.999,19.001,18.999S38.999,30.476,38.999,20C38.999,9.522,30.479,0.999,20,0.999z M20,37.274 c-9.523,0-17.274-7.751-17.274-17.274c0-9.524,7.751-17.274,17.274-17.274c9.523,0,17.273,7.75,17.273,17.274 C37.273,29.523,29.523,37.274,20,37.274z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_pressed.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_pressed.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="40"/>
<circle cx="20" cy="20" fill="url(#SVGID_1_)" r="19.999"/>
<path d="M20,0.999C9.522,0.999,0.999,9.522,0.999,20 c0,10.477,8.522,18.999,19.001,18.999c10.479,0,18.999-8.522,18.999-18.999C38.999,9.522,30.479,0.999,20,0.999z M20,37.273 c-9.523,0-17.274-7.75-17.274-17.273c0-9.524,7.751-17.274,17.274-17.274c9.523,0,17.273,7.75,17.273,17.274 C37.273,29.523,29.523,37.273,20,37.273z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_rated.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_rated.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="25px" version="1.1" viewBox="0 0 25 25" width="25px" x="0px" y="0px">
+<svg baseProfile="tiny" height="25px" version="1.1" viewBox="0 0 25 25" width="25px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M15.312,9.813L12.506,1.13L9.689,9.813H0.545l7.416,5.367L5.109,23.87l7.396-5.396l7.385,5.396 l-2.844-8.689l7.408-5.367H15.312z" fill="url(#SVGID_1_)"/>
<path d="M24.455,9.813h-9.144L12.506,1.13L9.689,9.813H0.545l7.416,5.367L5.109,23.87l7.396-5.396 l7.385,5.396l-2.844-8.689L24.455,9.813z M17.977,21.235l-5.472-4l-5.477,3.994l2.111-6.431l-5.505-3.984h6.782l2.085-6.436 l2.081,6.436h6.787l-5.5,3.984L17.977,21.235z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
<rect fill="none" height="25" width="25"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_rated_disabled.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_rated_disabled.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="25px" version="1.1" viewBox="0 0 25 25" width="25px" x="0px" y="0px">
+<svg baseProfile="tiny" height="25px" version="1.1" viewBox="0 0 25 25" width="25px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M15.313,9.813L12.506,1.13L9.689,9.813H0.545l7.416,5.367L5.109,23.87l7.396-5.396 l7.385,5.396l-2.844-8.689l7.408-5.367H15.313z" fill="#AAAAAA" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M24.455,9.813h-9.143L12.506,1.13L9.689,9.813H0.545l7.416,5.367L5.109,23.87l7.396-5.396l7.385,5.396 l-2.844-8.689L24.455,9.813z M17.977,21.235l-5.471-4l-5.477,3.994l2.111-6.431l-5.506-3.984h6.783l2.084-6.436l2.082,6.436h6.787 l-5.5,3.984L17.977,21.235z" fill-opacity="0.2" stroke-opacity="0.2"/>
<rect fill="none" height="25" width="25"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_unrated.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_unrated.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="25px" version="1.1" viewBox="0 0 25 25" width="25px" x="0px" y="0px">
+<svg baseProfile="tiny" height="25px" version="1.1" viewBox="0 0 25 25" width="25px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M15.312,9.813L12.506,1.13L9.689,9.813H0.545l7.416,5.367L5.109,23.87l7.396-5.396l7.385,5.396 l-2.844-8.689l7.408-5.367H15.312z" fill="url(#SVGID_1_)"/>
<path d="M24.455,9.813h-9.144L12.506,1.13L9.689,9.813H0.545l7.416,5.367L5.109,23.87l7.396-5.396l7.385,5.396 l-2.844-8.689L24.455,9.813z M17.977,21.235l-5.472-4l-5.477,3.994l2.111-6.431l-4.124-2.985h6.128l1.358-4.189l1.354,4.189h6.136 l-4.121,2.985L17.977,21.235z" fill-opacity="0.1"/>
<rect fill="none" height="25" width="25"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_unrated_disabled.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_unrated_disabled.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="25px" version="1.1" viewBox="0 0 25 25" width="25px" x="0px" y="0px">
+<svg baseProfile="tiny" height="25px" version="1.1" viewBox="0 0 25 25" width="25px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M15.312,9.813L12.506,1.13L9.689,9.813H0.545l7.416,5.367L5.109,23.87l7.396-5.396 l7.385,5.396l-2.844-8.689l7.408-5.367H15.312z" fill="#AAAAAA" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M24.455,9.813h-9.144L12.506,1.13L9.689,9.813H0.545l7.416,5.367L5.109,23.87l7.396-5.396l7.385,5.396 l-2.844-8.689L24.455,9.813z M17.977,21.235l-5.472-4l-5.477,3.994l2.111-6.431l-4.124-2.985h6.128l1.358-4.189l1.354,4.189h6.136 l-4.121,2.985L17.977,21.235z" fill-opacity="0.1"/>
<rect fill="none" height="25" width="25"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_screen_bg_lsc.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_screen_bg_lsc.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="360px" version="1.1" viewBox="0 0 640 360" width="640px" x="0px" y="0px">
+<svg baseProfile="tiny" height="360px" version="1.1" viewBox="0 0 640 360" width="640px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="360" width="640"/>
<defs>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="319.9995" x2="319.9995" y1="0" y2="360.0005">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_screen_bg_prt.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_screen_bg_prt.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="640px" version="1.1" viewBox="0 0 360 640" width="360px" x="0px" y="0px">
+<svg baseProfile="tiny" height="640px" version="1.1" viewBox="0 0 360 640" width="360px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="url(#SVGID_1_)" height="640" width="360"/>
<defs>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="179.9995" x2="179.9995" y1="0" y2="640.0005">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_bg.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_bg.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="15px" version="1.1" viewBox="0 1.524 30 15" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="15px" version="1.1" viewBox="0 1.524 30 15" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M24.5,15.524c-0.825,0-1.5-0.675-1.5-1.5v-10c0-0.825,0.675-1.5,1.5-1.5l0,0c0.825,0,1.5,0.675,1.5,1.5v10 C26,14.85,25.325,15.524,24.5,15.524L24.5,15.524z" fill="#BEBEBE"/>
<path d="M19.5,15.024c-0.825,0-1.5-0.675-1.5-1.5v-9c0-0.825,0.675-1.5,1.5-1.5l0,0c0.825,0,1.5,0.675,1.5,1.5v9 C21,14.35,20.325,15.024,19.5,15.024L19.5,15.024z" fill="#BEBEBE"/>
<path d="M14.5,14.524c-0.825,0-1.5-0.675-1.5-1.5v-8c0-0.825,0.675-1.5,1.5-1.5l0,0c0.825,0,1.5,0.675,1.5,1.5v8 C16,13.85,15.325,14.524,14.5,14.524L14.5,14.524z" fill="#BEBEBE"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_full.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_full.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 30 15" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 30 15" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M24.5,14c-0.825,0-1.5-0.675-1.5-1.5v-10C23,1.675,23.675,1,24.5,1l0,0C25.325,1,26,1.675,26,2.5v10 C26,13.325,25.325,14,24.5,14L24.5,14z" fill="#01EEFF"/>
<path d="M19.5,13.5c-0.825,0-1.5-0.675-1.5-1.5V3c0-0.825,0.675-1.5,1.5-1.5l0,0C20.325,1.5,21,2.175,21,3v9 C21,12.825,20.325,13.5,19.5,13.5L19.5,13.5z" fill="#01EEFF"/>
<path d="M14.5,13c-0.825,0-1.5-0.675-1.5-1.5v-8C13,2.675,13.675,2,14.5,2l0,0C15.325,2,16,2.675,16,3.5v8 C16,12.325,15.325,13,14.5,13L14.5,13z" fill="#01EEFF"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_low.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_low.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 30 15" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 30 15" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M24.5,14c-0.825,0-1.5-0.675-1.5-1.5v-10C23,1.675,23.675,1,24.5,1l0,0C25.325,1,26,1.675,26,2.5v10 C26,13.325,25.325,14,24.5,14L24.5,14z" fill="#E34D15"/>
<path d="M19.5,13.5c-0.825,0-1.5-0.675-1.5-1.5V3c0-0.825,0.675-1.5,1.5-1.5l0,0C20.325,1.5,21,2.175,21,3v9 C21,12.825,20.325,13.5,19.5,13.5L19.5,13.5z" fill="#E34D15"/>
<path d="M14.5,13c-0.825,0-1.5-0.675-1.5-1.5v-8C13,2.675,13.675,2,14.5,2l0,0C15.325,2,16,2.675,16,3.5v8 C16,12.325,15.325,13,14.5,13L14.5,13z" fill="#E34D15"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_medium.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_medium.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 30 15" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 30 15" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M24.5,14c-0.825,0-1.5-0.675-1.5-1.5v-10C23,1.675,23.675,1,24.5,1l0,0C25.325,1,26,1.675,26,2.5v10 C26,13.325,25.325,14,24.5,14L24.5,14z" fill="#FACD40"/>
<path d="M19.5,13.5c-0.825,0-1.5-0.675-1.5-1.5V3c0-0.825,0.675-1.5,1.5-1.5l0,0C20.325,1.5,21,2.175,21,3v9 C21,12.825,20.325,13.5,19.5,13.5L19.5,13.5z" fill="#FACD40"/>
<path d="M14.5,13c-0.825,0-1.5-0.675-1.5-1.5v-8C13,2.675,13.675,2,14.5,2l0,0C15.325,2,16,2.675,16,3.5v8 C16,12.325,15.325,13,14.5,13L14.5,13z" fill="#FACD40"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_disabled.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_disabled.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 20 40" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 20 40" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M0,20c0-5.513,4.485-10,10-10c5.513,0,10,4.487,10,10c0,5.516-4.487,10-10,10 C4.484,30,0,25.516,0,20L0,20z" fill-opacity="0.1" stroke-opacity="0.1"/>
<rect fill="none" height="40" width="20"/>
<circle cx="10.002" cy="20" fill="#969696" r="9.23"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_normal.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_normal.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 20 40" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 20 40" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="20"/>
<path d="M10,30C4.487,30,0,25.516,0,20c0-5.513,4.487-10,10-10c5.516,0,10,4.487,10,10 C20,25.516,15.516,30,10,30L10,30z" fill-opacity="0.1" stroke-opacity="0.1"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -277.4805 -360.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="287.4785" x2="287.4785" y1="-370.7881" y2="-389.248">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_pressed.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_pressed.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 20 40" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 20 40" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="40" width="20"/>
<path d="M10,30C4.487,30,0,25.516,0,20c0-5.513,4.487-10,10-10c5.516,0,10,4.487,10,10 C20,25.516,15.516,30,10,30L10,30z" fill-opacity="0.1" stroke-opacity="0.1"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -287.4805 -360.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="297.4785" x2="297.4785" y1="-370.7881" y2="-389.248">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_tick_major.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_tick_major.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="6px" version="1.1" viewBox="0 0 3 6" width="3px" x="0px" y="0px">
+<svg baseProfile="tiny" height="6px" version="1.1" viewBox="0 0 3 6" width="3px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M3,4.5C3,5.328,2.328,6,1.5,6l0,0C0.672,6,0,5.328,0,4.5v-3C0,0.672,0.672,0,1.5,0l0,0 C2.328,0,3,0.672,3,1.5V4.5z" fill="#B2B2B2"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_tick_minor.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_tick_minor.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="3px" version="1.1" viewBox="0 0 3 3" width="3px" x="0px" y="0px">
+<svg baseProfile="tiny" height="3px" version="1.1" viewBox="0 0 3 3" width="3px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<circle cx="1.5" cy="1.5" fill="#B2B2B2" r="1.5"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_disabled.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_disabled.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 40 20" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 40 20" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M20,20c-5.513,0-10-4.484-10-10c0-5.513,4.487-10,10-10c5.516,0,10,4.487,10,10 C30,15.516,25.516,20,20,20L20,20z" fill-opacity="0.1" stroke-opacity="0.1"/>
<rect fill="none" height="20" width="40" y="0"/>
<circle cx="20" cy="9.999" fill="#969696" r="9.23"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_normal.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_normal.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 40 20" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 40 20" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="40"/>
<path d="M20,20c-5.513,0-10-4.484-10-10c0-5.513,4.487-10,10-10c5.516,0,10,4.487,10,10 C30,15.516,25.516,20,20,20L20,20z" fill-opacity="0.1" stroke-opacity="0.1"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -277.4805 -380.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="297.4785" x2="297.4785" y1="-380.7881" y2="-399.248">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_pressed.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_pressed.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 40 20" width="40px" x="0px" y="0px">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 40 20" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="20" width="40"/>
<path d="M20,20c-5.513,0-10-4.484-10-10c0-5.513,4.487-10,10-10c5.516,0,10,4.487,10,10 C30,15.516,25.516,20,20,20L20,20z" fill-opacity="0.1" stroke-opacity="0.1"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -287.4805 -380.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="307.4785" x2="307.4785" y1="-380.7881" y2="-399.248">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_tick_major.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_tick_major.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="3px" version="1.1" viewBox="0 0 6 3" width="6px" x="0px" y="0px">
+<svg baseProfile="tiny" height="3px" version="1.1" viewBox="0 0 6 3" width="6px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M4.5,0C5.328,0,6,0.672,6,1.5l0,0C6,2.328,5.328,3,4.5,3h-3C0.672,3,0,2.328,0,1.5l0,0 C0,0.672,0.672,0,1.5,0H4.5z" fill="#B2B2B2"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_tick_minor.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_tick_minor.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="3px" version="1.1" viewBox="0 0 3 3" width="3px" x="0px" y="0px">
+<svg baseProfile="tiny" height="3px" version="1.1" viewBox="0 0 3 3" width="3px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<circle cx="1.5" cy="1.5" fill="#B2B2B2" r="1.5"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_handle_normal.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_handle_normal.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 20 60" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 20 60" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="9.9995" x2="9.9995" y1="0" y2="59.3335">
<stop offset="0" style="stop-color:#0D0D0D"/>
<stop offset="0.7418" style="stop-color:#000000"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_handle_pressed.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_handle_pressed.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 20 60" width="20px" x="0px" y="0px">
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 20 60" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M20,60H4c-2.209,0-4-1.791-4-4V4c0-2.209,1.791-4,4-4h16V60z" fill="url(#SVGID_1_)"/>
<path d="M4,1C2.346,1,1,2.346,1,4v52c0,1.654,1.346,3,3,3h15V1H4z M18,58H4c-1.103,0-2-0.898-2-2V4 c0-1.104,0.897-2,2-2h14V58z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
<path d="M4,0C1.791,0,0,1.791,0,4v52c0,2.209,1.791,4,4,4h16V0H4z M19,59H4c-1.652,0-2.998-1.346-2.998-3.002V4 c0-1.654,1.346-3,2.998-3h15V59z" fill-opacity="0.2" stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_minimize.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_minimize.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 10 40" width="10px" x="0px" y="0px">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 10 40" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.9995" x2="4.9995" y1="8" y2="12">
<stop offset="0" style="stop-color:#969696"/>
<stop offset="1" style="stop-color:#323232"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trackpoint_activated.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trackpoint_activated.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="64px" version="1.1" viewBox="0 0 64 64" width="64px" x="0px" y="0px">
+<svg baseProfile="tiny" height="64px" version="1.1" viewBox="0 0 64 64" width="64px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<linearGradient gradientTransform="matrix(0 1 -1 0 3173.9492 5878.6792)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-5815.6792" x2="-5877.6792" y1="3141.9502" y2="3141.9502">
<stop offset="0" style="stop-color:#FAFAFA"/>
<stop offset="1" style="stop-color:#DCDCE6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trackpoint_normal.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trackpoint_normal.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="36px" version="1.1" viewBox="0 0 36 36" width="36px" x="0px" y="0px">
+<svg baseProfile="tiny" height="36px" version="1.1" viewBox="0 0 36 36" width="36px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<linearGradient gradientTransform="matrix(0 1 -1 0 3145.9492 5878.6792)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-5843.6792" x2="-5877.6792" y1="3127.9502" y2="3127.9502">
<stop offset="0" style="stop-color:#FAFAFA"/>
<stop offset="1" style="stop-color:#DCDCE6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trackpoint_pressed.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trackpoint_pressed.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="64px" version="1.1" viewBox="0 0 64 64" width="64px" x="0px" y="0px">
+<svg baseProfile="tiny" height="64px" version="1.1" viewBox="0 0 64 64" width="64px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<linearGradient gradientTransform="matrix(0 1 -1 0 3173.9492 5878.6792)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-5815.6792" x2="-5877.6792" y1="3141.9502" y2="3141.9502">
<stop offset="0" style="stop-color:#FAFAFA"/>
<stop offset="1" style="stop-color:#DCDCE6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_tumbler_divider.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_tumbler_divider.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="70px" version="1.1" viewBox="0 0 3 70" width="3px" x="0px" y="0px">
+<svg baseProfile="tiny" height="70px" version="1.1" viewBox="0 0 3 70" width="3px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill-opacity="0.2" height="70" stroke-opacity="0.2" width="2"/>
<rect fill-opacity="0.2" height="70" stroke-opacity="0.2" width="1" x="1"/>
<rect fill="#FFFFFF" fill-opacity="0.4" height="70" stroke-opacity="0.4" width="1" x="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_about.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_about.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_accessibility.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_accessibility.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientTransform="matrix(1 0 0 1 -574.9609 -786.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="604.9609" x2="604.9609" y1="788.3066" y2="844.3066">
<stop offset="0" style="stop-color:#A1DCFF"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
<stop offset="0" style="stop-color:#A7E722"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_mode.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_mode.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_add_contact_picture.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_add_contact_picture.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
-<rect fill="none" height="60" width="60"/>
-<path d="M58,53c0,2.762-2.238,5-5,5H7c-2.762,0-5-2.238-5-5V7c0-2.762,2.238-5,5-5h46c2.762,0,5,2.238,5,5V53z" fill="#E6E6E6"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 39.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-72.52" x2="-72.52" y1="32.0566" y2="-9.48">
+<g>
+<rect fill="#E6E6E6" height="60" width="60" x="0"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -208.8501 -238.8496)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="238.8494" x2="238.8494" y1="-245.1958" y2="-289.6997">
<stop offset="0" style="stop-color:#949494"/>
<stop offset="1" style="stop-color:#393939"/>
</linearGradient>
-<path d="M47.152,42.693c-1.711-0.891-10.189-3.861-10.353-4.045l0,0c-0.959-1.101-0.922-3.529-0.438-4.584 l0,0c0.035-0.074,0.068-0.146,0.104-0.203c0.119-0.184,0.226-0.365,0.339-0.549H36.8c0.837-1.365,1.539-2.726,2.111-4 c1.039,0.359,2.371-0.605,3.032-2.24c0.688-1.689,0.392-3.447-0.661-3.922c-0.062-0.027-0.123-0.029-0.183-0.049V23.1 c0.135-0.535,0.197-0.848,0.197-0.848c1.818-8.154-2.139-14.619-11.721-14.938c-3.938,0-5.834,1.789-7.295,3.662 c-2.377,0.367-6.146,2.545-3.488,12.09c-0.1,0.014-0.201,0.031-0.299,0.07c-1.061,0.449-1.395,2.188-0.742,3.889 c0.648,1.699,2.037,2.715,3.1,2.27c0.064-0.027,0.121-0.074,0.18-0.115c0.584,1.316,1.303,2.718,2.166,4.132h-0.004 c0.031,0.049,0.059,0.099,0.09,0.146c0.018,0.029,0.035,0.055,0.051,0.084c0.002,0.004,0.004,0.006,0.004,0.006 c0.064,0.104,0.125,0.209,0.193,0.313c0.545,0.855,0.68,3.316-0.172,4.58c-0.223,0.293-8.578,3.226-10.516,4.252 C10.625,43.871,7,46.58,7,52.686h46C53,46.58,48.863,43.582,47.152,42.693z M18.811,23.063c0.021-0.02,0.043-0.041,0.066-0.061 c0.002,0.016,0.004,0.025,0.01,0.041C18.859,23.047,18.836,23.057,18.811,23.063z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 39.9805)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-72.52" x2="-72.52" y1="31.2559" y2="-12.5599">
+<path d="M48.378,43.6c-1.834-0.954-10.918-4.137-11.093-4.333l0,0c-1.027-1.18-0.987-3.782-0.47-4.912l0,0 c0.037-0.079,0.073-0.155,0.112-0.218c0.128-0.196,0.241-0.391,0.363-0.588h-0.006c0.897-1.463,1.649-2.92,2.263-4.286 c1.113,0.385,2.54-0.648,3.25-2.4c0.736-1.81,0.418-3.693-0.71-4.202c-0.064-0.029-0.132-0.031-0.194-0.052v-0.001 c0.145-0.574,0.21-0.909,0.21-0.909c1.948-8.736-2.291-15.664-12.558-16.005c-4.219,0-6.25,1.917-7.816,3.924 c-2.548,0.393-6.585,2.727-3.737,12.954c-0.108,0.015-0.216,0.033-0.32,0.075c-1.137,0.481-1.494,2.344-0.795,4.167 c0.695,1.82,2.183,2.909,3.322,2.432c0.068-0.029,0.13-0.079,0.192-0.123c0.626,1.41,1.395,2.913,2.321,4.427h-0.004 c0.034,0.053,0.063,0.105,0.097,0.157c0.019,0.031,0.037,0.059,0.054,0.09c0.002,0.004,0.004,0.007,0.004,0.007 c0.069,0.11,0.134,0.224,0.207,0.334c0.584,0.917,0.728,3.554-0.184,4.907c-0.239,0.314-9.191,3.456-11.268,4.556 c-2.377,1.263-6.261,4.165-6.261,10.706h49.286C54.642,47.765,50.211,44.552,48.378,43.6z M18.012,22.567 c0.022-0.021,0.046-0.044,0.069-0.065c0.003,0.018,0.005,0.027,0.012,0.044C18.063,22.55,18.038,22.561,18.012,22.567z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -208.8501 -238.8496)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="238.8494" x2="238.8494" y1="-246.0537" y2="-292.9995">
<stop offset="0" style="stop-color:#7A7A7A"/>
<stop offset="0.7515" style="stop-color:#0A0A0A"/>
<stop offset="1" style="stop-color:#5F5F5F"/>
</linearGradient>
-<path d="M7.645,52.686c0.172-4,2.02-6.963,5.496-8.807c1.014-0.539,4.008-1.676,6.412-2.592 c3.986-1.516,4.131-1.598,4.311-1.84c0.938-1.383,0.877-3.664,0.406-4.877l-0.535-0.957c-0.779-1.275-1.494-2.641-2.125-4.059 l-0.301-0.67l-0.617,0.396l-0.074,0.053c-0.098,0.047-0.191,0.066-0.291,0.066c-0.598,0-1.494-0.691-1.984-1.971 c-0.568-1.479-0.244-2.811,0.4-3.082c0.025-0.012,0.098-0.023,0.15-0.031l0.195-0.031l0.582-0.055l-0.418-1.711 c0,0-1.465-5.891,0.197-8.439c0.836-1.281,2.051-1.717,2.932-1.854l0.244-0.039l0.154-0.193c1.293-1.656,2.99-3.422,6.799-3.422 c4.238,0.143,7.525,1.553,9.484,4.082c1.938,2.504,2.514,6.084,1.621,10.088c-0.004,0.023-0.211,1.451-0.211,1.451l0.444,0.139 c0.039,0.014,0.08,0.021,0.121,0.029c0.627,0.281,0.924,1.629,0.321,3.104c-0.51,1.264-1.391,1.922-1.996,1.922 c-0.086,0-0.168-0.014-0.245-0.041l-0.543-0.188l-0.236,0.525c-0.612,1.359-1.312,2.684-2.075,3.929l-0.535,0.957 c-0.498,1.273-0.521,3.841,0.598,5.121c0,0,1.869,0.826,3.637,1.482c2.502,0.93,5.928,2.201,6.9,2.705 c0.889,0.463,5.199,3.002,5.492,8.807H7.645V52.686z" fill="url(#SVGID_2_)"/>
-<rect fill="none" height="60" width="60"/>
+<path d="M6.048,54.306c0.185-4.285,2.164-7.46,5.89-9.436c1.086-0.577,4.294-1.795,6.87-2.776 c4.27-1.624,4.425-1.712,4.618-1.972c1.005-1.481,0.94-3.926,0.436-5.226l-0.573-1.025c-0.835-1.366-1.601-2.829-2.277-4.349 l-0.322-0.718l-0.662,0.424l-0.079,0.057c-0.105,0.05-0.205,0.071-0.312,0.071c-0.642,0-1.602-0.74-2.126-2.111 c-0.608-1.585-0.261-3.012,0.429-3.302c0.027-0.013,0.105-0.025,0.161-0.034l0.208-0.033l0.624-0.059l-0.448-1.833 c0,0-1.57-6.312,0.211-9.042c0.896-1.373,2.197-1.84,3.14-1.986l0.263-0.042l0.166-0.207c1.385-1.774,3.204-3.667,7.284-3.667 c4.541,0.153,8.063,1.664,10.162,4.374c2.076,2.684,2.693,6.519,1.736,10.809c-0.004,0.024-0.226,1.554-0.226,1.554l0.477,0.149 c0.041,0.015,0.085,0.022,0.129,0.031c0.672,0.301,0.989,1.745,0.346,3.326c-0.546,1.354-1.491,2.06-2.139,2.06 c-0.092,0-0.18-0.015-0.264-0.044l-0.582-0.201l-0.253,0.562c-0.656,1.456-1.404,2.876-2.224,4.21l-0.573,1.025 c-0.533,1.364-0.558,4.115,0.641,5.487c0,0,2.002,0.885,3.896,1.588c2.681,0.996,6.352,2.358,7.393,2.898 c0.952,0.496,5.571,3.217,5.885,9.436H6.048V54.306z" fill="url(#SVGID_2_)"/>
+</g>
</g>
<g transform="matrix(1 0 0 1 30 30)">
<polygon fill="none" points="0,7.489 0,24.514 0,30 30,30 30,24.514 30,5.713 30,0 0,0 "/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_add_group_picture.svg Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<g>
+<rect fill="#E6E6E6" height="60" width="60"/>
+<g>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 235.2559)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-76.5259" x2="-76.5259" y1="220.3242" y2="193.6569">
+<stop offset="0" style="stop-color:#7A7A7A"/>
+<stop offset="0.7515" style="stop-color:#0A0A0A"/>
+<stop offset="1" style="stop-color:#5F5F5F"/>
+</linearGradient>
+<path d="M42.225,23.022c0.973,1.231,1.162,3.183,0.377,5.11c-0.633,1.563-1.771,2.703-3.057,3.128 c0,0-0.023,0.037-0.057,0.093c0.096,0.735,0.008,1.653-0.414,2.273c-0.086,0.116-0.176,0.178-1.381,0.645 c-0.066,0.109-0.111,0.183-0.119,0.195c-0.143,0.364-0.152,1.213-0.025,1.696c0.555,0.215,1.473,0.555,2.309,0.866 c3.098,1.148,5.539,2.066,6.479,2.555c0.436,0.227,1.594,0.898,2.801,2.102h7.281c-0.18-3.533-2.803-5.078-3.344-5.359 c-0.594-0.307-2.678-1.081-4.199-1.646c-1.076-0.398-2.213-0.902-2.213-0.902c-0.682-0.779-0.666-2.342-0.363-3.116l0.326-0.581 c0.465-0.76,0.889-1.564,1.262-2.393l0.145-0.32l0.33,0.113c0.047,0.018,0.098,0.025,0.15,0.025c0.369,0,0.904-0.399,1.215-1.17 c0.365-0.896,0.186-1.717-0.195-1.89c-0.025-0.004-0.051-0.009-0.074-0.019l-0.271-0.084c0,0,0.127-0.868,0.129-0.883 c0.543-2.437,0.191-4.615-0.986-6.14c-1.191-1.54-3.191-2.397-5.771-2.483c-0.33,0-0.629,0.025-0.91,0.066 C42.594,17.258,42.809,20.041,42.225,23.022z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 235.2559)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-110.3408" x2="-110.3408" y1="220.3242" y2="193.6579">
+<stop offset="0" style="stop-color:#7A7A7A"/>
+<stop offset="0.7515" style="stop-color:#0A0A0A"/>
+<stop offset="1" style="stop-color:#5F5F5F"/>
+</linearGradient>
+<path d="M13.772,39.593c0.975-0.517,3.113-1.341,6.028-2.45c0.978-0.371,2.132-0.811,2.797-1.08 c0.105-0.496,0.089-1.242-0.04-1.574c-0.013-0.021-0.038-0.061-0.063-0.1c-0.794-0.316-1.46-0.611-1.46-0.611 c-0.52-0.596-0.633-1.645-0.523-2.452c-1.403-0.372-2.633-1.579-3.279-3.272c-0.751-1.959-0.505-3.918,0.519-5.125 c-0.748-3.305-0.69-5.982,0.148-8.016c-0.313-0.035-0.637-0.062-0.971-0.072c-2.318,0-3.351,1.072-4.137,2.082l-0.096,0.117 l-0.148,0.023c-0.536,0.084-1.275,0.35-1.783,1.128c-1.012,1.552-0.121,5.138-0.121,5.138l0.255,1.041L10.546,24.4l-0.119,0.02 c-0.032,0.004-0.075,0.013-0.091,0.02c-0.394,0.165-0.59,0.977-0.244,1.876c0.298,0.778,0.844,1.199,1.208,1.199 c0.061,0,0.117-0.013,0.177-0.04l0.045-0.032l0.375-0.241l0.184,0.407c0.385,0.863,0.818,1.694,1.294,2.472l0.326,0.581 c0.286,0.737,0.322,2.127-0.248,2.968c-0.11,0.146-0.197,0.197-2.623,1.121c-1.463,0.557-3.286,1.248-3.903,1.577 c-2.116,1.122-3.24,2.925-3.345,5.358h7.308C11.71,40.886,12.666,40.18,13.772,39.593z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 235.2559)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-93.4043" x2="-93.4043" y1="225.0117" y2="187.8389">
+<stop offset="0" style="stop-color:#949494"/>
+<stop offset="1" style="stop-color:#393939"/>
+</linearGradient>
+<path d="M45.412,41.359c-1.531-0.797-9.119-3.455-9.266-3.62l0,0c-0.857-0.983-0.824-3.158-0.395-4.103l0,0 c0.031-0.066,0.063-0.13,0.096-0.183c0.105-0.164,0.201-0.326,0.301-0.49h-0.002c0.748-1.223,1.377-2.438,1.891-3.579 c0.93,0.32,2.121-0.543,2.715-2.006c0.615-1.512,0.35-3.084-0.594-3.51c-0.055-0.023-0.109-0.025-0.162-0.043v-0.002 c0.121-0.479,0.178-0.759,0.178-0.759c1.627-7.298-1.914-13.083-10.49-13.368c-3.522,0-5.22,1.602-6.527,3.277 c-2.129,0.328-5.5,2.277-3.122,10.818c-0.091,0.014-0.181,0.028-0.268,0.063c-0.95,0.401-1.248,1.957-0.665,3.479 c0.581,1.521,1.823,2.43,2.774,2.031c0.058-0.025,0.107-0.066,0.161-0.104c0.521,1.179,1.165,2.433,1.938,3.698h-0.003 c0.027,0.043,0.052,0.087,0.08,0.131c0.016,0.026,0.031,0.049,0.045,0.075c0.002,0.003,0.003,0.005,0.003,0.005 c0.059,0.094,0.112,0.188,0.173,0.279c0.488,0.766,0.608,2.969-0.152,4.1c-0.199,0.262-7.677,2.887-9.41,3.805 c-1.987,1.055-5.231,3.479-5.231,8.942h41.164C50.643,44.838,46.941,42.154,45.412,41.359z M20.047,23.793 c0.018-0.019,0.039-0.037,0.059-0.056c0.002,0.015,0.004,0.022,0.01,0.037C20.091,23.777,20.069,23.787,20.047,23.793z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 235.2559)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-93.4043" x2="-93.4043" y1="224.2959" y2="185.0837">
+<stop offset="0" style="stop-color:#7A7A7A"/>
+<stop offset="0.7515" style="stop-color:#0A0A0A"/>
+<stop offset="1" style="stop-color:#5F5F5F"/>
+</linearGradient>
+<path d="M10.055,50.302c0.155-3.579,1.808-6.231,4.92-7.881c0.907-0.481,3.585-1.5,5.737-2.319 c3.566-1.355,3.695-1.431,3.856-1.646c0.84-1.237,0.785-3.278,0.363-4.364l-0.479-0.856c-0.698-1.142-1.337-2.362-1.902-3.631 l-0.269-0.6l-0.554,0.354l-0.065,0.049c-0.087,0.041-0.171,0.059-0.261,0.059c-0.535,0-1.338-0.618-1.775-1.764 c-0.509-1.322-0.219-2.516,0.357-2.759c0.022-0.011,0.088-0.021,0.136-0.026l0.175-0.028l0.521-0.05l-0.374-1.53 c0,0-1.311-5.271,0.178-7.554c0.748-1.146,1.835-1.535,2.623-1.657l0.219-0.036l0.138-0.173c1.157-1.481,2.676-3.063,6.084-3.063 c3.792,0.127,6.733,1.391,8.487,3.653c1.734,2.239,2.25,5.444,1.451,9.026c-0.004,0.021-0.189,1.299-0.189,1.299l0.398,0.125 c0.035,0.012,0.072,0.02,0.109,0.025c0.561,0.252,0.824,1.457,0.287,2.777c-0.455,1.131-1.244,1.721-1.785,1.721 c-0.078,0-0.15-0.014-0.221-0.037l-0.486-0.168l-0.211,0.471c-0.549,1.217-1.174,2.4-1.857,3.516l-0.48,0.856 c-0.443,1.14-0.465,3.437,0.535,4.583c0,0,1.674,0.739,3.256,1.327c2.238,0.832,5.307,1.97,6.174,2.421 c0.797,0.414,4.652,2.686,4.916,7.881L10.055,50.302L10.055,50.302z" fill="url(#SVGID_4_)"/>
+</g>
+</g>
+<rect fill="none" height="60" width="60"/>
+</g>
+<g transform="matrix(1 0 0 1 30 30)">
+<polygon fill="none" points="0,7.489 0,24.514 0,30 30,30 30,24.514 30,5.713 30,0 0,0 "/>
+<path d="M1.777,26.306C0.797,26.306,0,25.502,0,24.514V7.489c0-0.988,0.797-1.792,1.777-1.792h0.125V5.495 c0-1.01,0.771-1.801,1.754-1.801h3.548c0.657,0,1.22,0.354,1.521,0.892c0.326-0.405,0.824-0.665,1.381-0.665h18.116 c0.98,0,1.778,0.804,1.778,1.792v18.801c0,0.988-0.798,1.792-1.778,1.792H1.777z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="2.8789" x2="7.9217" y1="6.0669" y2="6.0669">
+<stop offset="0" style="stop-color:#F0F0F0"/>
+<stop offset="0.4788" style="stop-color:#7C8284"/>
+<stop offset="1" style="stop-color:#E6E6E6"/>
+</linearGradient>
+<path d="M7.957,7.439V5.495c0-0.458-0.339-0.801-0.753-0.801H3.656c-0.414,0-0.754,0.342-0.754,0.801v1.944 H7.957z" fill="url(#SVGID_1__)"/>
+<radialGradient cx="5.4297" cy="19.583" gradientTransform="matrix(1 0 0 1.008 0 -14.4484)" gradientUnits="userSpaceOnUse" id="SVGID_2__" r="1.8354">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="1" style="stop-color:#D9D9D9"/>
+</radialGradient>
+<path d="M7.204,4.694H3.656c-0.414,0-0.754,0.342-0.754,0.801v0.393c0-0.459,0.34-0.801,0.754-0.801h3.548 c0.414,0,0.753,0.342,0.753,0.801V5.495C7.957,5.037,7.618,4.694,7.204,4.694z" fill="url(#SVGID_2__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="4.8916" y2="25.3392">
+<stop offset="0" style="stop-color:#D0D4D5"/>
+<stop offset="0.1212" style="stop-color:#D0D4D5"/>
+<stop offset="0.4182" style="stop-color:#B0B6B8"/>
+<stop offset="0.4182" style="stop-color:#9FA6A8"/>
+<stop offset="0.6606" style="stop-color:#7D8588"/>
+<stop offset="0.9697" style="stop-color:#ADB3B5"/>
+<stop offset="0.9697" style="stop-color:#595C5E"/>
+<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="1" style="stop-color:#595C5E"/>
+</linearGradient>
+<path d="M28.222,4.921H10.105c-0.428,0-0.777,0.355-0.777,0.792v0.984H1.777C1.35,6.697,1,7.053,1,7.489 v17.024c0,0.436,0.35,0.792,0.777,0.792h26.444c0.427,0,0.778-0.356,0.778-0.792V5.713C29,5.276,28.648,4.921,28.222,4.921z" fill="url(#SVGID_3__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="24.7998" x2="24.7998" y1="6.1997" y2="9.553">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="1" style="stop-color:#E6E6E6"/>
+</linearGradient>
+<rect fill="url(#SVGID_4__)" height="3.366" width="5.244" x="22.179" y="6.185"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="24.8008" x2="24.8008" y1="9.249" y2="6.4746">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#3B3B3B"/>
+</linearGradient>
+<rect fill="url(#SVGID_5_)" height="2.801" width="4.583" x="22.509" y="6.468"/>
+<path d="M23.174,15.992c-0.002,4.312-3.498,8.564-7.811,8.563c-4.311-0.002-7.806-4.257-7.806-8.568 c0.003-4.312,3.499-7.806,7.812-7.804S23.174,11.681,23.174,15.992z" fill="#231F20" fill-opacity="0.5" stroke-opacity="0.5"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15.3652" x2="15.3652" y1="7.8438" y2="23.4871">
+<stop offset="0" style="stop-color:#CFCFCF"/>
+<stop offset="0.1091" style="stop-color:#CFCFCF"/>
+<stop offset="0.6848" style="stop-color:#121212"/>
+<stop offset="1" style="stop-color:#A6A6A6"/>
+</linearGradient>
+<circle cx="15.366" cy="15.674" fill="url(#SVGID_6_)" r="7.778"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="15.3652" x2="15.3652" y1="8.1816" y2="22.9943">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="1" style="stop-color:#606769"/>
+</linearGradient>
+<circle cx="15.366" cy="15.675" fill="url(#SVGID_7_)" r="7.388"/>
+<linearGradient gradientTransform="matrix(1 3.000000e-004 -3.000000e-004 1 -0.7997 -0.8701)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="11.9092" x2="20.4338" y1="12.2778" y2="20.8025">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="0.503" style="stop-color:#343434"/>
+<stop offset="0.7515" style="stop-color:#9E9E9E"/>
+<stop offset="1" style="stop-color:#CFCFCF"/>
+</linearGradient>
+<circle cx="15.366" cy="15.674" fill="url(#SVGID_8_)" r="6.028"/>
+<radialGradient cx="13.751" cy="1.9536" gradientTransform="matrix(0.991 3.000000e-004 -3.000000e-004 0.991 2.3474 14.2158)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="6.5314">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="0.5917" style="stop-color:#000000"/>
+<stop offset="0.627" style="stop-color:#050505"/>
+<stop offset="0.7652" style="stop-color:#121212"/>
+<stop offset="0.8876" style="stop-color:#171717"/>
+<stop offset="1" style="stop-color:#171717"/>
+</radialGradient>
+<circle cx="15.365" cy="15.674" fill="url(#SVGID_9_)" r="5.639"/>
+<radialGradient cx="8.0361" cy="-26.853" gradientTransform="matrix(0.9785 3.000000e-004 -3.000000e-004 0.9786 6.3194 35.8131)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="11.413">
+<stop offset="0" style="stop-color:#A700F5"/>
+<stop offset="0.3091" style="stop-color:#A700F5"/>
+<stop offset="0.4364" style="stop-color:#5E008A"/>
+<stop offset="0.8061" style="stop-color:#0E1402"/>
+<stop offset="1" style="stop-color:#0E1402"/>
+</radialGradient>
+<path d="M19.449,15.674c-0.001,2.256-1.83,4.084-4.086,4.084c-2.252-0.002-4.081-1.831-4.081-4.086 c0.002-2.256,1.831-4.082,4.083-4.082C17.623,11.592,19.449,13.42,19.449,15.674z" fill="url(#SVGID_10_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="5.5742" x2="5.5742" y1="11.8188" y2="9.3852">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#3B3B3B"/>
+</linearGradient>
+<circle cx="5.575" cy="10.556" fill="url(#SVGID_11_)" r="1.167"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="15.3457" x2="15.3457" y1="10.6523" y2="15.6356">
+<stop offset="0" style="stop-color:#F8FBFF"/>
+<stop offset="1" style="stop-color:#808080"/>
+</linearGradient>
+<path d="M15.346,15.611c1.81,0,3.515-0.274,5.02-0.758c-0.428-2.386-2.51-4.201-5.02-4.201 s-4.592,1.814-5.02,4.201C11.83,15.337,13.536,15.611,15.346,15.611z" fill="url(#SVGID_12_)" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="15" x2="15" y1="4.8535" y2="25.2888">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="0.3212" style="stop-color:#E6E6E6"/>
+<stop offset="1" style="stop-color:#666666"/>
+</linearGradient>
+<path d="M28.222,4.921H10.105c-0.428,0-0.777,0.355-0.777,0.792v0.984H1.777C1.35,6.697,1,7.053,1,7.489 v17.024c0,0.436,0.35,0.792,0.777,0.792c0,0-0.389-0.214-0.389-0.792V7.489c0-0.222,0.175-0.401,0.389-0.401h7.551h0.389V6.697 V5.713c0-0.221,0.174-0.399,0.389-0.399h18.116c0.215,0,0.39,0.179,0.39,0.399v18.801c0,0.626-0.39,0.792-0.39,0.792 c0.427,0,0.778-0.356,0.778-0.792V5.713C29,5.276,28.648,4.921,28.222,4.921z" fill="url(#SVGID_13_)"/>
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_album_art.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_album_art.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,50 +1,51 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
-<path d="M58,53c0,2.762-2.238,5-5,5H7c-2.762,0-5-2.238-5-5V7c0-2.762,2.238-5,5-5h46c2.762,0,5,2.238,5,5V53z" fill="#E6E6E6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.5933" x2="27.5933" y1="10.3408" y2="49.2278">
+<linearGradient gradientTransform="matrix(1 0 0 -1 -208.8501 -238.8496)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="254.3201" x2="254.3201" y1="-249.2754" y2="-287.1613">
+<stop offset="0" style="stop-color:#949494"/>
+<stop offset="1" style="stop-color:#393939"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1_)" points="43.971,45.572 46.969,48.167 46.969,47.167 43.971,44.572 "/>
+<g>
+<rect fill="#E6E6E6" height="60" width="60" x="0"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -208.8501 -238.8496)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="236.2722" x2="236.2721" y1="-247.7856" y2="-289.4495">
<stop offset="0" style="stop-color:#7A7A7A"/>
<stop offset="0.7515" style="stop-color:#0A0A0A"/>
<stop offset="1" style="stop-color:#5F5F5F"/>
</linearGradient>
-<path d="M46.969,12.834v-2.209H8.219v38.75h38.75v-2.209l-2.998-2.594V15.43L46.969,12.834z M28.979,38.395 c0.012,2.291-2.067,4.434-5.07,5.244c-3.551,0.957-7.013-0.387-7.734-3.004c-0.719-2.615,1.577-5.516,5.13-6.473 c2.252-0.609,4.469-0.289,5.973,0.695l-0.015-13.266l9.818-4.372l1.709,4.159l-9.811,4.011 C28.996,29.887,28.969,36.104,28.979,38.395z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="28.98" x2="28.98" y1="10.4248" y2="48.3106">
+<path d="M48.18,11.608V9.241H6.663v41.518H48.18v-2.365l-3.211-2.78V14.39L48.18,11.608z M28.906,38.994 c0.012,2.455-2.216,4.751-5.433,5.619c-3.804,1.025-7.515-0.415-8.287-3.219c-0.771-2.802,1.688-5.908,5.496-6.936 c2.413-0.65,4.788-0.309,6.399,0.745L27.068,20.99l10.519-4.684l1.831,4.456l-10.51,4.297 C28.925,29.88,28.895,36.539,28.906,38.994z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -208.8501 -238.8496)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="237.7576" x2="237.7576" y1="-247.876" y2="-288.4691">
<stop offset="0" style="stop-color:#949494"/>
<stop offset="1" style="stop-color:#393939"/>
</linearGradient>
-<path d="M28.977,37.497c0.001-2.074,0.009-5.018,0.008-7.831C28.983,32.657,28.975,35.659,28.977,37.497z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="33.8838" x2="33.8838" y1="10.4248" y2="48.3106">
-<stop offset="0" style="stop-color:#949494"/>
-<stop offset="1" style="stop-color:#393939"/>
-</linearGradient>
-<path d="M28.981,26.389l9.808-4.01l-0.352-0.856l-9.459,3.867C28.979,25.714,28.98,26.049,28.981,26.389z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="27.5933" x2="27.5933" y1="10.4248" y2="48.3106">
+<path d="M28.904,38.032c0-2.223,0.009-5.377,0.009-8.39C28.91,32.846,28.902,36.063,28.904,38.032z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -208.8501 -238.8496)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="243.0115" x2="243.0115" y1="-247.8755" y2="-288.468">
<stop offset="0" style="stop-color:#949494"/>
<stop offset="1" style="stop-color:#393939"/>
</linearGradient>
-<rect fill="url(#SVGID_4_)" height="1" width="38.75" x="8.219" y="10.625"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="27.269" x2="27.269" y1="10.4248" y2="48.3106">
+<path d="M28.908,26.131l10.508-4.297l-0.377-0.917l-10.133,4.144C28.906,25.408,28.908,25.767,28.908,26.131 z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -208.8501 -238.8496)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="236.2722" x2="236.2721" y1="-247.876" y2="-288.4626">
<stop offset="0" style="stop-color:#949494"/>
<stop offset="1" style="stop-color:#393939"/>
</linearGradient>
-<rect fill="url(#SVGID_5_)" height="12.266" width="0.001" x="27.269" y="22.592"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="45.4697" x2="45.4697" y1="10.4351" y2="48.3106">
+<rect fill="url(#SVGID_5_)" height="1.071" width="41.518" x="6.663" y="9.241"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -208.8501 -238.8496)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="235.9246" x2="235.9246" y1="-247.876" y2="-288.4659">
<stop offset="0" style="stop-color:#949494"/>
<stop offset="1" style="stop-color:#393939"/>
</linearGradient>
-<polygon fill="url(#SVGID_6_)" points="43.971,45.573 46.969,48.167 46.969,47.167 43.971,44.573 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="22.5103" x2="22.5103" y1="10.4204" y2="48.3119">
+<rect fill="url(#SVGID_6_)" height="13.142" width="0" x="27.074" y="22.063"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -208.8501 -238.8496)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="230.8259" x2="230.8259" y1="-247.8784" y2="-288.4679">
<stop offset="0" style="stop-color:#949494"/>
<stop offset="1" style="stop-color:#393939"/>
</linearGradient>
-<path d="M16.174,41.635c0.722,2.617,4.184,3.961,7.734,3.004c3.003-0.811,5.082-2.953,5.07-5.244 c-0.001-0.273-0.002-0.605-0.002-0.982c0,2.285-2.073,4.418-5.068,5.227c-3.551,0.957-7.013-0.387-7.734-3.004 c-0.044-0.16-0.076-0.322-0.098-0.484C16.011,40.645,16.04,41.145,16.174,41.635z" fill="url(#SVGID_7_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="49.6104" x2="49.6104" y1="15.2886" y2="44.8059">
+<path d="M15.186,42.466c0.773,2.804,4.484,4.244,8.287,3.219c3.216-0.869,5.445-3.164,5.433-5.619 c-0.002-0.292-0.002-0.647-0.002-1.051c0,2.446-2.222,4.733-5.43,5.601c-3.805,1.025-7.515-0.416-8.287-3.219 c-0.048-0.172-0.081-0.346-0.104-0.519C15.01,41.407,15.043,41.94,15.186,42.466z" fill="url(#SVGID_7_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -208.8501 -238.8496)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="259.8601" x2="259.8601" y1="-253.0869" y2="-284.7125">
<stop offset="0" style="stop-color:#7A7A7A"/>
<stop offset="0.7515" style="stop-color:#0A0A0A"/>
<stop offset="1" style="stop-color:#5F5F5F"/>
</linearGradient>
-<path d="M45.439,15.026v29.949c5.029-3.131,8.373-8.705,8.342-15.064 C53.75,23.616,50.416,18.125,45.439,15.026z" fill="url(#SVGID_8_)"/>
-<rect fill="none" height="60" width="60"/>
+<path d="M46.542,13.956v32.088c5.388-3.355,8.972-9.326,8.938-16.139 C55.446,23.16,51.874,17.277,46.542,13.956z" fill="url(#SVGID_8_)"/>
+</g>
</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_als.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_als.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="39.5586" x2="39.5586" y1="1" y2="45.1092">
<stop offset="0" style="stop-color:#D1D7D9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_application.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_application.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_download.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_download.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="59.999" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2163.8232" x2="-2163.8232" y1="4093.1855" y2="4081.4014">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_games.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_games.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="59.999" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2163.8232" x2="-2163.8232" y1="4093.1855" y2="4081.4014">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_office.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_office.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="59.999" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2163.8232" x2="-2163.8232" y1="4093.1855" y2="4081.4014">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_user.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_user.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="59.999" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2163.8232" x2="-2163.8232" y1="4093.1855" y2="4081.4014">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_avatar.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_avatar.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<path d="M46.69,42.35c-1.665-0.866-9.918-3.756-10.07-3.936l-0.002,0.002c-0.934-1.068-0.896-3.433-0.43-4.46,0.001-0.001,0.002-0.001,0.002-0.002,0.032-0.071,0.065-0.139,0.104-0.197,0.113-0.177,0.219-0.354,0.326-0.533,0.813-1.329,1.494-2.651,2.054-3.892,1.009,0.349,2.307-0.59,2.95-2.18,0.667-1.645,0.379-3.354-0.645-3.815-0.058-0.026-0.119-0.03-0.178-0.048v-0.002c0.133-0.521,0.191-0.826,0.191-0.826,1.77-7.934-2.078-14.22-11.4-14.53-3.832,0-5.617,0.578-7.039,2.398-2.313,0.357-6.039,3.642-3.453,12.93-0.098,0.016-0.195,0.031-0.289,0.071-1.032,0.436-1.355,2.128-0.724,3.782,0.633,1.653,1.983,2.643,3.017,2.208,0.063-0.027,0.117-0.072,0.176-0.11,0.568,1.279,1.266,2.646,2.104,4.02h-0.01c0.022,0.037,0.046,0.073,0.067,0.11,0.023,0.038,0.045,0.076,0.068,0.114,0.002,0.003,0.005,0.005,0.007,0.008,0.061,0.101,0.12,0.201,0.185,0.301,0.532,0.833,0.663,3.229-0.166,4.457-0.208,0.283-8.346,3.135-10.23,4.136-2.161,1.147-5.688,3.782-5.688,9.723h44.76c-0.01-5.95-4.04-8.86-5.7-9.73z" fill="url(#SVGID_1)"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_avatar_mycard.svg Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<rect fill="none" height="60" width="60"/>
+<path d="M46.69,42.35c-1.665-0.866-9.918-3.756-10.07-3.936l-0.002,0.002c-0.934-1.068-0.896-3.433-0.43-4.46,0.001-0.001,0.002-0.001,0.002-0.002,0.032-0.071,0.065-0.139,0.104-0.197,0.113-0.177,0.219-0.354,0.326-0.533,0.813-1.329,1.494-2.651,2.054-3.892,1.009,0.349,2.307-0.59,2.95-2.18,0.667-1.645,0.379-3.354-0.645-3.815-0.058-0.026-0.119-0.03-0.178-0.048v-0.002c0.133-0.521,0.191-0.826,0.191-0.826,1.77-7.934-2.078-14.22-11.4-14.53-3.832,0-5.617,0.578-7.039,2.398-2.313,0.357-6.039,3.642-3.453,12.93-0.098,0.016-0.195,0.031-0.289,0.071-1.032,0.436-1.355,2.128-0.724,3.782,0.633,1.653,1.983,2.643,3.017,2.208,0.063-0.027,0.117-0.072,0.176-0.11,0.568,1.279,1.266,2.646,2.104,4.02h-0.01c0.022,0.037,0.046,0.073,0.067,0.11,0.023,0.038,0.045,0.076,0.068,0.114,0.002,0.003,0.005,0.005,0.007,0.008,0.061,0.101,0.12,0.201,0.185,0.301,0.532,0.833,0.663,3.229-0.166,4.457-0.208,0.283-8.346,3.135-10.23,4.136-2.161,1.147-5.688,3.782-5.688,9.723h44.76c-0.01-5.95-4.04-8.86-5.7-9.73z" fill="url(#SVGID_1)"/>
+<path d="M7.659,51.07c-0.022,0.323-0.037,0.655-0.037,1h44.76c0-0.345-0.017-0.676-0.042-1h-44.68z" fill="#FFFFFF" fill-opacity="0.15"/>
+<path d="M22.55,11.33c1.422-1.82,3.207-2.398,7.039-2.398,7.565,0.252,11.52,4.44,11.8,10.25,0.15-6.32-3.81-10.99-11.8-11.25-3.832,0-5.617,0.578-7.039,2.398-1.81,0.279-4.472,2.367-4.311,7.704,0.18-4.6,2.62-6.44,4.31-6.7z" fill="#FFFFFF" fill-opacity="0.5"/>
+<path d="M36.62,38.42c-0.441-0.505-0.66-1.3-0.725-2.106-0.086,1.09,0.098,2.389,0.725,3.106l0.002-0.002c0.154,0.18,8.407,3.069,10.07,3.936,1.566,0.816,5.225,3.453,5.645,8.723h0.042c0-5.94-4.024-8.856-5.687-9.723-1.665-0.866-9.918-3.756-10.07-3.936z" fill="#FFFFFF" fill-opacity="0.5"/>
+<path d="M13.31,43.35c1.885-1.001,10.02-3.853,10.23-4.136,0.508-0.752,0.652-1.938,0.568-2.938-0.053,0.717-0.225,1.429-0.568,1.938-0.208,0.283-8.346,3.135-10.23,4.136-2.161,1.147-5.688,3.782-5.688,9.723h0.037c0.37-5.24,3.621-7.64,5.651-8.72z" fill="#FFFFFF" fill-opacity="0.5"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="8.6" y2="52.35">
+<stop offset="0" stop-color="#8E8E8E"/>
+<stop offset="1" stop-color="#444444"/>
+</linearGradient>
+</defs>
+</g>
+<g transform="matrix(1 0 0 1 30 30)">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="4.4043" y2="25.2544">
+<stop offset="0" style="stop-color:#E3E3E3"/>
+<stop offset="1" style="stop-color:#9B9B9B"/>
+</linearGradient>
+<path d="M2.436,25.41C1.644,25.41,1,24.767,1,23.974V6.025C1,5.233,1.644,4.59,2.436,4.59h25.129 C28.356,4.59,29,5.233,29,6.025v17.949c0,0.793-0.645,1.436-1.436,1.436H2.436z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="4.77" y2="24.9003">
+<stop offset="0" style="stop-color:#F5F5F5"/>
+<stop offset="0.7818" style="stop-color:#CCCCCC"/>
+<stop offset="1" style="stop-color:#D1D1D1"/>
+</linearGradient>
+<path d="M28.641,23.974c0,0.594-0.482,1.076-1.076,1.076H2.436c-0.594,0-1.077-0.482-1.077-1.076V6.025 c0-0.594,0.483-1.076,1.077-1.076h25.129c0.594,0,1.076,0.482,1.076,1.076V23.974z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="5.27" y2="24.6558">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#DEDEDE"/>
+</linearGradient>
+<path d="M27.565,5.667c0.197,0,0.358,0.161,0.358,0.358v17.949c0,0.197-0.161,0.359-0.358,0.359H2.436 c-0.198,0-0.359-0.162-0.359-0.359V6.025c0-0.197,0.161-0.358,0.359-0.358H27.565 M27.565,5.308H2.436 c-0.396,0-0.718,0.321-0.718,0.718v17.949c0,0.396,0.322,0.719,0.718,0.719h25.129c0.395,0,0.717-0.322,0.717-0.719V6.025 C28.282,5.629,27.959,5.308,27.565,5.308L27.565,5.308z" fill="url(#SVGID_3_)"/>
+<rect fill="#020202" fill-opacity="0.2" height="11.847" stroke-opacity="0.2" width="10.769" x="3.872" y="9.52"/>
+<rect fill="#FFFFFF" height="11.845" width="10.769" x="3.872" y="8.803"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="9.2568" x2="9.2568" y1="20.3306" y2="9.2026">
+<stop offset="0" style="stop-color:#3FA8F4"/>
+<stop offset="1" style="stop-color:#8DC8E1"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" height="11.128" width="10.052" x="4.231" y="9.16"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="4.9492" x2="12.8466" y1="14.8813" y2="14.8813">
+<stop offset="0" style="stop-color:#146BAF"/>
+<stop offset="1" style="stop-color:#013B77"/>
+</linearGradient>
+<path d="M12.469,17.257c-0.234-0.121-1.141-0.449-1.627-0.633l-0.021-0.008h0 c-0.005-0.002-0.009-0.004-0.014-0.006l-0.275-0.109c-0.194-0.221-0.172-0.729-0.064-0.898c0.022-0.033,0.042-0.066,0.063-0.102 h-0.004c0.157-0.256,0.291-0.51,0.398-0.75c0.194,0.068,0.444-0.113,0.568-0.418c0.129-0.318,0.073-0.646-0.125-0.736 c-0.011-0.004-0.022-0.005-0.034-0.008c0-0.002,0-0.002,0-0.002c0.025-0.1,0.037-0.158,0.037-0.158 c0.341-1.527-0.4-2.738-2.195-2.798c-0.737,0-1.091,0.336-1.365,0.687c-0.446,0.068-1.151,0.477-0.653,2.264 c-0.019,0.003-0.038,0.006-0.056,0.014c-0.2,0.084-0.262,0.41-0.14,0.728c0.122,0.318,0.382,0.51,0.581,0.426 c0.011-0.006,0.022-0.016,0.033-0.021c0.109,0.246,0.245,0.508,0.406,0.773H7.982c0.007,0.012,0.015,0.025,0.022,0.037 c0.001,0.002,0.002,0.004,0.004,0.006l0,0.002c0.013,0.018,0.024,0.037,0.036,0.057c0.104,0.162,0.125,0.629-0.041,0.861 l-0.286,0.125c-0.48,0.188-1.407,0.525-1.675,0.668c-0.417,0.223-1.095,0.729-1.095,1.873h8.615 C13.564,17.986,12.789,17.425,12.469,17.257z M11.31,13.584c-0.011-0.003-0.021-0.006-0.031-0.006 c-0.015-0.003-0.027-0.006-0.042-0.009c-0.002-0.001-0.003-0.001-0.005-0.001C11.256,13.573,11.283,13.578,11.31,13.584z M7.161,13.581c0.003-0.003,0.009-0.008,0.012-0.011c0,0.002,0.001,0.004,0.002,0.008C7.17,13.578,7.166,13.58,7.161,13.581z" fill="url(#SVGID_5_)"/>
+<rect fill="#020202" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="9.333" x="16.795" y="17.265"/>
+<rect fill="#020202" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="9.333" x="16.795" y="12.266"/>
+<rect fill="#020202" fill-opacity="0.2" height="0.541" stroke-opacity="0.2" width="9.333" x="16.795" y="11.725"/>
+<rect fill="#020202" fill-opacity="0.2" height="0.541" stroke-opacity="0.2" width="9.333" x="16.795" y="16.724"/>
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bell.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bell.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -785.9789 1292.5154)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-326.7236" x2="-304.7813" y1="-1454.5332" y2="-1454.5332">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2" y2="58.0739">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_active_connection.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_active_connection.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2" y2="58.0739">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_multiple_connection.svg Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
-<g>
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2" y2="58.0739">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.2545" style="stop-color:#4F88BD"/>
-<stop offset="0.7333" style="stop-color:#0055A3"/>
-<stop offset="1" style="stop-color:#64AEFB"/>
-</linearGradient>
-<path d="M30,2C18.142,2,9.945,7.973,9.945,30.001C9.945,52.03,18.145,58,30,58 c11.857,0,20.054-5.97,20.054-27.999C50.054,7.973,41.857,2,30,2z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="3.2363" y2="56.7637">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="0.1576" style="stop-color:#36B5FF"/>
-<stop offset="0.8242" style="stop-color:#1B66D8"/>
-<stop offset="1" style="stop-color:#2183E0"/>
-</linearGradient>
-<path d="M30,56.764c-9.305,0-18.818-3.179-18.818-26.763C11.182,6.415,20.695,3.236,30,3.236 c9.306,0,18.817,3.179,18.817,26.765C48.817,53.585,39.306,56.764,30,56.764L30,56.764z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="17.6924" x2="42.3066" y1="30.2065" y2="30.2065">
-<stop offset="0" style="stop-color:#0B81FA"/>
-<stop offset="1" style="stop-color:#47DAFA"/>
-</linearGradient>
-<path d="M42.307,20.702L28.242,6.305v18.972l-7.728-7.912l-2.822,2.881l9.712,9.961l-9.712,9.96l2.815,2.879 l7.734-7.91v18.974l14.064-14.396l-9.287-9.506L42.307,20.702z M36.689,20.734l-4.49,4.59l-0.006-9.188L36.689,20.734z M36.689,39.686l-4.496,4.584l0.006-9.185L36.689,39.686z" fill="url(#SVGID_3_)"/>
-<path d="M29.479,32.103l-8.971,9.175l-1.087-1.112l9.71-9.959l-9.71-9.96l1.091-1.113l8.967,9.179V9.339l11.1,11.363 l-9.287,9.504l9.287,9.506l-11.1,11.362V32.103z M30.955,47.297l7.464-7.61l-7.454-7.636L30.955,47.297z M30.965,28.353l7.454-7.618 l-7.464-7.632L30.965,28.353z" fill="#FFFFFF"/>
-<rect fill="none" height="60" width="60"/>
-</g>
-<g transform="matrix(1 0 0 1 30 30)">
-<rect fill="none" height="30" width="30" x="0.002"/>
-<path d="M29.587,12.96l-9.934-9.744C19.32,2.889,18.979,2.82,18.75,2.82c-0.561,0-1.156,0.443-1.156,1.266 l-0.002,3.91l-4.872-4.78c-0.333-0.327-0.675-0.396-0.903-0.396c-0.561,0-1.156,0.443-1.156,1.266l-0.002,4.1h-3.16 c-0.824,0-1.496,0.677-1.496,1.508v3.826c0,0.7,0.48,1.285,1.125,1.453H1.256c-0.549,0-0.986,0.271-1.172,0.724 c-0.185,0.455-0.061,0.956,0.333,1.342l9.934,9.744c0.334,0.327,0.676,0.396,0.904,0.396c0.56,0,1.155-0.443,1.155-1.266l0.002-3.91 l4.872,4.78c0.334,0.327,0.676,0.396,0.904,0.396c0.56,0,1.155-0.443,1.155-1.266l0.002-4.1h3.16c0.824,0,1.496-0.677,1.496-1.508 v-3.826c0-0.7-0.48-1.285-1.125-1.453h5.871c0.549,0,0.986-0.271,1.172-0.724C30.104,13.847,29.98,13.346,29.587,12.96z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="18.002" x2="18.002" y1="3.8481" y2="14.1812">
-<stop offset="0" style="stop-color:#CDEDBD"/>
-<stop offset="0.4909" style="stop-color:#CDEDBD"/>
-<stop offset="0.9879" style="stop-color:#139900"/>
-<stop offset="1" style="stop-color:#139900"/>
-</linearGradient>
-<path d="M28.887,13.674L18.953,3.93c-0.197-0.193-0.359-0.123-0.359,0.156l-0.002,4.592 c0,0.279-0.223,0.508-0.494,0.508h-0.721L12.02,3.93c-0.197-0.193-0.359-0.123-0.359,0.156l-0.002,4.592 c0,0.279-0.223,0.508-0.494,0.508h-0.6H7.498c-0.273,0-0.496,0.229-0.496,0.508v3.826c0,0.277,0.224,0.506,0.496,0.506h3.066h11.031 h7.152C29.021,14.025,29.084,13.867,28.887,13.674z" fill="url(#SVGID_1__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="17.3994" x2="17.3994" y1="5.978" y2="13.133">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.703" style="stop-color:#439020"/>
-<stop offset="0.9879" style="stop-color:#0D4D07"/>
-<stop offset="1" style="stop-color:#0D4D07"/>
-</linearGradient>
-<path d="M8.002,13.025v-2.84h3.162c0.824,0,1.494-0.676,1.494-1.508l0.002-2.719l4.309,4.227h1.129 c0.824,0,1.494-0.676,1.494-1.508l0.002-2.719l7.203,7.066H8.002z" fill="url(#SVGID_2__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="12.002" x2="12.002" y1="16.0352" y2="26.3801">
-<stop offset="0" style="stop-color:#CDEDBD"/>
-<stop offset="0.9879" style="stop-color:#139900"/>
-<stop offset="1" style="stop-color:#139900"/>
-</linearGradient>
-<path d="M1.117,16.324l9.934,9.744c0.197,0.193,0.359,0.125,0.359-0.156l0.002-4.592 c0-0.279,0.223-0.508,0.494-0.508h0.721l5.357,5.256c0.197,0.193,0.359,0.125,0.359-0.156l0.002-4.592 c0-0.279,0.223-0.508,0.494-0.508h0.6h3.066c0.273,0,0.496-0.229,0.496-0.508v-3.826c0-0.277-0.224-0.506-0.496-0.506h-3.066H8.408 H1.256C0.982,15.973,0.92,16.131,1.117,16.324z" fill="url(#SVGID_3__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="12.6045" x2="12.6045" y1="16.9727" y2="24.1645">
-<stop offset="0" style="stop-color:#82C94C"/>
-<stop offset="0.2545" style="stop-color:#439020"/>
-<stop offset="0.5091" style="stop-color:#0D4D07"/>
-<stop offset="1" style="stop-color:#0D4D07"/>
-</linearGradient>
-<path d="M22.002,16.973v2.84H18.84c-0.824,0-1.494,0.678-1.494,1.508l-0.002,2.719l-4.309-4.227h-1.129 c-0.824,0-1.494,0.678-1.494,1.508l-0.002,2.719l-7.203-7.066H22.002z" fill="url(#SVGID_4_)"/>
-<rect fill="none" height="30" width="30" x="0.002"/>
-</g>
-</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_off.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_off.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2" y2="58.0739">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_browser.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_browser.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.998" x2="29.998" y1="57.6797" y2="2.0783">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calculator.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calculator.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<rect fill="none" height="60" width="60"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60" x="0"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -271.0195 -232.4805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="301.0195" x2="301.0195" y1="-240.6152" y2="-287.0708">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_alarm.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_alarm.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60" x="0"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -271.0195 -232.4805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="301.0195" x2="301.0195" y1="-240.6152" y2="-287.0708">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_dynamic.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_dynamic.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" fill-rule="evenodd" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="8.1353" y2="54.5904">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_assistant.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_assistant.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
<stop offset="0" style="stop-color:#A7E722"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_car.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_car.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
<stop offset="0" style="stop-color:#A7E722"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_duration.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_duration.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
<stop offset="0" style="stop-color:#A7E722"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_home.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_home.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
<stop offset="0" style="stop-color:#A7E722"/>
@@ -31,43 +31,42 @@
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
-<polygon fill="none" points="0,11.605 0,11.61 0,22.205 0,22.21 0,30 30,30 30,22.205 30,11.61 30,0 0,0 "/>
-<path d="M21.5,30c-1.331,0-2.65-0.315-3.834-0.915H4.541v-2.15c-0.734-0.043-1.318-0.653-1.318-1.398v-0.818H2.514 C1.128,24.718,0,23.591,0,22.205V11.61c0-1.387,1.128-2.515,2.514-2.515h0.703V8.334h0.006V6.753c0-0.744,0.584-1.354,1.318-1.396 V0.915h20.918v4.441c0.734,0.043,1.318,0.652,1.318,1.396v1.581l0.006,0.762h0.703c1.386,0,2.514,1.128,2.514,2.515v10.595 c0,0.297-0.052,0.588-0.154,0.864C29.092,27.092,25.598,30,21.5,30L21.5,30z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15.0005" x2="15.0005" y1="6.3018" y2="10.8418">
+<path d="M21.5,30c-1.331,0-2.65-0.315-3.834-0.915H4.541v-2.15c-0.734-0.043-1.318-0.653-1.318-1.398v-0.818H2.514 C1.127,24.718,0,23.591,0,22.205V11.61c0-1.387,1.127-2.515,2.514-2.515h0.703V8.334h0.006V6.753c0-0.744,0.584-1.354,1.318-1.396 V0.915h20.918v4.441c0.734,0.043,1.318,0.652,1.318,1.396v1.581l0.006,0.762h0.703c1.386,0,2.514,1.128,2.514,2.515v10.595 c0,0.297-0.052,0.588-0.154,0.864C29.092,27.092,25.598,30,21.5,30L21.5,30z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="14.9995" x2="14.9995" y1="6.3018" y2="10.8418">
<stop offset="0" style="stop-color:#D1D7D9"/>
<stop offset="0.3273" style="stop-color:#BDC2C4"/>
<stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
-<path d="M25.778,10.497c0,0.22-0.179,0.397-0.399,0.397H4.622c-0.22,0-0.399-0.178-0.399-0.397V6.753 c0-0.221,0.179-0.398,0.399-0.398h20.756c0.221,0,0.399,0.178,0.399,0.398V10.497z" fill="url(#SVGID_1__)"/>
+<path d="M25.777,10.497c0,0.22-0.179,0.397-0.399,0.397H4.621c-0.22,0-0.398-0.178-0.398-0.397V6.753 c0-0.221,0.179-0.398,0.398-0.398h20.757c0.221,0,0.399,0.178,0.399,0.398V10.497z" fill="url(#SVGID_1__)"/>
<rect fill="#020202" fill-opacity="0.3" height="0.379" stroke-opacity="0.3" width="21.567" x="4.217" y="9.712"/>
<rect fill="#020202" fill-opacity="0.15" height="0.378" stroke-opacity="0.15" width="21.567" x="4.217" y="9.334"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="1.915" y2="10.6297">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.9995" x2="14.9995" y1="1.915" y2="10.6297">
<stop offset="0" style="stop-color:#D9D9D9"/>
<stop offset="0.5382" style="stop-color:#B3B3B3"/>
<stop offset="1" style="stop-color:#B3B3B3"/>
</linearGradient>
<rect fill="url(#SVGID_2__)" height="8.323" width="18.918" x="5.541" y="1.915"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="1.835" y2="9.598">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="14.9995" x2="14.9995" y1="1.835" y2="9.598">
<stop offset="0" style="stop-color:#EDEDED"/>
<stop offset="1" style="stop-color:#BDBDBD"/>
</linearGradient>
-<polygon fill="url(#SVGID_3__)" points="24.459,5.21 24.459,10.238 5.541,10.238 5.541,1.915 12.667,1.915 16.569,2.111 23.704,4.152 24.272,4.748 "/>
-<rect fill="#020202" fill-opacity="0.5" height="0.377" stroke-opacity="0.5" width="13.621" x="8.19" y="7.212"/>
-<rect fill="#020202" fill-opacity="0.2" height="0.379" stroke-opacity="0.2" width="13.621" x="8.19" y="6.833"/>
+<polygon fill="url(#SVGID_3__)" points="24.459,5.21 24.459,10.238 5.541,10.238 5.541,1.915 12.666,1.915 16.568,2.111 23.703,4.152 24.271,4.748 "/>
+<rect fill="#020202" fill-opacity="0.5" height="0.377" stroke-opacity="0.5" width="13.621" x="8.189" y="7.212"/>
+<rect fill="#020202" fill-opacity="0.2" height="0.379" stroke-opacity="0.2" width="13.621" x="8.189" y="6.833"/>
<rect fill="#020202" fill-opacity="0.2" height="0.379" stroke-opacity="0.2" width="18.918" x="5.541" y="9.712"/>
<rect fill="#020202" fill-opacity="0.1" height="0.378" stroke-opacity="0.1" width="18.918" x="5.541" y="9.334"/>
<rect fill="#020202" fill-opacity="0.03" height="0.379" stroke-opacity="0.03" width="18.918" x="5.541" y="8.955"/>
-<rect fill="#020202" fill-opacity="0.5" height="0.377" stroke-opacity="0.5" width="13.621" x="8.19" y="4.941"/>
-<rect fill="#020202" fill-opacity="0.2" height="0.379" stroke-opacity="0.2" width="13.621" x="8.19" y="4.563"/>
-<path d="M12.572,1.916c0,0,6.867,1.039,9.421,4.539 c0,0,1.93-2.648,2.467-1.209C24.188,3.855,21.738,1.864,12.572,1.916z" fill="#050505" fill-opacity="0.05" fill-rule="evenodd" stroke-opacity="0.05"/>
-<path d="M12.572,1.916c0,0,6.867,0.282,9.421,3.781 c0,0,1.93-2.27,2.467-0.451C24.188,3.855,21.738,1.864,12.572,1.916z" fill="#050505" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="18.876" x2="18.1629" y1="2.2437" y2="4.8927">
+<rect fill="#020202" fill-opacity="0.5" height="0.377" stroke-opacity="0.5" width="13.621" x="8.189" y="4.941"/>
+<rect fill="#020202" fill-opacity="0.2" height="0.379" stroke-opacity="0.2" width="13.621" x="8.189" y="4.563"/>
+<path d="M12.571,1.916c0,0,6.867,1.039,9.421,4.539 c0,0,1.93-2.648,2.467-1.209C24.188,3.855,21.737,1.864,12.571,1.916z" fill="#050505" fill-opacity="0.05" fill-rule="evenodd" stroke-opacity="0.05"/>
+<path d="M12.571,1.916c0,0,6.867,0.282,9.421,3.781 c0,0,1.93-2.27,2.467-0.451C24.188,3.855,21.737,1.864,12.571,1.916z" fill="#050505" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="18.875" x2="18.1619" y1="2.2437" y2="4.8927">
<stop offset="0" style="stop-color:#FFFFFF"/>
<stop offset="0.0061" style="stop-color:#FFFFFF"/>
<stop offset="1" style="stop-color:#D9D9D9"/>
</linearGradient>
-<path d="M12.572,1.916c0,0,6.867,0.06,9.421,3.56 c0,0,1.83-2.256,2.467-0.229C24.188,3.855,21.738,1.864,12.572,1.916z" fill="url(#SVGID_4__)" fill-rule="evenodd"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15" x2="15" y1="9.9375" y2="23.5596">
+<path d="M12.571,1.916c0,0,6.867,0.06,9.421,3.56 c0,0,1.83-2.256,2.467-0.229C24.188,3.855,21.737,1.864,12.571,1.916z" fill="url(#SVGID_4__)" fill-rule="evenodd"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9995" x2="14.9995" y1="9.9375" y2="23.5601">
<stop offset="0" style="stop-color:#BDC3C4"/>
<stop offset="0.3515" style="stop-color:#DDE3E6"/>
<stop offset="0.6545" style="stop-color:#949DA1"/>
@@ -75,57 +74,57 @@
<stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M29,22.205c0,0.835-0.678,1.513-1.514,1.513H2.514C1.678,23.718,1,23.04,1,22.205V11.61 c0-0.836,0.678-1.515,1.514-1.515h24.973c0.836,0,1.514,0.679,1.514,1.515V22.205z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15.0005" x2="15.0005" y1="26.0552" y2="23.3401">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15.0005" x2="15.0005" y1="26.0557" y2="23.3406">
<stop offset="0" style="stop-color:#D1D7D9"/>
<stop offset="0.3273" style="stop-color:#BDC2C4"/>
<stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
-<path d="M4.223,23.718v1.818c0,0.221,0.179,0.4,0.399,0.4h20.756c0.221,0,0.399-0.18,0.399-0.4v-1.818H4.223z " fill="url(#SVGID_6_)"/>
-<rect fill="#020202" fill-opacity="0.3" height="0.377" stroke-opacity="0.3" width="21.551" x="4.226" y="23.729"/>
-<rect fill="#020202" fill-opacity="0.15" height="0.379" stroke-opacity="0.15" width="21.551" x="4.226" y="24.105"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="15" x2="15" y1="9.9375" y2="23.5596">
+<path d="M4.223,23.718v1.818c0,0.221,0.179,0.4,0.398,0.4h20.757c0.221,0,0.399-0.18,0.399-0.4v-1.818H4.223z " fill="url(#SVGID_6_)"/>
+<rect fill="#020202" fill-opacity="0.3" height="0.377" stroke-opacity="0.3" width="21.552" x="4.225" y="23.729"/>
+<rect fill="#020202" fill-opacity="0.15" height="0.379" stroke-opacity="0.15" width="21.552" x="4.225" y="24.105"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.9995" x2="14.9995" y1="9.9375" y2="23.5601">
<stop offset="0" style="stop-color:#E4EBED"/>
<stop offset="0.0667" style="stop-color:#E4EBED"/>
<stop offset="0.2606" style="stop-color:#D6DCDE"/>
<stop offset="0.6606" style="stop-color:#B2BEC2"/>
<stop offset="1" style="stop-color:#ADB3B5"/>
</linearGradient>
-<path d="M27.487,10.096H2.514C1.678,10.096,1,10.774,1,11.61v10.595c0,0.835,0.678,1.513,1.514,1.513 c-0.626,0-1.135-0.51-1.135-1.136v-0.377V11.988V11.61c0-0.626,0.509-1.135,1.135-1.135h24.973c0.626,0,1.135,0.509,1.135,1.135 v0.378v10.217v0.377c0,0.626-0.509,1.136-1.135,1.136c0.836,0,1.514-0.678,1.514-1.513V11.61C29,10.774,28.323,10.096,27.487,10.096 z" fill="url(#SVGID_7_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="10.4927" x2="10.4927" y1="11.9312" y2="15.3514">
+<path d="M27.486,10.096H2.514C1.678,10.096,1,10.774,1,11.61v10.595c0,0.835,0.678,1.513,1.514,1.513 c-0.626,0-1.135-0.51-1.135-1.136v-0.377V11.988V11.61c0-0.626,0.509-1.135,1.135-1.135h24.973c0.626,0,1.135,0.509,1.135,1.135 v0.378v10.217v0.377c0,0.626-0.509,1.136-1.135,1.136c0.836,0,1.514-0.678,1.514-1.513V11.61C29,10.774,28.322,10.096,27.486,10.096 z" fill="url(#SVGID_7_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="10.4917" x2="10.4917" y1="11.9312" y2="15.3514">
<stop offset="0" style="stop-color:#686C6E"/>
<stop offset="1" style="stop-color:#E4EEF2"/>
</linearGradient>
-<path d="M5.005,15.329c-0.418,0-0.758-0.345-0.758-0.766V12.69c0-0.424,0.34-0.767,0.758-0.767 h10.978c0.416,0,0.756,0.343,0.756,0.767v1.873c0,0.421-0.34,0.766-0.756,0.766H5.005z" fill="url(#SVGID_8_)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="10.4912" x2="10.4912" y1="12.3164" y2="14.996">
+<path d="M5.004,15.329c-0.418,0-0.758-0.345-0.758-0.766V12.69c0-0.424,0.34-0.767,0.758-0.767 h10.979c0.416,0,0.756,0.343,0.756,0.767v1.873c0,0.421-0.34,0.766-0.756,0.766H5.004z" fill="url(#SVGID_8_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="10.4897" x2="10.4897" y1="12.3164" y2="14.996">
<stop offset="0" style="stop-color:#171717"/>
<stop offset="1" style="stop-color:#2E2E2E"/>
</linearGradient>
-<path d="M16.356,14.563c0,0.21-0.17,0.383-0.379,0.383H5.005c-0.209,0-0.379-0.173-0.379-0.383V12.69 c0-0.214,0.17-0.385,0.379-0.385h10.972c0.209,0,0.379,0.171,0.379,0.385V14.563z" fill="url(#SVGID_9_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="10.4912" x2="10.4912" y1="9.2793" y2="15.8759">
+<path d="M16.355,14.563c0,0.21-0.17,0.383-0.379,0.383H5.004c-0.209,0-0.379-0.173-0.379-0.383V12.69 c0-0.214,0.17-0.385,0.379-0.385h10.973c0.209,0,0.379,0.171,0.379,0.385V14.563z" fill="url(#SVGID_9_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="10.4902" x2="10.4902" y1="9.2793" y2="15.8759">
<stop offset="0" style="stop-color:#45E8FF"/>
<stop offset="0.1455" style="stop-color:#45E8FF"/>
<stop offset="0.5576" style="stop-color:#30A4D5"/>
<stop offset="0.8727" style="stop-color:#1347BA"/>
<stop offset="1" style="stop-color:#1C65C3"/>
</linearGradient>
-<rect fill="url(#SVGID_10_)" height="1.873" width="10.972" x="5.005" y="12.69"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="10.4912" x2="10.4912" y1="10.1255" y2="15.6464">
+<rect fill="url(#SVGID_10_)" height="1.873" width="10.973" x="5.004" y="12.69"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="10.4902" x2="10.4902" y1="10.1255" y2="15.6464">
<stop offset="0" style="stop-color:#45E8FF"/>
<stop offset="0.1455" style="stop-color:#45E8FF"/>
<stop offset="0.5576" style="stop-color:#4FADD5"/>
<stop offset="0.8727" style="stop-color:#1347BA"/>
<stop offset="1" style="stop-color:#1C65C3"/>
</linearGradient>
-<polygon fill="url(#SVGID_11_)" points="5.005,13.688 15.977,13.419 15.977,12.679 5.005,12.679 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="24.9116" x2="24.9116" y1="11.897" y2="14.1399">
+<polygon fill="url(#SVGID_11_)" points="5.004,13.688 15.977,13.419 15.977,12.679 5.004,12.679 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="24.9111" x2="24.9111" y1="11.897" y2="14.1399">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
<path d="M24.553,14.085c-0.398,0-0.723-0.323-0.723-0.722v-0.717 c0-0.398,0.324-0.723,0.723-0.723h0.717c0.398,0,0.723,0.324,0.723,0.723v0.717c0,0.398-0.324,0.722-0.723,0.722H24.553z" fill="url(#SVGID_12_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M25.27,14.085h-0.717c-0.398,0-0.723-0.323-0.723-0.722v0.36c0,0.399,0.324,0.724,0.723,0.724 h0.717c0.398,0,0.723-0.324,0.723-0.724v-0.36C25.993,13.762,25.668,14.085,25.27,14.085z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="24.9111" x2="24.9111" y1="12.2661" y2="13.76">
+<path d="M25.27,14.085h-0.717c-0.398,0-0.723-0.323-0.723-0.722v0.36c0,0.399,0.324,0.724,0.723,0.724 h0.717c0.398,0,0.723-0.324,0.723-0.724v-0.36C25.992,13.762,25.668,14.085,25.27,14.085z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="24.9102" x2="24.9102" y1="12.2661" y2="13.76">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
@@ -139,25 +138,25 @@
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
-<path d="M21.662,14.085c-0.398,0-0.724-0.323-0.724-0.722v-0.717 c0-0.398,0.325-0.723,0.724-0.723h0.716c0.398,0,0.724,0.324,0.724,0.723v0.717c0,0.398-0.325,0.722-0.724,0.722H21.662z" fill="url(#SVGID_14_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M22.377,14.085h-0.716c-0.398,0-0.724-0.323-0.724-0.722v0.36 c0,0.399,0.325,0.724,0.724,0.724h0.716c0.398,0,0.724-0.324,0.724-0.724v-0.36C23.101,13.762,22.776,14.085,22.377,14.085z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="22.02" x2="22.02" y1="12.2661" y2="13.76">
+<path d="M21.661,14.085c-0.398,0-0.724-0.323-0.724-0.722v-0.717 c0-0.398,0.325-0.723,0.724-0.723h0.716c0.398,0,0.724,0.324,0.724,0.723v0.717c0,0.398-0.325,0.722-0.724,0.722H21.661z" fill="url(#SVGID_14_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M22.377,14.085h-0.716c-0.398,0-0.724-0.323-0.724-0.722v0.36 c0,0.399,0.325,0.724,0.724,0.724h0.716c0.398,0,0.724-0.324,0.724-0.724v-0.36C23.101,13.762,22.775,14.085,22.377,14.085z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="22.0195" x2="22.0195" y1="12.2661" y2="13.76">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
<stop offset="0.6606" style="stop-color:#474B4D"/>
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
-<path d="M22.741,13.363c0,0.2-0.163,0.36-0.363,0.36h-0.716c-0.2,0-0.362-0.16-0.362-0.36v-0.717 c0-0.2,0.162-0.362,0.362-0.362h0.716c0.2,0,0.363,0.162,0.363,0.362V13.363z" fill="url(#SVGID_15_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="19.1279" x2="19.1279" y1="11.897" y2="14.1399">
+<path d="M22.74,13.363c0,0.2-0.163,0.36-0.363,0.36h-0.716c-0.2,0-0.362-0.16-0.362-0.36v-0.717 c0-0.2,0.162-0.362,0.362-0.362h0.716c0.2,0,0.363,0.162,0.363,0.362V13.363z" fill="url(#SVGID_15_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="19.127" x2="19.127" y1="11.897" y2="14.1399">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
<path d="M18.77,14.085c-0.398,0-0.724-0.323-0.724-0.722v-0.717 c0-0.398,0.325-0.723,0.724-0.723h0.716c0.398,0,0.724,0.324,0.724,0.723v0.717c0,0.398-0.325,0.722-0.724,0.722H18.77z" fill="url(#SVGID_16_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M19.486,14.085H18.77c-0.398,0-0.724-0.323-0.724-0.722v0.36c0,0.399,0.325,0.724,0.724,0.724 h0.716c0.398,0,0.724-0.324,0.724-0.724v-0.36C20.209,13.762,19.884,14.085,19.486,14.085z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="19.1284" x2="19.1284" y1="12.2661" y2="13.76">
+<path d="M19.485,14.085H18.77c-0.398,0-0.724-0.323-0.724-0.722v0.36c0,0.399,0.325,0.724,0.724,0.724 h0.716c0.398,0,0.724-0.324,0.724-0.724v-0.36C20.209,13.762,19.884,14.085,19.485,14.085z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="19.1279" x2="19.1279" y1="12.2661" y2="13.76">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
@@ -165,15 +164,15 @@
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
<path d="M19.848,13.363c0,0.2-0.162,0.36-0.362,0.36H18.77c-0.199,0-0.361-0.16-0.361-0.36v-0.717 c0-0.2,0.162-0.362,0.361-0.362h0.716c0.2,0,0.362,0.162,0.362,0.362V13.363z" fill="url(#SVGID_17_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="24.9116" x2="24.9116" y1="14.7866" y2="17.0326">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="24.9111" x2="24.9111" y1="14.7866" y2="17.0331">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
<path d="M24.553,16.978c-0.398,0-0.723-0.325-0.723-0.724v-0.717 c0-0.399,0.324-0.724,0.723-0.724h0.717c0.398,0,0.723,0.324,0.723,0.724v0.717c0,0.398-0.324,0.724-0.723,0.724H24.553z" fill="url(#SVGID_18_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M25.27,16.978h-0.717c-0.398,0-0.723-0.325-0.723-0.724v0.36c0,0.4,0.324,0.724,0.723,0.724 h0.717c0.398,0,0.723-0.323,0.723-0.724v-0.36C25.993,16.652,25.668,16.978,25.27,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="24.9111" x2="24.9111" y1="15.1587" y2="16.6506">
+<path d="M25.27,16.978h-0.717c-0.398,0-0.723-0.325-0.723-0.724v0.36c0,0.4,0.324,0.724,0.723,0.724 h0.717c0.398,0,0.723-0.323,0.723-0.724v-0.36C25.992,16.652,25.668,16.978,25.27,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="24.9102" x2="24.9102" y1="15.1587" y2="16.6511">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
@@ -181,31 +180,31 @@
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
<path d="M25.631,16.254c0,0.201-0.162,0.36-0.361,0.36h-0.717c-0.199,0-0.362-0.159-0.362-0.36v-0.717 c0-0.199,0.163-0.36,0.362-0.36h0.717c0.199,0,0.361,0.161,0.361,0.36V16.254z" fill="url(#SVGID_19_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="22.0195" x2="22.0195" y1="14.7866" y2="17.0326">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="22.0195" x2="22.0195" y1="14.7866" y2="17.0331">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
-<path d="M21.662,16.978c-0.398,0-0.724-0.325-0.724-0.724v-0.717 c0-0.399,0.325-0.724,0.724-0.724h0.716c0.398,0,0.724,0.324,0.724,0.724v0.717c0,0.398-0.325,0.724-0.724,0.724H21.662z" fill="url(#SVGID_20_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M22.377,16.978h-0.716c-0.398,0-0.724-0.325-0.724-0.724v0.36c0,0.4,0.325,0.724,0.724,0.724 h0.716c0.398,0,0.724-0.323,0.724-0.724v-0.36C23.101,16.652,22.776,16.978,22.377,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="22.02" x2="22.02" y1="15.1587" y2="16.6506">
+<path d="M21.661,16.978c-0.398,0-0.724-0.325-0.724-0.724v-0.717 c0-0.399,0.325-0.724,0.724-0.724h0.716c0.398,0,0.724,0.324,0.724,0.724v0.717c0,0.398-0.325,0.724-0.724,0.724H21.661z" fill="url(#SVGID_20_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M22.377,16.978h-0.716c-0.398,0-0.724-0.325-0.724-0.724v0.36c0,0.4,0.325,0.724,0.724,0.724 h0.716c0.398,0,0.724-0.323,0.724-0.724v-0.36C23.101,16.652,22.775,16.978,22.377,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="22.0195" x2="22.0195" y1="15.1587" y2="16.6511">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
<stop offset="0.6606" style="stop-color:#474B4D"/>
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
-<path d="M22.741,16.254c0,0.201-0.163,0.36-0.363,0.36h-0.716c-0.2,0-0.362-0.159-0.362-0.36v-0.717 c0-0.199,0.162-0.36,0.362-0.36h0.716c0.2,0,0.363,0.161,0.363,0.36V16.254z" fill="url(#SVGID_21_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="19.1279" x2="19.1279" y1="14.7866" y2="17.0326">
+<path d="M22.74,16.254c0,0.201-0.163,0.36-0.363,0.36h-0.716c-0.2,0-0.362-0.159-0.362-0.36v-0.717 c0-0.199,0.162-0.36,0.362-0.36h0.716c0.2,0,0.363,0.161,0.363,0.36V16.254z" fill="url(#SVGID_21_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="19.127" x2="19.127" y1="14.7866" y2="17.0331">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
<path d="M18.77,16.978c-0.398,0-0.724-0.325-0.724-0.724v-0.717 c0-0.399,0.325-0.724,0.724-0.724h0.716c0.398,0,0.724,0.324,0.724,0.724v0.717c0,0.398-0.325,0.724-0.724,0.724H18.77z" fill="url(#SVGID_22_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M19.486,16.978H18.77c-0.398,0-0.724-0.325-0.724-0.724v0.36c0,0.4,0.325,0.724,0.724,0.724 h0.716c0.398,0,0.724-0.323,0.724-0.724v-0.36C20.209,16.652,19.884,16.978,19.486,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="19.1284" x2="19.1284" y1="15.1587" y2="16.6506">
+<path d="M19.485,16.978H18.77c-0.398,0-0.724-0.325-0.724-0.724v0.36c0,0.4,0.325,0.724,0.724,0.724 h0.716c0.398,0,0.724-0.323,0.724-0.724v-0.36C20.209,16.652,19.884,16.978,19.485,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="19.1279" x2="19.1279" y1="15.1587" y2="16.6511">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
@@ -213,15 +212,15 @@
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
<path d="M19.848,16.254c0,0.201-0.162,0.36-0.362,0.36H18.77c-0.199,0-0.361-0.159-0.361-0.36v-0.717 c0-0.199,0.162-0.36,0.361-0.36h0.716c0.2,0,0.362,0.161,0.362,0.36V16.254z" fill="url(#SVGID_23_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="24.9116" x2="24.9116" y1="17.6792" y2="19.9231">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="24.9111" x2="24.9111" y1="17.6797" y2="19.9236">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
<path d="M24.553,19.868c-0.398,0-0.723-0.322-0.723-0.723V18.43 c0-0.398,0.324-0.724,0.723-0.724h0.717c0.398,0,0.723,0.325,0.723,0.724v0.716c0,0.4-0.324,0.723-0.723,0.723H24.553z" fill="url(#SVGID_24_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M25.27,19.868h-0.717c-0.398,0-0.723-0.322-0.723-0.723v0.361c0,0.4,0.324,0.725,0.723,0.725 h0.717c0.398,0,0.723-0.324,0.723-0.725v-0.361C25.993,19.546,25.668,19.868,25.27,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="24.9111" x2="24.9111" y1="18.0503" y2="19.5432">
+<path d="M25.27,19.868h-0.717c-0.398,0-0.723-0.322-0.723-0.723v0.361c0,0.4,0.324,0.725,0.723,0.725 h0.717c0.398,0,0.723-0.324,0.723-0.725v-0.361C25.992,19.546,25.668,19.868,25.27,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="24.9102" x2="24.9102" y1="18.0508" y2="19.5437">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
@@ -229,31 +228,31 @@
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
<path d="M25.631,19.146c0,0.199-0.162,0.361-0.361,0.361h-0.717c-0.199,0-0.362-0.162-0.362-0.361V18.43 c0-0.199,0.163-0.361,0.362-0.361h0.717c0.199,0,0.361,0.162,0.361,0.361V19.146z" fill="url(#SVGID_25_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="22.0195" x2="22.0195" y1="17.6792" y2="19.9231">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="22.0195" x2="22.0195" y1="17.6797" y2="19.9236">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
-<path d="M21.662,19.868c-0.398,0-0.724-0.322-0.724-0.723V18.43 c0-0.398,0.325-0.724,0.724-0.724h0.716c0.398,0,0.724,0.325,0.724,0.724v0.716c0,0.4-0.325,0.723-0.724,0.723H21.662z" fill="url(#SVGID_26_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M22.377,19.868h-0.716c-0.398,0-0.724-0.322-0.724-0.723v0.361c0,0.4,0.325,0.725,0.724,0.725 h0.716c0.398,0,0.724-0.324,0.724-0.725v-0.361C23.101,19.546,22.776,19.868,22.377,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="22.02" x2="22.02" y1="18.0503" y2="19.5432">
+<path d="M21.661,19.868c-0.398,0-0.724-0.322-0.724-0.723V18.43 c0-0.398,0.325-0.724,0.724-0.724h0.716c0.398,0,0.724,0.325,0.724,0.724v0.716c0,0.4-0.325,0.723-0.724,0.723H21.661z" fill="url(#SVGID_26_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M22.377,19.868h-0.716c-0.398,0-0.724-0.322-0.724-0.723v0.361c0,0.4,0.325,0.725,0.724,0.725 h0.716c0.398,0,0.724-0.324,0.724-0.725v-0.361C23.101,19.546,22.775,19.868,22.377,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="22.0195" x2="22.0195" y1="18.0508" y2="19.5437">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
<stop offset="0.6606" style="stop-color:#474B4D"/>
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
-<path d="M22.741,19.146c0,0.199-0.163,0.361-0.363,0.361h-0.716c-0.2,0-0.362-0.162-0.362-0.361V18.43 c0-0.199,0.162-0.361,0.362-0.361h0.716c0.2,0,0.363,0.162,0.363,0.361V19.146z" fill="url(#SVGID_27_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="19.1279" x2="19.1279" y1="17.6792" y2="19.9231">
+<path d="M22.74,19.146c0,0.199-0.163,0.361-0.363,0.361h-0.716c-0.2,0-0.362-0.162-0.362-0.361V18.43 c0-0.199,0.162-0.361,0.362-0.361h0.716c0.2,0,0.363,0.162,0.363,0.361V19.146z" fill="url(#SVGID_27_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="19.127" x2="19.127" y1="17.6797" y2="19.9236">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
<path d="M18.77,19.868c-0.398,0-0.724-0.322-0.724-0.723V18.43 c0-0.398,0.325-0.724,0.724-0.724h0.716c0.398,0,0.724,0.325,0.724,0.724v0.716c0,0.4-0.325,0.723-0.724,0.723H18.77z" fill="url(#SVGID_28_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M19.486,19.868H18.77c-0.398,0-0.724-0.322-0.724-0.723v0.361c0,0.4,0.325,0.725,0.724,0.725 h0.716c0.398,0,0.724-0.324,0.724-0.725v-0.361C20.209,19.546,19.884,19.868,19.486,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="19.1284" x2="19.1284" y1="18.0503" y2="19.5432">
+<path d="M19.485,19.868H18.77c-0.398,0-0.724-0.322-0.724-0.723v0.361c0,0.4,0.325,0.725,0.724,0.725 h0.716c0.398,0,0.724-0.324,0.724-0.725v-0.361C20.209,19.546,19.884,19.868,19.485,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="19.1279" x2="19.1279" y1="18.0508" y2="19.5437">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
@@ -261,54 +260,54 @@
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
<path d="M19.848,19.146c0,0.199-0.162,0.361-0.362,0.361H18.77c-0.199,0-0.361-0.162-0.361-0.361V18.43 c0-0.199,0.162-0.361,0.361-0.361h0.716c0.2,0,0.362,0.162,0.362,0.361V19.146z" fill="url(#SVGID_29_)"/>
-<linearGradient gradientTransform="matrix(-1 0 0 -1 -7758.4854 1952.6084)" gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="-7773.4854" x2="-7773.4854" y1="1924.5239" y2="1930.8613">
+<linearGradient gradientTransform="matrix(-1 0 0 -1 -7790.2559 1179.5723)" gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="-7805.2559" x2="-7805.2559" y1="1151.4873" y2="1157.8247">
<stop offset="0" style="stop-color:#D9D9D9"/>
<stop offset="0.5382" style="stop-color:#B3B3B3"/>
<stop offset="1" style="stop-color:#B3B3B3"/>
</linearGradient>
<rect fill="url(#SVGID_30_)" height="6.053" width="18.918" x="5.541" y="22.032"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="15" x2="15" y1="21.605" y2="23.7331">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="14.9995" x2="14.9995" y1="21.6055" y2="23.7336">
<stop offset="0" style="stop-color:#171717"/>
<stop offset="1" style="stop-color:#2E2E2E"/>
</linearGradient>
-<path d="M24.568,21.585H5.433c-0.21,0-0.382,0.171-0.382,0.383v1.75H24.95v-1.75 C24.95,21.756,24.779,21.585,24.568,21.585z" fill="url(#SVGID_31_)"/>
-<path d="M24.568,21.206H5.433c-0.21,0-0.382,0.17-0.382,0.384v0.378c0-0.212,0.171-0.383,0.382-0.383 h19.135c0.211,0,0.382,0.171,0.382,0.383V21.59C24.95,21.376,24.779,21.206,24.568,21.206z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientTransform="matrix(-1 0 0 -1 -7758.4854 1952.6084)" gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="-7773.4854" x2="-7773.4854" y1="1924.4653" y2="1930.1107">
+<path d="M24.567,21.585H5.432c-0.21,0-0.381,0.171-0.381,0.383v1.75h19.898v-1.75 C24.949,21.756,24.778,21.585,24.567,21.585z" fill="url(#SVGID_31_)"/>
+<path d="M24.567,21.206H5.432c-0.21,0-0.381,0.17-0.381,0.384v0.378c0-0.212,0.171-0.383,0.381-0.383 h19.136c0.211,0,0.382,0.171,0.382,0.383V21.59C24.949,21.376,24.778,21.206,24.567,21.206z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 -7790.2559 1179.5723)" gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="-7805.2559" x2="-7805.2559" y1="1151.4287" y2="1157.0741">
<stop offset="0" style="stop-color:#EDEDED"/>
<stop offset="1" style="stop-color:#BDBDBD"/>
</linearGradient>
-<polygon fill="url(#SVGID_32_)" points="5.541,24.79 5.541,22.032 24.459,22.032 24.459,28.085 17.334,28.085 13.432,27.889 6.298,25.848 5.729,25.252 "/>
+<polygon fill="url(#SVGID_32_)" points="5.541,24.79 5.541,22.032 24.459,22.032 24.459,28.085 17.334,28.085 13.432,27.889 6.297,25.848 5.729,25.252 "/>
<rect fill="#020202" fill-opacity="0.3" height="0.38" stroke-opacity="0.3" width="18.918" x="5.541" y="22.032"/>
<rect fill="#020202" fill-opacity="0.15" height="0.378" stroke-opacity="0.15" width="18.918" x="5.541" y="22.412"/>
<rect fill="#020202" fill-opacity="0.05" height="0.379" stroke-opacity="0.05" width="18.918" x="5.541" y="22.79"/>
-<rect fill="#020202" fill-opacity="0.5" height="0.377" stroke-opacity="0.5" width="13.621" x="8.19" y="24.682"/>
-<rect fill="#020202" fill-opacity="0.2" height="0.379" stroke-opacity="0.2" width="13.621" x="8.19" y="25.059"/>
-<path d="M17.429,28.084c0,0-6.867-1.039-9.421-4.539 c0,0-1.93,2.648-2.467,1.209C5.813,26.145,8.263,28.136,17.429,28.084z" fill="#050505" fill-opacity="0.05" fill-rule="evenodd" stroke-opacity="0.05"/>
-<path d="M17.429,28.084c0,0-6.867-0.282-9.421-3.781 c0,0-1.93,2.27-2.467,0.451C5.813,26.145,8.263,28.136,17.429,28.084z" fill="#050505" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(-1 0 0 -1 -7758.4854 1952.6084)" gradientUnits="userSpaceOnUse" id="SVGID_33_" x1="-7769.6108" x2="-7770.3237" y1="1924.8521" y2="1927.5011">
+<rect fill="#020202" fill-opacity="0.5" height="0.377" stroke-opacity="0.5" width="13.621" x="8.189" y="24.682"/>
+<rect fill="#020202" fill-opacity="0.2" height="0.379" stroke-opacity="0.2" width="13.621" x="8.189" y="25.059"/>
+<path d="M17.429,28.084c0,0-6.867-1.039-9.421-4.539 c0,0-1.93,2.648-2.467,1.209C5.813,26.145,8.262,28.136,17.429,28.084z" fill="#050505" fill-opacity="0.05" fill-rule="evenodd" stroke-opacity="0.05"/>
+<path d="M17.429,28.084c0,0-6.867-0.282-9.421-3.781 c0,0-1.93,2.27-2.467,0.451C5.813,26.145,8.262,28.136,17.429,28.084z" fill="#050505" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 -7790.2559 1179.5723)" gradientUnits="userSpaceOnUse" id="SVGID_33_" x1="-7801.3809" x2="-7802.0938" y1="1151.8154" y2="1154.4645">
<stop offset="0" style="stop-color:#FFFFFF"/>
<stop offset="0.0061" style="stop-color:#FFFFFF"/>
<stop offset="1" style="stop-color:#D9D9D9"/>
</linearGradient>
-<path d="M17.429,28.084c0,0-6.867-0.06-9.421-3.56 c0,0-1.83,2.256-2.467,0.229C5.813,26.145,8.263,28.136,17.429,28.084z" fill="url(#SVGID_33_)" fill-rule="evenodd"/>
-<rect fill="none" height="30" width="30" x="0"/>
-<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -216.8074 280.5271)" gradientUnits="userSpaceOnUse" id="SVGID_34_" x1="476.6157" x2="476.6157" y1="533.1255" y2="503.1255">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.2545" style="stop-color:#4F88BD"/>
-<stop offset="0.7333" style="stop-color:#0055A3"/>
-<stop offset="1" style="stop-color:#64AEFB"/>
+<path d="M17.429,28.084c0,0-6.867-0.06-9.421-3.56 c0,0-1.83,2.256-2.467,0.229C5.813,26.145,8.262,28.136,17.429,28.084z" fill="url(#SVGID_33_)" fill-rule="evenodd"/>
+<rect fill="none" height="30" width="30"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -224.75 -299.25)" gradientUnits="userSpaceOnUse" id="SVGID_34_" x1="492.5" x2="492.5" y1="-626.4292" y2="-656.4292">
+<stop offset="0" style="stop-color:#FFE1A3"/>
+<stop offset="0.297" style="stop-color:#FFE1A3"/>
+<stop offset="0.6667" style="stop-color:#AD4C01"/>
+<stop offset="1" style="stop-color:#FFE1A3"/>
</linearGradient>
<path d="M21.5,29c-4.137,0-7.5-3.363-7.5-7.5c0-4.135,3.363-7.5,7.5-7.5c4.135,0,7.5,3.365,7.5,7.5 C29,25.637,25.635,29,21.5,29L21.5,29z" fill="url(#SVGID_34_)"/>
-<radialGradient cx="527.4526" cy="963.3052" gradientTransform="matrix(0.4708 0 0 -0.4709 -226.8932 469.2089)" gradientUnits="userSpaceOnUse" id="SVGID_35_" r="29.2365">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="0.15" style="stop-color:#96E9FA"/>
-<stop offset="0.7455" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
-</radialGradient>
-<path d="M28.786,21.5c0,4.024-3.264,7.286-7.285,7.286c-4.025,0-7.285-3.262-7.285-7.286 c0-4.022,3.26-7.286,7.285-7.286C25.522,14.214,28.786,17.478,28.786,21.5z" fill="url(#SVGID_35_)"/>
-<polygon fill-opacity="0.3" points="25.704,22.889 21.499,18.435 17.297,22.889 16.659,22.209 21.499,17.077 26.342,22.209 25.704,22.889 " stroke-opacity="0.3"/>
-<polygon fill-opacity="0.3" points="21.5,19.845 17.627,23.951 17.627,25.793 20.532,25.793 20.532,22.889 22.469,22.889 22.469,25.793 25.374,25.793 25.374,23.95 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" points="25.704,22.188 21.499,17.734 17.297,22.188 16.659,21.51 21.499,16.377 26.342,21.51 25.704,22.188 "/>
-<polygon fill="#FFFFFF" points="21.5,19.146 17.627,23.252 17.627,25.094 20.532,25.094 20.532,22.188 22.469,22.188 22.469,25.094 25.374,25.094 25.374,23.25 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_35_" x1="21.5" x2="21.5" y1="14.4858" y2="28.3326">
+<stop offset="0" style="stop-color:#FFC144"/>
+<stop offset="0.297" style="stop-color:#FFC144"/>
+<stop offset="0.6667" style="stop-color:#EF6902"/>
+<stop offset="1" style="stop-color:#FEB037"/>
+</linearGradient>
+<path d="M28.5,21.5c0,3.866-3.136,7-7,7c-3.867,0-7-3.134-7-7c0-3.864,3.133-7,7-7 C25.364,14.5,28.5,17.636,28.5,21.5z" fill="url(#SVGID_35_)"/>
+<polygon fill-opacity="0.3" points="25.703,22.889 21.498,18.435 17.297,22.889 16.658,22.209 21.498,17.077 26.342,22.209 25.703,22.889 " stroke-opacity="0.3"/>
+<polygon fill-opacity="0.3" points="21.5,19.845 17.627,23.951 17.627,25.793 20.531,25.793 20.531,22.889 22.469,22.889 22.469,25.793 25.373,25.793 25.373,23.95 " stroke-opacity="0.3"/>
+<polygon fill="#FFFFFF" points="25.703,22.188 21.498,17.734 17.297,22.188 16.658,21.51 21.498,16.377 26.342,21.51 25.703,22.188 "/>
+<polygon fill="#FFFFFF" points="21.5,19.146 17.627,23.252 17.627,25.094 20.531,25.094 20.531,22.188 22.469,22.188 22.469,25.094 25.373,25.094 25.373,23.25 "/>
</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_work.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_work.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
<stop offset="0" style="stop-color:#A7E722"/>
@@ -31,9 +31,8 @@
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
-<polygon fill="none" points="0,11.61 0,22.205 0,30 30,30 30,22.205 30,11.61 30,0 0,0 "/>
-<path d="M21.5,30c-1.33,0-2.65-0.315-3.833-0.915H4.541v-2.15c-0.734-0.043-1.318-0.653-1.318-1.398v-0.818H2.514 C1.127,24.718,0,23.591,0,22.205V11.61c0-1.387,1.127-2.515,2.514-2.515h0.703V8.334h0.006V6.753c0-0.744,0.584-1.354,1.318-1.396 V0.915h20.918v4.441c0.734,0.043,1.318,0.652,1.318,1.396v1.581l0.006,0.762h0.703c1.386,0,2.514,1.128,2.514,2.515v10.595 c0,0.297-0.052,0.587-0.152,0.863C29.094,27.091,25.6,30,21.5,30L21.5,30z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="6.3018" y2="10.8418">
+<path d="M21.5,30c-1.331,0-2.65-0.315-3.834-0.915H4.541v-2.15c-0.734-0.043-1.318-0.653-1.318-1.398v-0.818H2.514 C1.127,24.718,0,23.591,0,22.205V11.61c0-1.387,1.127-2.515,2.514-2.515h0.703V8.334h0.006V6.753c0-0.744,0.584-1.354,1.318-1.396 V0.915h20.918v4.441c0.734,0.043,1.318,0.652,1.318,1.396v1.581l0.006,0.762h0.703c1.386,0,2.514,1.128,2.514,2.515v10.595 c0,0.297-0.052,0.588-0.154,0.864C29.092,27.092,25.598,30,21.5,30L21.5,30z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="14.9995" x2="14.9995" y1="6.3018" y2="10.8418">
<stop offset="0" style="stop-color:#D1D7D9"/>
<stop offset="0.3273" style="stop-color:#BDC2C4"/>
<stop offset="1" style="stop-color:#595C5E"/>
@@ -41,13 +40,13 @@
<path d="M25.777,10.497c0,0.22-0.179,0.397-0.399,0.397H4.621c-0.22,0-0.398-0.178-0.398-0.397V6.753 c0-0.221,0.179-0.398,0.398-0.398h20.757c0.221,0,0.399,0.178,0.399,0.398V10.497z" fill="url(#SVGID_1__)"/>
<rect fill="#020202" fill-opacity="0.3" height="0.379" stroke-opacity="0.3" width="21.567" x="4.217" y="9.712"/>
<rect fill="#020202" fill-opacity="0.15" height="0.378" stroke-opacity="0.15" width="21.567" x="4.217" y="9.334"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="1.915" y2="10.6297">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.9995" x2="14.9995" y1="1.915" y2="10.6297">
<stop offset="0" style="stop-color:#D9D9D9"/>
<stop offset="0.5382" style="stop-color:#B3B3B3"/>
<stop offset="1" style="stop-color:#B3B3B3"/>
</linearGradient>
<rect fill="url(#SVGID_2__)" height="8.323" width="18.918" x="5.541" y="1.915"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="1.835" y2="9.598">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="14.9995" x2="14.9995" y1="1.835" y2="9.598">
<stop offset="0" style="stop-color:#EDEDED"/>
<stop offset="1" style="stop-color:#BDBDBD"/>
</linearGradient>
@@ -67,7 +66,7 @@
<stop offset="1" style="stop-color:#D9D9D9"/>
</linearGradient>
<path d="M12.571,1.916c0,0,6.867,0.06,9.421,3.56 c0,0,1.83-2.256,2.467-0.229C24.188,3.855,21.737,1.864,12.571,1.916z" fill="url(#SVGID_4__)" fill-rule="evenodd"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15" x2="15" y1="9.9375" y2="23.5596">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9995" x2="14.9995" y1="9.9375" y2="23.5601">
<stop offset="0" style="stop-color:#BDC3C4"/>
<stop offset="0.3515" style="stop-color:#DDE3E6"/>
<stop offset="0.6545" style="stop-color:#949DA1"/>
@@ -75,7 +74,7 @@
<stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M29,22.205c0,0.835-0.678,1.513-1.514,1.513H2.514C1.678,23.718,1,23.04,1,22.205V11.61 c0-0.836,0.678-1.515,1.514-1.515h24.973c0.836,0,1.514,0.679,1.514,1.515V22.205z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15" x2="15" y1="26.0552" y2="23.3401">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15.0005" x2="15.0005" y1="26.0557" y2="23.3406">
<stop offset="0" style="stop-color:#D1D7D9"/>
<stop offset="0.3273" style="stop-color:#BDC2C4"/>
<stop offset="1" style="stop-color:#595C5E"/>
@@ -83,7 +82,7 @@
<path d="M4.223,23.718v1.818c0,0.221,0.179,0.4,0.398,0.4h20.757c0.221,0,0.399-0.18,0.399-0.4v-1.818H4.223z " fill="url(#SVGID_6_)"/>
<rect fill="#020202" fill-opacity="0.3" height="0.377" stroke-opacity="0.3" width="21.552" x="4.225" y="23.729"/>
<rect fill="#020202" fill-opacity="0.15" height="0.379" stroke-opacity="0.15" width="21.552" x="4.225" y="24.105"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="15" x2="15" y1="9.9375" y2="23.5596">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.9995" x2="14.9995" y1="9.9375" y2="23.5601">
<stop offset="0" style="stop-color:#E4EBED"/>
<stop offset="0.0667" style="stop-color:#E4EBED"/>
<stop offset="0.2606" style="stop-color:#D6DCDE"/>
@@ -91,12 +90,12 @@
<stop offset="1" style="stop-color:#ADB3B5"/>
</linearGradient>
<path d="M27.486,10.096H2.514C1.678,10.096,1,10.774,1,11.61v10.595c0,0.835,0.678,1.513,1.514,1.513 c-0.626,0-1.135-0.51-1.135-1.136v-0.377V11.988V11.61c0-0.626,0.509-1.135,1.135-1.135h24.973c0.626,0,1.135,0.509,1.135,1.135 v0.378v10.217v0.377c0,0.626-0.509,1.136-1.135,1.136c0.836,0,1.514-0.678,1.514-1.513V11.61C29,10.774,28.322,10.096,27.486,10.096 z" fill="url(#SVGID_7_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="10.4922" x2="10.4922" y1="11.9312" y2="15.3514">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="10.4917" x2="10.4917" y1="11.9312" y2="15.3514">
<stop offset="0" style="stop-color:#686C6E"/>
<stop offset="1" style="stop-color:#E4EEF2"/>
</linearGradient>
<path d="M5.004,15.329c-0.418,0-0.758-0.345-0.758-0.766V12.69c0-0.424,0.34-0.767,0.758-0.767 h10.979c0.416,0,0.756,0.343,0.756,0.767v1.873c0,0.421-0.34,0.766-0.756,0.766H5.004z" fill="url(#SVGID_8_)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="10.4902" x2="10.4902" y1="12.3164" y2="14.996">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="10.4897" x2="10.4897" y1="12.3164" y2="14.996">
<stop offset="0" style="stop-color:#171717"/>
<stop offset="1" style="stop-color:#2E2E2E"/>
</linearGradient>
@@ -165,7 +164,7 @@
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
<path d="M19.848,13.363c0,0.2-0.162,0.36-0.362,0.36H18.77c-0.199,0-0.361-0.16-0.361-0.36v-0.717 c0-0.2,0.162-0.362,0.361-0.362h0.716c0.2,0,0.362,0.162,0.362,0.362V13.363z" fill="url(#SVGID_17_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="24.9111" x2="24.9111" y1="14.7866" y2="17.0326">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="24.9111" x2="24.9111" y1="14.7866" y2="17.0331">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
@@ -173,7 +172,7 @@
</linearGradient>
<path d="M24.553,16.978c-0.398,0-0.723-0.325-0.723-0.724v-0.717 c0-0.399,0.324-0.724,0.723-0.724h0.717c0.398,0,0.723,0.324,0.723,0.724v0.717c0,0.398-0.324,0.724-0.723,0.724H24.553z" fill="url(#SVGID_18_)" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M25.27,16.978h-0.717c-0.398,0-0.723-0.325-0.723-0.724v0.36c0,0.4,0.324,0.724,0.723,0.724 h0.717c0.398,0,0.723-0.323,0.723-0.724v-0.36C25.992,16.652,25.668,16.978,25.27,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="24.9102" x2="24.9102" y1="15.1587" y2="16.6506">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="24.9102" x2="24.9102" y1="15.1587" y2="16.6511">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
@@ -181,7 +180,7 @@
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
<path d="M25.631,16.254c0,0.201-0.162,0.36-0.361,0.36h-0.717c-0.199,0-0.362-0.159-0.362-0.36v-0.717 c0-0.199,0.163-0.36,0.362-0.36h0.717c0.199,0,0.361,0.161,0.361,0.36V16.254z" fill="url(#SVGID_19_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="22.0195" x2="22.0195" y1="14.7866" y2="17.0326">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="22.0195" x2="22.0195" y1="14.7866" y2="17.0331">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
@@ -189,7 +188,7 @@
</linearGradient>
<path d="M21.661,16.978c-0.398,0-0.724-0.325-0.724-0.724v-0.717 c0-0.399,0.325-0.724,0.724-0.724h0.716c0.398,0,0.724,0.324,0.724,0.724v0.717c0,0.398-0.325,0.724-0.724,0.724H21.661z" fill="url(#SVGID_20_)" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M22.377,16.978h-0.716c-0.398,0-0.724-0.325-0.724-0.724v0.36c0,0.4,0.325,0.724,0.724,0.724 h0.716c0.398,0,0.724-0.323,0.724-0.724v-0.36C23.101,16.652,22.775,16.978,22.377,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="22.0195" x2="22.0195" y1="15.1587" y2="16.6506">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="22.0195" x2="22.0195" y1="15.1587" y2="16.6511">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
@@ -197,7 +196,7 @@
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
<path d="M22.74,16.254c0,0.201-0.163,0.36-0.363,0.36h-0.716c-0.2,0-0.362-0.159-0.362-0.36v-0.717 c0-0.199,0.162-0.36,0.362-0.36h0.716c0.2,0,0.363,0.161,0.363,0.36V16.254z" fill="url(#SVGID_21_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="19.127" x2="19.127" y1="14.7866" y2="17.0326">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="19.127" x2="19.127" y1="14.7866" y2="17.0331">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
@@ -205,7 +204,7 @@
</linearGradient>
<path d="M18.77,16.978c-0.398,0-0.724-0.325-0.724-0.724v-0.717 c0-0.399,0.325-0.724,0.724-0.724h0.716c0.398,0,0.724,0.324,0.724,0.724v0.717c0,0.398-0.325,0.724-0.724,0.724H18.77z" fill="url(#SVGID_22_)" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M19.485,16.978H18.77c-0.398,0-0.724-0.325-0.724-0.724v0.36c0,0.4,0.325,0.724,0.724,0.724 h0.716c0.398,0,0.724-0.323,0.724-0.724v-0.36C20.209,16.652,19.884,16.978,19.485,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="19.1279" x2="19.1279" y1="15.1587" y2="16.6506">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="19.1279" x2="19.1279" y1="15.1587" y2="16.6511">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
@@ -213,7 +212,7 @@
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
<path d="M19.848,16.254c0,0.201-0.162,0.36-0.362,0.36H18.77c-0.199,0-0.361-0.159-0.361-0.36v-0.717 c0-0.199,0.162-0.36,0.361-0.36h0.716c0.2,0,0.362,0.161,0.362,0.36V16.254z" fill="url(#SVGID_23_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="24.9111" x2="24.9111" y1="17.6792" y2="19.9231">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="24.9111" x2="24.9111" y1="17.6797" y2="19.9236">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
@@ -221,7 +220,7 @@
</linearGradient>
<path d="M24.553,19.868c-0.398,0-0.723-0.322-0.723-0.723V18.43 c0-0.398,0.324-0.724,0.723-0.724h0.717c0.398,0,0.723,0.325,0.723,0.724v0.716c0,0.4-0.324,0.723-0.723,0.723H24.553z" fill="url(#SVGID_24_)" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M25.27,19.868h-0.717c-0.398,0-0.723-0.322-0.723-0.723v0.361c0,0.4,0.324,0.725,0.723,0.725 h0.717c0.398,0,0.723-0.324,0.723-0.725v-0.361C25.992,19.546,25.668,19.868,25.27,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="24.9102" x2="24.9102" y1="18.0503" y2="19.5432">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="24.9102" x2="24.9102" y1="18.0508" y2="19.5437">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
@@ -229,7 +228,7 @@
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
<path d="M25.631,19.146c0,0.199-0.162,0.361-0.361,0.361h-0.717c-0.199,0-0.362-0.162-0.362-0.361V18.43 c0-0.199,0.163-0.361,0.362-0.361h0.717c0.199,0,0.361,0.162,0.361,0.361V19.146z" fill="url(#SVGID_25_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="22.0195" x2="22.0195" y1="17.6792" y2="19.9231">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="22.0195" x2="22.0195" y1="17.6797" y2="19.9236">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
@@ -237,7 +236,7 @@
</linearGradient>
<path d="M21.661,19.868c-0.398,0-0.724-0.322-0.724-0.723V18.43 c0-0.398,0.325-0.724,0.724-0.724h0.716c0.398,0,0.724,0.325,0.724,0.724v0.716c0,0.4-0.325,0.723-0.724,0.723H21.661z" fill="url(#SVGID_26_)" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M22.377,19.868h-0.716c-0.398,0-0.724-0.322-0.724-0.723v0.361c0,0.4,0.325,0.725,0.724,0.725 h0.716c0.398,0,0.724-0.324,0.724-0.725v-0.361C23.101,19.546,22.775,19.868,22.377,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="22.0195" x2="22.0195" y1="18.0503" y2="19.5432">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="22.0195" x2="22.0195" y1="18.0508" y2="19.5437">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
@@ -245,7 +244,7 @@
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
<path d="M22.74,19.146c0,0.199-0.163,0.361-0.363,0.361h-0.716c-0.2,0-0.362-0.162-0.362-0.361V18.43 c0-0.199,0.162-0.361,0.362-0.361h0.716c0.2,0,0.363,0.162,0.363,0.361V19.146z" fill="url(#SVGID_27_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="19.127" x2="19.127" y1="17.6792" y2="19.9231">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="19.127" x2="19.127" y1="17.6797" y2="19.9236">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
@@ -253,7 +252,7 @@
</linearGradient>
<path d="M18.77,19.868c-0.398,0-0.724-0.322-0.724-0.723V18.43 c0-0.398,0.325-0.724,0.724-0.724h0.716c0.398,0,0.724,0.325,0.724,0.724v0.716c0,0.4-0.325,0.723-0.724,0.723H18.77z" fill="url(#SVGID_28_)" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M19.485,19.868H18.77c-0.398,0-0.724-0.322-0.724-0.723v0.361c0,0.4,0.325,0.725,0.724,0.725 h0.716c0.398,0,0.724-0.324,0.724-0.725v-0.361C20.209,19.546,19.884,19.868,19.485,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="19.1279" x2="19.1279" y1="18.0503" y2="19.5432">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="19.1279" x2="19.1279" y1="18.0508" y2="19.5437">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
@@ -261,19 +260,19 @@
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
<path d="M19.848,19.146c0,0.199-0.162,0.361-0.362,0.361H18.77c-0.199,0-0.361-0.162-0.361-0.361V18.43 c0-0.199,0.162-0.361,0.361-0.361h0.716c0.2,0,0.362,0.162,0.362,0.361V19.146z" fill="url(#SVGID_29_)"/>
-<linearGradient gradientTransform="matrix(-1 0 0 -1 -7890.4863 1952.6084)" gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="-7905.4863" x2="-7905.4863" y1="1924.5239" y2="1930.8613">
+<linearGradient gradientTransform="matrix(-1 0 0 -1 -7790.2559 1179.5723)" gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="-7805.2559" x2="-7805.2559" y1="1151.4873" y2="1157.8247">
<stop offset="0" style="stop-color:#D9D9D9"/>
<stop offset="0.5382" style="stop-color:#B3B3B3"/>
<stop offset="1" style="stop-color:#B3B3B3"/>
</linearGradient>
<rect fill="url(#SVGID_30_)" height="6.053" width="18.918" x="5.541" y="22.032"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="15" x2="15" y1="21.605" y2="23.7331">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="14.9995" x2="14.9995" y1="21.6055" y2="23.7336">
<stop offset="0" style="stop-color:#171717"/>
<stop offset="1" style="stop-color:#2E2E2E"/>
</linearGradient>
-<path d="M24.567,21.585H5.432c-0.209,0-0.381,0.171-0.381,0.383v1.75h19.898v-1.75 C24.949,21.756,24.778,21.585,24.567,21.585z" fill="url(#SVGID_31_)"/>
-<path d="M24.567,21.206H5.432c-0.209,0-0.381,0.17-0.381,0.384v0.378 c0-0.212,0.172-0.383,0.381-0.383h19.136c0.211,0,0.382,0.171,0.382,0.383V21.59C24.949,21.376,24.778,21.206,24.567,21.206z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientTransform="matrix(-1 0 0 -1 -7890.4863 1952.6084)" gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="-7905.4863" x2="-7905.4863" y1="1924.4653" y2="1930.1107">
+<path d="M24.567,21.585H5.432c-0.21,0-0.381,0.171-0.381,0.383v1.75h19.898v-1.75 C24.949,21.756,24.778,21.585,24.567,21.585z" fill="url(#SVGID_31_)"/>
+<path d="M24.567,21.206H5.432c-0.21,0-0.381,0.17-0.381,0.384v0.378c0-0.212,0.171-0.383,0.381-0.383 h19.136c0.211,0,0.382,0.171,0.382,0.383V21.59C24.949,21.376,24.778,21.206,24.567,21.206z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 -7790.2559 1179.5723)" gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="-7805.2559" x2="-7805.2559" y1="1151.4287" y2="1157.0741">
<stop offset="0" style="stop-color:#EDEDED"/>
<stop offset="1" style="stop-color:#BDBDBD"/>
</linearGradient>
@@ -285,29 +284,29 @@
<rect fill="#020202" fill-opacity="0.2" height="0.379" stroke-opacity="0.2" width="13.621" x="8.189" y="25.059"/>
<path d="M17.429,28.084c0,0-6.867-1.039-9.421-4.539 c0,0-1.93,2.648-2.467,1.209C5.813,26.145,8.262,28.136,17.429,28.084z" fill="#050505" fill-opacity="0.05" fill-rule="evenodd" stroke-opacity="0.05"/>
<path d="M17.429,28.084c0,0-6.867-0.282-9.421-3.781 c0,0-1.93,2.27-2.467,0.451C5.813,26.145,8.262,28.136,17.429,28.084z" fill="#050505" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(-1 0 0 -1 -7890.4863 1952.6084)" gradientUnits="userSpaceOnUse" id="SVGID_33_" x1="-7901.6113" x2="-7902.3242" y1="1924.8521" y2="1927.5011">
+<linearGradient gradientTransform="matrix(-1 0 0 -1 -7790.2559 1179.5723)" gradientUnits="userSpaceOnUse" id="SVGID_33_" x1="-7801.3809" x2="-7802.0938" y1="1151.8154" y2="1154.4645">
<stop offset="0" style="stop-color:#FFFFFF"/>
<stop offset="0.0061" style="stop-color:#FFFFFF"/>
<stop offset="1" style="stop-color:#D9D9D9"/>
</linearGradient>
<path d="M17.429,28.084c0,0-6.867-0.06-9.421-3.56 c0,0-1.83,2.256-2.467,0.229C5.813,26.145,8.262,28.136,17.429,28.084z" fill="url(#SVGID_33_)" fill-rule="evenodd"/>
<rect fill="none" height="30" width="30"/>
-<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -249.8076 280.5271)" gradientUnits="userSpaceOnUse" id="SVGID_34_" x1="542.6152" x2="542.6152" y1="533.1255" y2="503.1255">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.2545" style="stop-color:#4F88BD"/>
-<stop offset="0.7333" style="stop-color:#0055A3"/>
-<stop offset="1" style="stop-color:#64AEFB"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -224.75 -299.25)" gradientUnits="userSpaceOnUse" id="SVGID_34_" x1="492.5" x2="492.5" y1="-626.4292" y2="-656.4292">
+<stop offset="0" style="stop-color:#B5BCBF"/>
+<stop offset="0.7091" style="stop-color:#494C4F"/>
+<stop offset="1" style="stop-color:#A8AFB2"/>
</linearGradient>
<path d="M21.5,29c-4.136,0-7.5-3.364-7.5-7.5c0-4.135,3.364-7.5,7.5-7.5c4.135,0,7.5,3.365,7.5,7.5 C29,25.636,25.635,29,21.5,29L21.5,29z" fill="url(#SVGID_34_)"/>
-<radialGradient cx="542.4775" cy="530.1011" gradientTransform="matrix(0.5 0 0 -0.5 -249.8076 280.6384)" gradientUnits="userSpaceOnUse" id="SVGID_35_" r="27.5291">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="0.15" style="stop-color:#96E9FA"/>
-<stop offset="0.7455" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
-</radialGradient>
-<path d="M28.785,21.5c0,4.024-3.263,7.286-7.285,7.286c-4.023,0-7.285-3.262-7.285-7.286 c0-4.023,3.262-7.286,7.285-7.286C25.522,14.214,28.785,17.477,28.785,21.5z" fill="url(#SVGID_35_)"/>
-<path d="M22.518,20.029v-2.035h-5.086v8.138H21.5h1.018h3.051v-6.103H22.518z M21.5,24.098h-3.052V23.08H21.5V24.098z M21.5,22.063h-3.052v-1.018H21.5V22.063z M18.448,20.029v-1.018H21.5v1.018H18.448z M24.552,24.098h-2.034V23.08h2.034V24.098z M24.552,22.063h-2.034v-1.018h2.034V22.063z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M22.518,19.329v-2.034h-5.086v8.137H21.5h1.018h3.051v-6.103H22.518z M21.5,23.397h-3.052v-1.017H21.5 V23.397z M21.5,21.363h-3.052v-1.018H21.5V21.363z M18.448,19.329v-1.018H21.5v1.018H18.448z M24.552,23.397h-2.034v-1.017h2.034 V23.397z M24.552,21.363h-2.034v-1.018h2.034V21.363z" fill="#FFFFFF"/>
-<rect fill-opacity="0.3" height="6.103" stroke-opacity="0.3" width="1.017" x="22.518" y="19.329"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_35_" x1="21.5" x2="21.5" y1="14.4453" y2="28.4458">
+<stop offset="0" style="stop-color:#727678"/>
+<stop offset="0.7394" style="stop-color:#252629"/>
+<stop offset="1" style="stop-color:#494C4F"/>
+</linearGradient>
+<path d="M28.5,21.5c0,3.866-3.135,7-7,7c-3.866,0-7-3.134-7-7c0-3.865,3.134-7,7-7 C25.365,14.5,28.5,17.635,28.5,21.5z" fill="url(#SVGID_35_)"/>
+<polygon fill="#FFFFFF" points="23,18 23,19 25,19 25,20 23,20 23,21 25,21 25,22 23,22 23,25 26,25 26,18 "/>
+<path d="M17,18v7h2v-2h2v2h1v-9L17,18z M19,22h-1v-1h1V22z M19,20h-1v-1h1V20z M21,22h-1v-1h1V22z M21,20h-1v-1h1V20 z" fill="#FFFFFF"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="2" x="17" y="25"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="5" x="21" y="25"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="2" x="19" y="23"/>
</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_group.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_group.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
<stop offset="0" style="stop-color:#A7E722"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
<stop offset="0" style="stop-color:#A7E722"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_home.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_home.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
<stop offset="0" style="stop-color:#A7E722"/>
@@ -31,9 +31,8 @@
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
-<polygon fill="none" points="0,8 0,25.294 0,30 30,30 30,25.294 30,8 30,0 0,0 "/>
-<path d="M21.5,30c-2.037,0-3.986-0.729-5.531-2.059H2.647C1.188,27.941,0,26.754,0,25.294V8 c0-1.295,0.936-2.376,2.167-2.603c0.436-1.91,2.147-3.339,4.187-3.339h0.822c2.024,0,3.727,1.407,4.178,3.295h15.999 C28.813,5.354,30,6.541,30,8v17.294c0,1.46-1.188,2.647-2.647,2.647h-0.321C25.486,29.271,23.537,30,21.5,30L21.5,30z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="6.1143" y2="26.7021">
+<path d="M21.5,30c-2.038,0-3.986-0.729-5.531-2.059H2.647C1.188,27.941,0,26.754,0,25.294V8 c0-1.295,0.936-2.376,2.167-2.603c0.436-1.91,2.147-3.339,4.188-3.339h0.822c2.023,0,3.725,1.407,4.177,3.295h15.999 C28.813,5.354,30,6.541,30,8v17.294c0,1.46-1.188,2.647-2.647,2.647h-0.321C25.485,29.271,23.537,30,21.5,30L21.5,30z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="14.9995" x2="14.9995" y1="6.1143" y2="26.7026">
<stop offset="0" style="stop-color:#D1D7D9"/>
<stop offset="0.0667" style="stop-color:#D1D7D9"/>
<stop offset="0.2606" style="stop-color:#BDC2C4"/>
@@ -42,115 +41,115 @@
<stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M29,25.294c0,0.909-0.738,1.647-1.647,1.647H2.647C1.738,26.941,1,26.203,1,25.294V8 c0-0.908,0.738-1.646,1.647-1.646h24.705C28.262,6.354,29,7.092,29,8V25.294z" fill="url(#SVGID_1__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="6.1143" y2="26.7021">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.9995" x2="14.9995" y1="6.1143" y2="26.7026">
<stop offset="0" style="stop-color:#E4EBED"/>
<stop offset="0.0667" style="stop-color:#E4EBED"/>
<stop offset="0.2606" style="stop-color:#D6DCDE"/>
<stop offset="0.6606" style="stop-color:#B2BEC2"/>
<stop offset="1" style="stop-color:#ADB3B5"/>
</linearGradient>
-<path d="M27.353,6.354H2.647C1.738,6.354,1,7.092,1,8v17.294c0,0.909,0.738,1.647,1.647,1.647 c-0.682,0-1.235-0.554-1.235-1.236v-0.411V8.412V8c0-0.682,0.554-1.235,1.235-1.235h24.705c0.683,0,1.235,0.554,1.235,1.235v0.412 v16.882v0.411c0,0.683-0.553,1.236-1.235,1.236c0.909,0,1.647-0.738,1.647-1.647V8C29,7.092,28.262,6.354,27.353,6.354z" fill="url(#SVGID_2__)"/>
+<path d="M27.353,6.354H2.647C1.738,6.354,1,7.092,1,8v17.294c0,0.909,0.738,1.647,1.647,1.647 c-0.682,0-1.234-0.554-1.234-1.236v-0.411V8.412V8c0-0.682,0.553-1.235,1.234-1.235h24.705c0.682,0,1.234,0.554,1.234,1.235v0.412 v16.882v0.411c0,0.683-0.553,1.236-1.234,1.236c0.909,0,1.647-0.738,1.647-1.647V8C29,7.092,28.262,6.354,27.353,6.354z" fill="url(#SVGID_2__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="24.4707" x2="24.4707" y1="20.7725" y2="24.0876">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
-<path d="M23.647,24.058c-0.454,0-0.823-0.368-0.823-0.822v-1.646 c0-0.455,0.369-0.824,0.823-0.824h1.647c0.455,0,0.823,0.369,0.823,0.824v1.646c0,0.454-0.368,0.822-0.823,0.822H23.647z" fill="url(#SVGID_3__)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="24.4707" x2="24.4707" y1="21.146" y2="23.7092">
+<path d="M23.647,24.058c-0.455,0-0.824-0.368-0.824-0.822v-1.646 c0-0.455,0.369-0.824,0.824-0.824h1.646c0.457,0,0.824,0.369,0.824,0.824v1.646c0,0.454-0.367,0.822-0.824,0.822H23.647z" fill="url(#SVGID_3__)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="24.4707" x2="24.4707" y1="21.1465" y2="23.7097">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
<stop offset="0.6606" style="stop-color:#474B4D"/>
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
-<path d="M25.705,23.235c0,0.228-0.184,0.411-0.41,0.411h-1.647c-0.228,0-0.411-0.184-0.411-0.411v-1.646 c0-0.229,0.184-0.412,0.411-0.412h1.647c0.227,0,0.41,0.183,0.41,0.412V23.235z" fill="url(#SVGID_4__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="19.9424" x2="19.9424" y1="20.7324" y2="24.1276">
+<path d="M25.705,23.235c0,0.228-0.184,0.411-0.411,0.411h-1.646c-0.229,0-0.412-0.184-0.412-0.411v-1.646 c0-0.229,0.184-0.412,0.412-0.412h1.646c0.228,0,0.411,0.183,0.411,0.412V23.235z" fill="url(#SVGID_4__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="19.9414" x2="19.9414" y1="20.7324" y2="24.1276">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
-<path d="M19.118,24.058c-0.454,0-0.823-0.368-0.823-0.822v-1.646 c0-0.455,0.369-0.824,0.823-0.824h1.646c0.455,0,0.826,0.369,0.826,0.824v1.646c0,0.454-0.371,0.822-0.826,0.822H19.118z" fill="url(#SVGID_5_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="19.9404" x2="19.9404" y1="21.146" y2="23.7092">
+<path d="M19.118,24.058c-0.455,0-0.824-0.368-0.824-0.822v-1.646 c0-0.455,0.369-0.824,0.824-0.824h1.646c0.453,0,0.824,0.369,0.824,0.824v1.646c0,0.454-0.371,0.822-0.824,0.822H19.118z" fill="url(#SVGID_5_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="19.9414" x2="19.9414" y1="21.1465" y2="23.7097">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
<stop offset="0.6606" style="stop-color:#474B4D"/>
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
-<path d="M21.176,23.235c0,0.228-0.184,0.411-0.412,0.411h-1.646c-0.228,0-0.413-0.184-0.413-0.411v-1.646 c0-0.229,0.186-0.412,0.413-0.412h1.646c0.229,0,0.412,0.183,0.412,0.412V23.235z" fill="url(#SVGID_6_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="15.4121" x2="15.4121" y1="20.7324" y2="24.0876">
+<path d="M21.177,23.235c0,0.228-0.185,0.411-0.412,0.411h-1.646c-0.228,0-0.412-0.184-0.412-0.411v-1.646 c0-0.229,0.185-0.412,0.412-0.412h1.646c0.228,0,0.412,0.183,0.412,0.412V23.235z" fill="url(#SVGID_6_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="15.4126" x2="15.4126" y1="20.7324" y2="24.0876">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
-<path d="M14.588,24.058c-0.453,0-0.822-0.368-0.822-0.822v-1.646 c0-0.455,0.369-0.824,0.822-0.824h1.646c0.455,0,0.825,0.369,0.825,0.824v1.646c0,0.454-0.37,0.822-0.825,0.822H14.588z" fill="url(#SVGID_7_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="15.4121" x2="15.4121" y1="21.146" y2="23.7092">
+<path d="M14.587,24.058c-0.452,0-0.821-0.368-0.821-0.822v-1.646 c0-0.455,0.369-0.824,0.821-0.824h1.647c0.454,0,0.825,0.369,0.825,0.824v1.646c0,0.454-0.371,0.822-0.825,0.822H14.587z" fill="url(#SVGID_7_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="15.4116" x2="15.4116" y1="21.1465" y2="23.7097">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
<stop offset="0.6606" style="stop-color:#474B4D"/>
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
-<path d="M16.647,23.235c0,0.228-0.185,0.411-0.413,0.411h-1.646c-0.228,0-0.412-0.184-0.412-0.411v-1.646 c0-0.229,0.185-0.412,0.412-0.412h1.646c0.229,0,0.413,0.183,0.413,0.412V23.235z" fill="url(#SVGID_8_)"/>
-<path d="M25.295,19.942h-1.647c-0.454,0-0.823-0.369-0.823-0.825v0.412 c0,0.455,0.369,0.824,0.823,0.824h1.647c0.455,0,0.823-0.369,0.823-0.824v-0.412C26.118,19.573,25.75,19.942,25.295,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M16.647,23.235c0,0.228-0.184,0.411-0.413,0.411h-1.647c-0.227,0-0.41-0.184-0.41-0.411v-1.646 c0-0.229,0.184-0.412,0.41-0.412h1.647c0.229,0,0.413,0.183,0.413,0.412V23.235z" fill="url(#SVGID_8_)"/>
+<path d="M25.294,19.942h-1.646c-0.455,0-0.824-0.369-0.824-0.825v0.412 c0,0.455,0.369,0.824,0.824,0.824h1.646c0.457,0,0.824-0.369,0.824-0.824v-0.412C26.118,19.573,25.751,19.942,25.294,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="24.4707" x2="24.4707" y1="16.6553" y2="19.9724">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
-<path d="M23.647,19.942c-0.454,0-0.823-0.369-0.823-0.825V17.47 c0-0.452,0.369-0.822,0.823-0.822h1.647c0.455,0,0.823,0.37,0.823,0.822v1.647c0,0.456-0.368,0.825-0.823,0.825H23.647z" fill="url(#SVGID_9_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="24.4707" x2="24.4707" y1="17.0278" y2="19.592">
+<path d="M23.647,19.942c-0.455,0-0.824-0.369-0.824-0.825V17.47 c0-0.452,0.369-0.822,0.824-0.822h1.646c0.457,0,0.824,0.37,0.824,0.822v1.647c0,0.456-0.367,0.825-0.824,0.825H23.647z" fill="url(#SVGID_9_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="24.4707" x2="24.4707" y1="17.0283" y2="19.5925">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
<stop offset="0.6606" style="stop-color:#474B4D"/>
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
-<path d="M25.705,19.117c0,0.229-0.184,0.412-0.41,0.412h-1.647c-0.228,0-0.411-0.184-0.411-0.412V17.47 c0-0.226,0.184-0.411,0.411-0.411h1.647c0.227,0,0.41,0.186,0.41,0.411V19.117z" fill="url(#SVGID_10_)"/>
-<path d="M20.764,19.942h-1.646c-0.454,0-0.823-0.369-0.823-0.825v0.412 c0,0.455,0.369,0.824,0.823,0.824h1.646c0.455,0,0.826-0.369,0.826-0.824v-0.412C21.59,19.573,21.219,19.942,20.764,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="19.9424" x2="19.9424" y1="16.6152" y2="20.0124">
+<path d="M25.705,19.117c0,0.229-0.184,0.412-0.411,0.412h-1.646c-0.229,0-0.412-0.184-0.412-0.412V17.47 c0-0.226,0.184-0.411,0.412-0.411h1.646c0.228,0,0.411,0.186,0.411,0.411V19.117z" fill="url(#SVGID_10_)"/>
+<path d="M20.765,19.942h-1.646c-0.455,0-0.824-0.369-0.824-0.825v0.412 c0,0.455,0.369,0.824,0.824,0.824h1.646c0.453,0,0.824-0.369,0.824-0.824v-0.412C21.589,19.573,21.218,19.942,20.765,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="19.9414" x2="19.9414" y1="16.6152" y2="20.0124">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
-<path d="M19.118,19.942c-0.454,0-0.823-0.369-0.823-0.825V17.47 c0-0.452,0.369-0.822,0.823-0.822h1.646c0.455,0,0.826,0.37,0.826,0.822v1.647c0,0.456-0.371,0.825-0.826,0.825H19.118z" fill="url(#SVGID_11_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="19.9404" x2="19.9404" y1="17.0278" y2="19.592">
+<path d="M19.118,19.942c-0.455,0-0.824-0.369-0.824-0.825V17.47 c0-0.452,0.369-0.822,0.824-0.822h1.646c0.453,0,0.824,0.37,0.824,0.822v1.647c0,0.456-0.371,0.825-0.824,0.825H19.118z" fill="url(#SVGID_11_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="19.9414" x2="19.9414" y1="17.0283" y2="19.5925">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
<stop offset="0.6606" style="stop-color:#474B4D"/>
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
-<path d="M21.176,19.117c0,0.229-0.184,0.412-0.412,0.412h-1.646c-0.228,0-0.413-0.184-0.413-0.412V17.47 c0-0.226,0.186-0.411,0.413-0.411h1.646c0.229,0,0.412,0.186,0.412,0.411V19.117z" fill="url(#SVGID_12_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="15.4121" x2="15.4121" y1="16.6152" y2="19.9724">
+<path d="M21.177,19.117c0,0.229-0.185,0.412-0.412,0.412h-1.646c-0.228,0-0.412-0.184-0.412-0.412V17.47 c0-0.226,0.185-0.411,0.412-0.411h1.646c0.228,0,0.412,0.186,0.412,0.411V19.117z" fill="url(#SVGID_12_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="15.4126" x2="15.4126" y1="16.6152" y2="19.9724">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
-<path d="M14.588,19.942c-0.453,0-0.822-0.369-0.822-0.825V17.47 c0-0.452,0.369-0.822,0.822-0.822h1.646c0.455,0,0.825,0.37,0.825,0.822v1.647c0,0.456-0.37,0.825-0.825,0.825H14.588z" fill="url(#SVGID_13_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M16.234,19.942h-1.646c-0.453,0-0.822-0.369-0.822-0.825v0.412 c0,0.455,0.369,0.824,0.822,0.824h1.646c0.455,0,0.825-0.369,0.825-0.824v-0.412C17.06,19.573,16.689,19.942,16.234,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="15.4121" x2="15.4121" y1="17.0278" y2="19.592">
+<path d="M14.587,19.942c-0.452,0-0.821-0.369-0.821-0.825V17.47 c0-0.452,0.369-0.822,0.821-0.822h1.647c0.454,0,0.825,0.37,0.825,0.822v1.647c0,0.456-0.371,0.825-0.825,0.825H14.587z" fill="url(#SVGID_13_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M16.234,19.942h-1.647c-0.452,0-0.821-0.369-0.821-0.825v0.412 c0,0.455,0.369,0.824,0.821,0.824h1.647c0.454,0,0.825-0.369,0.825-0.824v-0.412C17.06,19.573,16.688,19.942,16.234,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="15.4116" x2="15.4116" y1="17.0283" y2="19.5925">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
<stop offset="0.6606" style="stop-color:#474B4D"/>
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
-<path d="M16.647,19.117c0,0.229-0.185,0.412-0.413,0.412h-1.646c-0.228,0-0.412-0.184-0.412-0.412V17.47 c0-0.226,0.185-0.411,0.412-0.411h1.646c0.229,0,0.413,0.186,0.413,0.411V19.117z" fill="url(#SVGID_14_)"/>
-<path d="M25.295,15.822h-1.647c-0.454,0-0.823-0.369-0.823-0.822v0.411 c0,0.455,0.369,0.824,0.823,0.824h1.647c0.455,0,0.823-0.369,0.823-0.824V15C26.118,15.453,25.75,15.822,25.295,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M16.647,19.117c0,0.229-0.184,0.412-0.413,0.412h-1.647c-0.227,0-0.41-0.184-0.41-0.412V17.47 c0-0.226,0.184-0.411,0.41-0.411h1.647c0.229,0,0.413,0.186,0.413,0.411V19.117z" fill="url(#SVGID_14_)"/>
+<path d="M25.294,15.822h-1.646c-0.455,0-0.824-0.369-0.824-0.822v0.411 c0,0.455,0.369,0.824,0.824,0.824h1.646c0.457,0,0.824-0.369,0.824-0.824V15C26.118,15.453,25.751,15.822,25.294,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="24.4707" x2="24.4707" y1="12.5381" y2="15.8522">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
-<path d="M23.647,15.822c-0.454,0-0.823-0.369-0.823-0.822v-1.647 c0-0.452,0.369-0.822,0.823-0.822h1.647c0.455,0,0.823,0.37,0.823,0.822V15c0,0.453-0.368,0.822-0.823,0.822H23.647z" fill="url(#SVGID_15_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M23.647,15.822c-0.455,0-0.824-0.369-0.824-0.822v-1.647 c0-0.452,0.369-0.822,0.824-0.822h1.646c0.457,0,0.824,0.37,0.824,0.822V15c0,0.453-0.367,0.822-0.824,0.822H23.647z" fill="url(#SVGID_15_)" fill-opacity="0.8" stroke-opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="24.4707" x2="24.4707" y1="12.9106" y2="15.4738">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
@@ -158,49 +157,49 @@
<stop offset="0.6606" style="stop-color:#474B4D"/>
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
-<path d="M25.705,15c0,0.228-0.184,0.411-0.41,0.411h-1.647c-0.228,0-0.411-0.184-0.411-0.411v-1.647 c0-0.228,0.184-0.411,0.411-0.411h1.647c0.227,0,0.41,0.184,0.41,0.411V15z" fill="url(#SVGID_16_)"/>
-<path d="M20.764,15.822h-1.646c-0.454,0-0.823-0.369-0.823-0.822v0.411 c0,0.455,0.369,0.824,0.823,0.824h1.646c0.455,0,0.826-0.369,0.826-0.824V15C21.59,15.453,21.219,15.822,20.764,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="19.9424" x2="19.9424" y1="12.498" y2="15.8922">
+<path d="M25.705,15c0,0.228-0.184,0.411-0.411,0.411h-1.646c-0.229,0-0.412-0.184-0.412-0.411v-1.647 c0-0.228,0.184-0.411,0.412-0.411h1.646c0.228,0,0.411,0.184,0.411,0.411V15z" fill="url(#SVGID_16_)"/>
+<path d="M20.765,15.822h-1.646c-0.455,0-0.824-0.369-0.824-0.822v0.411 c0,0.455,0.369,0.824,0.824,0.824h1.646c0.453,0,0.824-0.369,0.824-0.824V15C21.589,15.453,21.218,15.822,20.765,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="19.9414" x2="19.9414" y1="12.498" y2="15.8922">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
-<path d="M19.118,15.822c-0.454,0-0.823-0.369-0.823-0.822v-1.647 c0-0.452,0.369-0.822,0.823-0.822h1.646c0.455,0,0.826,0.37,0.826,0.822V15c0,0.453-0.371,0.822-0.826,0.822H19.118z" fill="url(#SVGID_17_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="19.9404" x2="19.9404" y1="12.9106" y2="15.4738">
+<path d="M19.118,15.822c-0.455,0-0.824-0.369-0.824-0.822v-1.647 c0-0.452,0.369-0.822,0.824-0.822h1.646c0.453,0,0.824,0.37,0.824,0.822V15c0,0.453-0.371,0.822-0.824,0.822H19.118z" fill="url(#SVGID_17_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="19.9414" x2="19.9414" y1="12.9106" y2="15.4738">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
<stop offset="0.6606" style="stop-color:#474B4D"/>
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
-<path d="M21.176,15c0,0.228-0.184,0.411-0.412,0.411h-1.646c-0.228,0-0.413-0.184-0.413-0.411v-1.647 c0-0.228,0.186-0.411,0.413-0.411h1.646c0.229,0,0.412,0.184,0.412,0.411V15z" fill="url(#SVGID_18_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="15.4121" x2="15.4121" y1="12.498" y2="15.8522">
+<path d="M21.177,15c0,0.228-0.185,0.411-0.412,0.411h-1.646c-0.228,0-0.412-0.184-0.412-0.411v-1.647 c0-0.228,0.185-0.411,0.412-0.411h1.646c0.228,0,0.412,0.184,0.412,0.411V15z" fill="url(#SVGID_18_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="15.4126" x2="15.4126" y1="12.498" y2="15.8522">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
-<path d="M14.588,15.822c-0.453,0-0.822-0.369-0.822-0.822v-1.647 c0-0.452,0.369-0.822,0.822-0.822h1.646c0.455,0,0.825,0.37,0.825,0.822V15c0,0.453-0.37,0.822-0.825,0.822H14.588z" fill="url(#SVGID_19_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M16.234,15.822h-1.646c-0.453,0-0.822-0.369-0.822-0.822v0.411 c0,0.455,0.369,0.824,0.822,0.824h1.646c0.455,0,0.825-0.369,0.825-0.824V15C17.06,15.453,16.689,15.822,16.234,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="15.4121" x2="15.4121" y1="12.9106" y2="15.4738">
+<path d="M14.587,15.822c-0.452,0-0.821-0.369-0.821-0.822v-1.647 c0-0.452,0.369-0.822,0.821-0.822h1.647c0.454,0,0.825,0.37,0.825,0.822V15c0,0.453-0.371,0.822-0.825,0.822H14.587z" fill="url(#SVGID_19_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M16.234,15.822h-1.647c-0.452,0-0.821-0.369-0.821-0.822v0.411 c0,0.455,0.369,0.824,0.821,0.824h1.647c0.454,0,0.825-0.369,0.825-0.824V15C17.06,15.453,16.688,15.822,16.234,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="15.4116" x2="15.4116" y1="12.9106" y2="15.4738">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
<stop offset="0.6606" style="stop-color:#474B4D"/>
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
-<path d="M16.647,15c0,0.228-0.185,0.411-0.413,0.411h-1.646c-0.228,0-0.412-0.184-0.412-0.411v-1.647 c0-0.228,0.185-0.411,0.412-0.411h1.646c0.229,0,0.413,0.184,0.413,0.411V15z" fill="url(#SVGID_20_)"/>
+<path d="M16.647,15c0,0.228-0.184,0.411-0.413,0.411h-1.647c-0.227,0-0.41-0.184-0.41-0.411v-1.647 c0-0.228,0.184-0.411,0.41-0.411h1.647c0.229,0,0.413,0.184,0.413,0.411V15z" fill="url(#SVGID_20_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="19.9434" x2="19.9434" y1="7.5977" y2="11.732">
<stop offset="0" style="stop-color:#686C6E"/>
<stop offset="1" style="stop-color:#E4EEF2"/>
</linearGradient>
-<path d="M13.354,11.705c-0.453,0-0.824-0.374-0.824-0.832v-2.45 c0-0.461,0.371-0.834,0.824-0.834h13.181c0.454,0,0.823,0.373,0.823,0.834v2.45c0,0.458-0.369,0.832-0.823,0.832H13.354z" fill="url(#SVGID_21_)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="19.9414" x2="19.9414" y1="8.0195" y2="11.3512">
+<path d="M13.354,11.705c-0.454,0-0.825-0.374-0.825-0.832v-2.45 c0-0.461,0.371-0.834,0.825-0.834h13.181c0.454,0,0.823,0.373,0.823,0.834v2.45c0,0.458-0.369,0.832-0.823,0.832H13.354z" fill="url(#SVGID_21_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="19.9424" x2="19.9424" y1="8.0195" y2="11.3512">
<stop offset="0" style="stop-color:#171717"/>
<stop offset="1" style="stop-color:#2E2E2E"/>
</linearGradient>
-<path d="M26.941,10.873c0,0.229-0.183,0.416-0.41,0.416H13.354c-0.227,0-0.412-0.187-0.412-0.416v-2.45 c0-0.23,0.186-0.417,0.412-0.417h13.178c0.228,0,0.41,0.187,0.41,0.417V10.873z" fill="url(#SVGID_22_)"/>
+<path d="M26.942,10.873c0,0.229-0.184,0.416-0.412,0.416H13.354c-0.227,0-0.411-0.187-0.411-0.416v-2.45 c0-0.23,0.185-0.417,0.411-0.417H26.53c0.229,0,0.412,0.187,0.412,0.417V10.873z" fill="url(#SVGID_22_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="19.9424" x2="19.9424" y1="3.9609" y2="12.5901">
<stop offset="0" style="stop-color:#45E8FF"/>
<stop offset="0.1455" style="stop-color:#45E8FF"/>
@@ -208,7 +207,7 @@
<stop offset="0.8727" style="stop-color:#1347BA"/>
<stop offset="1" style="stop-color:#1C65C3"/>
</linearGradient>
-<rect fill="url(#SVGID_23_)" height="2.45" width="13.178" x="13.354" y="8.423"/>
+<rect fill="url(#SVGID_23_)" height="2.45" width="13.177" x="13.354" y="8.423"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="19.9424" x2="19.9424" y1="5.6362" y2="11.6377">
<stop offset="0" style="stop-color:#45E8FF"/>
<stop offset="0.1455" style="stop-color:#45E8FF"/>
@@ -216,51 +215,51 @@
<stop offset="0.8727" style="stop-color:#1347BA"/>
<stop offset="1" style="stop-color:#1C65C3"/>
</linearGradient>
-<polygon fill="url(#SVGID_24_)" points="13.354,9.51 26.531,8.807 26.531,8.412 13.354,8.412 "/>
-<path d="M2.234,21.177c0,2.27,1.849,4.117,4.119,4.117h0.822c2.27,0,4.119-1.848,4.119-4.117V6.354 h-6.59H2.647c-0.147,0-0.277,0.046-0.413,0.083V21.177z" fill="#050505" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M6.354,24.883h0.822c2.045,0,3.706-1.662,3.706-3.706V6.354H4.705H2.647v14.823 C2.647,23.221,4.31,24.883,6.354,24.883z" fill="#050505" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="6.7656" x2="6.7656" y1="3.1465" y2="24.8746">
+<polygon fill="url(#SVGID_24_)" points="13.354,9.51 26.53,8.807 26.53,8.412 13.354,8.412 "/>
+<path d="M2.234,21.177c0,2.27,1.849,4.117,4.12,4.117h0.822c2.27,0,4.117-1.848,4.117-4.117V6.354 H4.706H2.647c-0.147,0-0.277,0.046-0.413,0.083V21.177z" fill="#050505" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M6.354,24.883h0.822c2.043,0,3.705-1.662,3.705-3.706V6.354H4.706H2.647v14.823 C2.647,23.221,4.31,24.883,6.354,24.883z" fill="#050505" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="6.7656" x2="6.7656" y1="3.1465" y2="24.8751">
<stop offset="0" style="stop-color:#727678"/>
<stop offset="0.7394" style="stop-color:#252629"/>
<stop offset="1" style="stop-color:#494C4F"/>
</linearGradient>
-<path d="M10.471,21.177c0,1.819-1.474,3.294-3.295,3.294H6.354c-1.82,0-3.294-1.475-3.294-3.294V6.354 c0-1.819,1.474-3.295,3.294-3.295h0.822c1.821,0,3.295,1.476,3.295,3.295V21.177z" fill="url(#SVGID_25_)"/>
+<path d="M10.472,21.177c0,1.819-1.475,3.294-3.295,3.294H6.354c-1.82,0-3.295-1.475-3.295-3.294V6.354 c0-1.819,1.475-3.295,3.295-3.295h0.822c1.82,0,3.295,1.476,3.295,3.295V21.177z" fill="url(#SVGID_25_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="6.7656" x2="6.7656" y1="3.082" y2="8.9318">
<stop offset="0" style="stop-color:#B5BCBF"/>
<stop offset="1" style="stop-color:#494C4F"/>
</linearGradient>
-<path d="M7.176,3.059H6.354c-1.82,0-3.294,1.476-3.294,3.295v2.47c0-1.819,1.474-3.295,3.294-3.295h0.822 c1.821,0,3.295,1.476,3.295,3.295v-2.47C10.471,4.534,8.997,3.059,7.176,3.059z" fill="url(#SVGID_26_)"/>
+<path d="M7.177,3.059H6.354c-1.82,0-3.295,1.476-3.295,3.295v2.47c0-1.819,1.475-3.295,3.295-3.295h0.822 c1.82,0,3.295,1.476,3.295,3.295v-2.47C10.472,4.534,8.997,3.059,7.177,3.059z" fill="url(#SVGID_26_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="6.7656" x2="6.7656" y1="3.0688" y2="7.2577">
<stop offset="0" style="stop-color:#D5DDE0"/>
<stop offset="1" style="stop-color:#494C4F"/>
</linearGradient>
-<path d="M7.176,3.059H6.354c-1.82,0-3.294,1.476-3.294,3.295v0.411c0-1.818,1.474-3.295,3.294-3.295h0.822 c1.821,0,3.295,1.477,3.295,3.295V6.354C10.471,4.534,8.997,3.059,7.176,3.059z" fill="url(#SVGID_27_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="6.7637" x2="6.7637" y1="2.7354" y2="24.6079">
+<path d="M7.177,3.059H6.354c-1.82,0-3.295,1.476-3.295,3.295v0.411c0-1.818,1.475-3.295,3.295-3.295h0.822 c1.82,0,3.295,1.477,3.295,3.295V6.354C10.472,4.534,8.997,3.059,7.177,3.059z" fill="url(#SVGID_27_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="6.7646" x2="6.7646" y1="2.7354" y2="24.6086">
<stop offset="0" style="stop-color:#A0A7A8"/>
<stop offset="0.7576" style="stop-color:#252629"/>
<stop offset="1" style="stop-color:#1F2021"/>
</linearGradient>
-<path d="M7.176,5.528H6.354c-0.438,0-0.855,0.087-1.235,0.244V22H8.41V5.772 C8.03,5.615,7.613,5.528,7.176,5.528z" fill="url(#SVGID_28_)"/>
+<path d="M7.177,5.528H6.354c-0.439,0-0.855,0.087-1.236,0.244V22h3.293V5.772 C8.03,5.615,7.614,5.528,7.177,5.528z" fill="url(#SVGID_28_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="6.7656" x2="6.7656" y1="18.7295" y2="24.5792">
<stop offset="0" style="stop-color:#252629"/>
<stop offset="1" style="stop-color:#5A5D61"/>
</linearGradient>
-<path d="M7.176,22H6.354c-1.82,0-3.294-1.476-3.294-3.294v2.471c0,1.819,1.474,3.294,3.294,3.294h0.822 c1.821,0,3.295-1.475,3.295-3.294v-2.471C10.471,20.524,8.997,22,7.176,22z" fill="url(#SVGID_29_)"/>
+<path d="M7.177,22H6.354c-1.82,0-3.295-1.476-3.295-3.294v2.471c0,1.819,1.475,3.294,3.295,3.294h0.822 c1.82,0,3.295-1.475,3.295-3.294v-2.471C10.472,20.524,8.997,22,7.177,22z" fill="url(#SVGID_29_)"/>
<rect fill="none" height="30" width="30"/>
-<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -281.6006 280.5271)" gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="606.2012" x2="606.2012" y1="533.1255" y2="503.1255">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.2545" style="stop-color:#4F88BD"/>
-<stop offset="0.7333" style="stop-color:#0055A3"/>
-<stop offset="1" style="stop-color:#64AEFB"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -224.75 -299.25)" gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="492.5" x2="492.5" y1="-626.4292" y2="-656.4292">
+<stop offset="0" style="stop-color:#FFE1A3"/>
+<stop offset="0.297" style="stop-color:#FFE1A3"/>
+<stop offset="0.6667" style="stop-color:#AD4C01"/>
+<stop offset="1" style="stop-color:#FFE1A3"/>
</linearGradient>
<path d="M21.5,29c-4.137,0-7.5-3.363-7.5-7.5c0-4.135,3.363-7.5,7.5-7.5c4.136,0,7.5,3.365,7.5,7.5 C29,25.637,25.636,29,21.5,29L21.5,29z" fill="url(#SVGID_30_)"/>
-<radialGradient cx="673.1133" cy="963.3052" gradientTransform="matrix(0.4708 0 0 -0.4709 -295.4703 469.2089)" gradientUnits="userSpaceOnUse" id="SVGID_31_" r="29.24">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="0.15" style="stop-color:#96E9FA"/>
-<stop offset="0.7455" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
-</radialGradient>
-<path d="M28.786,21.5c0,4.024-3.264,7.286-7.286,7.286c-4.024,0-7.285-3.262-7.285-7.286 c0-4.022,3.261-7.286,7.285-7.286C25.522,14.214,28.786,17.478,28.786,21.5z" fill="url(#SVGID_31_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="21.501" x2="21.501" y1="14.4502" y2="28.2501">
+<stop offset="0" style="stop-color:#FFC144"/>
+<stop offset="0.297" style="stop-color:#FFC144"/>
+<stop offset="0.6667" style="stop-color:#EF6902"/>
+<stop offset="1" style="stop-color:#FEB037"/>
+</linearGradient>
+<path d="M28.501,21.5c0,3.866-3.137,7-7.001,7c-3.866,0-6.999-3.134-6.999-7c0-3.864,3.133-7,6.999-7 C25.364,14.5,28.501,17.636,28.501,21.5z" fill="url(#SVGID_31_)"/>
<polygon fill-opacity="0.3" points="25.703,22.889 21.499,18.435 17.297,22.889 16.658,22.209 21.499,17.077 26.342,22.209 25.703,22.889 " stroke-opacity="0.3"/>
<polygon fill-opacity="0.3" points="21.5,19.845 17.627,23.951 17.627,25.793 20.531,25.793 20.531,22.889 22.469,22.889 22.469,25.793 25.373,25.793 25.373,23.95 " stroke-opacity="0.3"/>
<polygon fill="#FFFFFF" points="25.703,22.188 21.499,17.734 17.297,22.188 16.658,21.51 21.499,16.377 26.342,21.51 25.703,22.188 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_work.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_work.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
<stop offset="0" style="stop-color:#A7E722"/>
@@ -31,9 +31,8 @@
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
-<polygon fill="none" points="0,8 0,25.294 0,30 30,30 30,25.294 30,8 30,0 0,0 "/>
-<path d="M21.5,30c-2.037,0-3.985-0.729-5.53-2.059H2.647C1.188,27.941,0,26.754,0,25.294V8 c0-1.295,0.936-2.376,2.167-2.603c0.436-1.91,2.147-3.339,4.188-3.339h0.822c2.023,0,3.725,1.407,4.177,3.295h15.999 C28.813,5.354,30,6.541,30,8v17.294c0,1.46-1.188,2.647-2.647,2.647H27.03C25.485,29.271,23.536,30,21.5,30L21.5,30z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="6.1143" y2="26.7021">
+<path d="M21.5,30c-2.037,0-3.985-0.729-5.531-2.059H2.647C1.188,27.941,0,26.754,0,25.294V8 c0-1.295,0.936-2.376,2.167-2.603c0.436-1.91,2.147-3.339,4.187-3.339h0.822c2.024,0,3.727,1.407,4.178,3.295h15.999 C28.813,5.354,30,6.541,30,8v17.294c0,1.46-1.188,2.647-2.647,2.647H27.03C25.484,29.271,23.537,30,21.5,30L21.5,30z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="14.9995" x2="14.9995" y1="6.1143" y2="26.7026">
<stop offset="0" style="stop-color:#D1D7D9"/>
<stop offset="0.0667" style="stop-color:#D1D7D9"/>
<stop offset="0.2606" style="stop-color:#BDC2C4"/>
@@ -42,115 +41,115 @@
<stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M29,25.294c0,0.909-0.738,1.647-1.647,1.647H2.647C1.738,26.941,1,26.203,1,25.294V8 c0-0.908,0.738-1.646,1.647-1.646h24.705C28.262,6.354,29,7.092,29,8V25.294z" fill="url(#SVGID_1__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="6.1143" y2="26.7021">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.9995" x2="14.9995" y1="6.1143" y2="26.7026">
<stop offset="0" style="stop-color:#E4EBED"/>
<stop offset="0.0667" style="stop-color:#E4EBED"/>
<stop offset="0.2606" style="stop-color:#D6DCDE"/>
<stop offset="0.6606" style="stop-color:#B2BEC2"/>
<stop offset="1" style="stop-color:#ADB3B5"/>
</linearGradient>
-<path d="M27.353,6.354H2.647C1.738,6.354,1,7.092,1,8v17.294c0,0.909,0.738,1.647,1.647,1.647 c-0.682,0-1.234-0.554-1.234-1.236v-0.411V8.412V8c0-0.682,0.553-1.235,1.234-1.235h24.705c0.682,0,1.234,0.554,1.234,1.235v0.412 v16.882v0.411c0,0.683-0.553,1.236-1.234,1.236c0.909,0,1.647-0.738,1.647-1.647V8C29,7.092,28.262,6.354,27.353,6.354z" fill="url(#SVGID_2__)"/>
+<path d="M27.353,6.354H2.647C1.738,6.354,1,7.092,1,8v17.294c0,0.909,0.738,1.647,1.647,1.647 c-0.682,0-1.235-0.554-1.235-1.236v-0.411V8.412V8c0-0.682,0.554-1.235,1.235-1.235h24.705c0.683,0,1.235,0.554,1.235,1.235v0.412 v16.882v0.411c0,0.683-0.553,1.236-1.235,1.236c0.909,0,1.647-0.738,1.647-1.647V8C29,7.092,28.262,6.354,27.353,6.354z" fill="url(#SVGID_2__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="24.4707" x2="24.4707" y1="20.7725" y2="24.0876">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
-<path d="M23.647,24.058c-0.455,0-0.824-0.368-0.824-0.822v-1.646 c0-0.455,0.369-0.824,0.824-0.824h1.646c0.457,0,0.824,0.369,0.824,0.824v1.646c0,0.454-0.367,0.822-0.824,0.822H23.647z" fill="url(#SVGID_3__)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="24.4707" x2="24.4707" y1="21.146" y2="23.7092">
+<path d="M23.647,24.058c-0.454,0-0.823-0.368-0.823-0.822v-1.646 c0-0.455,0.369-0.824,0.823-0.824h1.647c0.455,0,0.823,0.369,0.823,0.824v1.646c0,0.454-0.368,0.822-0.823,0.822H23.647z" fill="url(#SVGID_3__)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="24.4707" x2="24.4707" y1="21.1465" y2="23.7097">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
<stop offset="0.6606" style="stop-color:#474B4D"/>
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
-<path d="M25.705,23.235c0,0.228-0.184,0.411-0.411,0.411h-1.646c-0.229,0-0.412-0.184-0.412-0.411v-1.646 c0-0.229,0.184-0.412,0.412-0.412h1.646c0.228,0,0.411,0.183,0.411,0.412V23.235z" fill="url(#SVGID_4__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="19.9414" x2="19.9414" y1="20.7324" y2="24.1276">
+<path d="M25.705,23.235c0,0.228-0.184,0.411-0.41,0.411h-1.647c-0.228,0-0.411-0.184-0.411-0.411v-1.646 c0-0.229,0.184-0.412,0.411-0.412h1.647c0.227,0,0.41,0.183,0.41,0.412V23.235z" fill="url(#SVGID_4__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="19.9424" x2="19.9424" y1="20.7324" y2="24.1276">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
-<path d="M19.118,24.058c-0.455,0-0.824-0.368-0.824-0.822v-1.646 c0-0.455,0.369-0.824,0.824-0.824h1.646c0.453,0,0.824,0.369,0.824,0.824v1.646c0,0.454-0.371,0.822-0.824,0.822H19.118z" fill="url(#SVGID_5_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="19.9414" x2="19.9414" y1="21.146" y2="23.7092">
+<path d="M19.118,24.058c-0.454,0-0.823-0.368-0.823-0.822v-1.646 c0-0.455,0.369-0.824,0.823-0.824h1.646c0.455,0,0.826,0.369,0.826,0.824v1.646c0,0.454-0.371,0.822-0.826,0.822H19.118z" fill="url(#SVGID_5_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="19.9404" x2="19.9404" y1="21.1465" y2="23.7097">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
<stop offset="0.6606" style="stop-color:#474B4D"/>
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
-<path d="M21.177,23.235c0,0.228-0.185,0.411-0.412,0.411h-1.646c-0.228,0-0.412-0.184-0.412-0.411v-1.646 c0-0.229,0.185-0.412,0.412-0.412h1.646c0.228,0,0.412,0.183,0.412,0.412V23.235z" fill="url(#SVGID_6_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="15.4121" x2="15.4121" y1="20.7324" y2="24.0876">
+<path d="M21.176,23.235c0,0.228-0.184,0.411-0.412,0.411h-1.646c-0.228,0-0.413-0.184-0.413-0.411v-1.646 c0-0.229,0.186-0.412,0.413-0.412h1.646c0.229,0,0.412,0.183,0.412,0.412V23.235z" fill="url(#SVGID_6_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="15.4126" x2="15.4126" y1="20.7324" y2="24.0876">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
-<path d="M14.587,24.058c-0.452,0-0.821-0.368-0.821-0.822v-1.646 c0-0.455,0.369-0.824,0.821-0.824h1.647c0.454,0,0.825,0.369,0.825,0.824v1.646c0,0.454-0.371,0.822-0.825,0.822H14.587z" fill="url(#SVGID_7_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="15.4121" x2="15.4121" y1="21.146" y2="23.7092">
+<path d="M14.588,24.058c-0.453,0-0.822-0.368-0.822-0.822v-1.646 c0-0.455,0.369-0.824,0.822-0.824h1.646c0.455,0,0.825,0.369,0.825,0.824v1.646c0,0.454-0.37,0.822-0.825,0.822H14.588z" fill="url(#SVGID_7_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="15.4116" x2="15.4116" y1="21.1465" y2="23.7097">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
<stop offset="0.6606" style="stop-color:#474B4D"/>
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
-<path d="M16.647,23.235c0,0.228-0.184,0.411-0.413,0.411h-1.647c-0.227,0-0.41-0.184-0.41-0.411v-1.646 c0-0.229,0.184-0.412,0.41-0.412h1.647c0.229,0,0.413,0.183,0.413,0.412V23.235z" fill="url(#SVGID_8_)"/>
-<path d="M25.294,19.942h-1.646c-0.455,0-0.824-0.369-0.824-0.825v0.412 c0,0.455,0.369,0.824,0.824,0.824h1.646c0.457,0,0.824-0.369,0.824-0.824v-0.412C26.118,19.573,25.751,19.942,25.294,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M16.647,23.235c0,0.228-0.185,0.411-0.413,0.411h-1.646c-0.228,0-0.412-0.184-0.412-0.411v-1.646 c0-0.229,0.185-0.412,0.412-0.412h1.646c0.229,0,0.413,0.183,0.413,0.412V23.235z" fill="url(#SVGID_8_)"/>
+<path d="M25.295,19.942h-1.647c-0.454,0-0.823-0.369-0.823-0.825v0.412 c0,0.455,0.369,0.824,0.823,0.824h1.647c0.455,0,0.823-0.369,0.823-0.824v-0.412C26.118,19.573,25.75,19.942,25.295,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="24.4707" x2="24.4707" y1="16.6553" y2="19.9724">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
-<path d="M23.647,19.942c-0.455,0-0.824-0.369-0.824-0.825V17.47 c0-0.452,0.369-0.822,0.824-0.822h1.646c0.457,0,0.824,0.37,0.824,0.822v1.647c0,0.456-0.367,0.825-0.824,0.825H23.647z" fill="url(#SVGID_9_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="24.4707" x2="24.4707" y1="17.0278" y2="19.592">
+<path d="M23.647,19.942c-0.454,0-0.823-0.369-0.823-0.825V17.47 c0-0.452,0.369-0.822,0.823-0.822h1.647c0.455,0,0.823,0.37,0.823,0.822v1.647c0,0.456-0.368,0.825-0.823,0.825H23.647z" fill="url(#SVGID_9_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="24.4707" x2="24.4707" y1="17.0283" y2="19.5925">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
<stop offset="0.6606" style="stop-color:#474B4D"/>
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
-<path d="M25.705,19.117c0,0.229-0.184,0.412-0.411,0.412h-1.646c-0.229,0-0.412-0.184-0.412-0.412V17.47 c0-0.226,0.184-0.411,0.412-0.411h1.646c0.228,0,0.411,0.186,0.411,0.411V19.117z" fill="url(#SVGID_10_)"/>
-<path d="M20.765,19.942h-1.646c-0.455,0-0.824-0.369-0.824-0.825v0.412 c0,0.455,0.369,0.824,0.824,0.824h1.646c0.453,0,0.824-0.369,0.824-0.824v-0.412C21.589,19.573,21.218,19.942,20.765,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="19.9414" x2="19.9414" y1="16.6152" y2="20.0124">
+<path d="M25.705,19.117c0,0.229-0.184,0.412-0.41,0.412h-1.647c-0.228,0-0.411-0.184-0.411-0.412V17.47 c0-0.226,0.184-0.411,0.411-0.411h1.647c0.227,0,0.41,0.186,0.41,0.411V19.117z" fill="url(#SVGID_10_)"/>
+<path d="M20.764,19.942h-1.646c-0.454,0-0.823-0.369-0.823-0.825v0.412 c0,0.455,0.369,0.824,0.823,0.824h1.646c0.455,0,0.826-0.369,0.826-0.824v-0.412C21.59,19.573,21.219,19.942,20.764,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="19.9424" x2="19.9424" y1="16.6152" y2="20.0124">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
-<path d="M19.118,19.942c-0.455,0-0.824-0.369-0.824-0.825V17.47 c0-0.452,0.369-0.822,0.824-0.822h1.646c0.453,0,0.824,0.37,0.824,0.822v1.647c0,0.456-0.371,0.825-0.824,0.825H19.118z" fill="url(#SVGID_11_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="19.9414" x2="19.9414" y1="17.0278" y2="19.592">
+<path d="M19.118,19.942c-0.454,0-0.823-0.369-0.823-0.825V17.47 c0-0.452,0.369-0.822,0.823-0.822h1.646c0.455,0,0.826,0.37,0.826,0.822v1.647c0,0.456-0.371,0.825-0.826,0.825H19.118z" fill="url(#SVGID_11_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="19.9404" x2="19.9404" y1="17.0283" y2="19.5925">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
<stop offset="0.6606" style="stop-color:#474B4D"/>
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
-<path d="M21.177,19.117c0,0.229-0.185,0.412-0.412,0.412h-1.646c-0.228,0-0.412-0.184-0.412-0.412V17.47 c0-0.226,0.185-0.411,0.412-0.411h1.646c0.228,0,0.412,0.186,0.412,0.411V19.117z" fill="url(#SVGID_12_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="15.4121" x2="15.4121" y1="16.6152" y2="19.9724">
+<path d="M21.176,19.117c0,0.229-0.184,0.412-0.412,0.412h-1.646c-0.228,0-0.413-0.184-0.413-0.412V17.47 c0-0.226,0.186-0.411,0.413-0.411h1.646c0.229,0,0.412,0.186,0.412,0.411V19.117z" fill="url(#SVGID_12_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="15.4126" x2="15.4126" y1="16.6152" y2="19.9724">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
-<path d="M14.587,19.942c-0.452,0-0.821-0.369-0.821-0.825V17.47 c0-0.452,0.369-0.822,0.821-0.822h1.647c0.454,0,0.825,0.37,0.825,0.822v1.647c0,0.456-0.371,0.825-0.825,0.825H14.587z" fill="url(#SVGID_13_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M16.234,19.942h-1.647c-0.452,0-0.821-0.369-0.821-0.825v0.412 c0,0.455,0.369,0.824,0.821,0.824h1.647c0.454,0,0.825-0.369,0.825-0.824v-0.412C17.06,19.573,16.688,19.942,16.234,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="15.4121" x2="15.4121" y1="17.0278" y2="19.592">
+<path d="M14.588,19.942c-0.453,0-0.822-0.369-0.822-0.825V17.47 c0-0.452,0.369-0.822,0.822-0.822h1.646c0.455,0,0.825,0.37,0.825,0.822v1.647c0,0.456-0.37,0.825-0.825,0.825H14.588z" fill="url(#SVGID_13_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M16.234,19.942h-1.646c-0.453,0-0.822-0.369-0.822-0.825v0.412 c0,0.455,0.369,0.824,0.822,0.824h1.646c0.455,0,0.825-0.369,0.825-0.824v-0.412C17.06,19.573,16.689,19.942,16.234,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="15.4116" x2="15.4116" y1="17.0283" y2="19.5925">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
<stop offset="0.6606" style="stop-color:#474B4D"/>
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
-<path d="M16.647,19.117c0,0.229-0.184,0.412-0.413,0.412h-1.647c-0.227,0-0.41-0.184-0.41-0.412V17.47 c0-0.226,0.184-0.411,0.41-0.411h1.647c0.229,0,0.413,0.186,0.413,0.411V19.117z" fill="url(#SVGID_14_)"/>
-<path d="M25.294,15.822h-1.646c-0.455,0-0.824-0.369-0.824-0.822v0.411 c0,0.455,0.369,0.824,0.824,0.824h1.646c0.457,0,0.824-0.369,0.824-0.824V15C26.118,15.453,25.751,15.822,25.294,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M16.647,19.117c0,0.229-0.185,0.412-0.413,0.412h-1.646c-0.228,0-0.412-0.184-0.412-0.412V17.47 c0-0.226,0.185-0.411,0.412-0.411h1.646c0.229,0,0.413,0.186,0.413,0.411V19.117z" fill="url(#SVGID_14_)"/>
+<path d="M25.295,15.822h-1.647c-0.454,0-0.823-0.369-0.823-0.822v0.411 c0,0.455,0.369,0.824,0.823,0.824h1.647c0.455,0,0.823-0.369,0.823-0.824V15C26.118,15.453,25.75,15.822,25.295,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="24.4707" x2="24.4707" y1="12.5381" y2="15.8522">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
-<path d="M23.647,15.822c-0.455,0-0.824-0.369-0.824-0.822v-1.647 c0-0.452,0.369-0.822,0.824-0.822h1.646c0.457,0,0.824,0.37,0.824,0.822V15c0,0.453-0.367,0.822-0.824,0.822H23.647z" fill="url(#SVGID_15_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M23.647,15.822c-0.454,0-0.823-0.369-0.823-0.822v-1.647 c0-0.452,0.369-0.822,0.823-0.822h1.647c0.455,0,0.823,0.37,0.823,0.822V15c0,0.453-0.368,0.822-0.823,0.822H23.647z" fill="url(#SVGID_15_)" fill-opacity="0.8" stroke-opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="24.4707" x2="24.4707" y1="12.9106" y2="15.4738">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
@@ -158,111 +157,111 @@
<stop offset="0.6606" style="stop-color:#474B4D"/>
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
-<path d="M25.705,15c0,0.228-0.184,0.411-0.411,0.411h-1.646c-0.229,0-0.412-0.184-0.412-0.411v-1.647 c0-0.228,0.184-0.411,0.412-0.411h1.646c0.228,0,0.411,0.184,0.411,0.411V15z" fill="url(#SVGID_16_)"/>
-<path d="M20.765,15.822h-1.646c-0.455,0-0.824-0.369-0.824-0.822v0.411 c0,0.455,0.369,0.824,0.824,0.824h1.646c0.453,0,0.824-0.369,0.824-0.824V15C21.589,15.453,21.218,15.822,20.765,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="19.9414" x2="19.9414" y1="12.498" y2="15.8922">
+<path d="M25.705,15c0,0.228-0.184,0.411-0.41,0.411h-1.647c-0.228,0-0.411-0.184-0.411-0.411v-1.647 c0-0.228,0.184-0.411,0.411-0.411h1.647c0.227,0,0.41,0.184,0.41,0.411V15z" fill="url(#SVGID_16_)"/>
+<path d="M20.764,15.822h-1.646c-0.454,0-0.823-0.369-0.823-0.822v0.411 c0,0.455,0.369,0.824,0.823,0.824h1.646c0.455,0,0.826-0.369,0.826-0.824V15C21.59,15.453,21.219,15.822,20.764,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="19.9424" x2="19.9424" y1="12.498" y2="15.8922">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
-<path d="M19.118,15.822c-0.455,0-0.824-0.369-0.824-0.822v-1.647 c0-0.452,0.369-0.822,0.824-0.822h1.646c0.453,0,0.824,0.37,0.824,0.822V15c0,0.453-0.371,0.822-0.824,0.822H19.118z" fill="url(#SVGID_17_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="19.9414" x2="19.9414" y1="12.9106" y2="15.4738">
+<path d="M19.118,15.822c-0.454,0-0.823-0.369-0.823-0.822v-1.647 c0-0.452,0.369-0.822,0.823-0.822h1.646c0.455,0,0.826,0.37,0.826,0.822V15c0,0.453-0.371,0.822-0.826,0.822H19.118z" fill="url(#SVGID_17_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="19.9404" x2="19.9404" y1="12.9106" y2="15.4738">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
<stop offset="0.6606" style="stop-color:#474B4D"/>
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
-<path d="M21.177,15c0,0.228-0.185,0.411-0.412,0.411h-1.646c-0.228,0-0.412-0.184-0.412-0.411v-1.647 c0-0.228,0.185-0.411,0.412-0.411h1.646c0.228,0,0.412,0.184,0.412,0.411V15z" fill="url(#SVGID_18_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="15.4121" x2="15.4121" y1="12.498" y2="15.8522">
+<path d="M21.176,15c0,0.228-0.184,0.411-0.412,0.411h-1.646c-0.228,0-0.413-0.184-0.413-0.411v-1.647 c0-0.228,0.186-0.411,0.413-0.411h1.646c0.229,0,0.412,0.184,0.412,0.411V15z" fill="url(#SVGID_18_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="15.4126" x2="15.4126" y1="12.498" y2="15.8522">
<stop offset="0" style="stop-color:#646263"/>
<stop offset="0.2" style="stop-color:#4D4D4D"/>
<stop offset="0.7212" style="stop-color:#242424"/>
<stop offset="1" style="stop-color:#373737"/>
</linearGradient>
-<path d="M14.587,15.822c-0.452,0-0.821-0.369-0.821-0.822v-1.647 c0-0.452,0.369-0.822,0.821-0.822h1.647c0.454,0,0.825,0.37,0.825,0.822V15c0,0.453-0.371,0.822-0.825,0.822H14.587z" fill="url(#SVGID_19_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M16.234,15.822h-1.647c-0.452,0-0.821-0.369-0.821-0.822v0.411 c0,0.455,0.369,0.824,0.821,0.824h1.647c0.454,0,0.825-0.369,0.825-0.824V15C17.06,15.453,16.688,15.822,16.234,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="15.4121" x2="15.4121" y1="12.9106" y2="15.4738">
+<path d="M14.588,15.822c-0.453,0-0.822-0.369-0.822-0.822v-1.647 c0-0.452,0.369-0.822,0.822-0.822h1.646c0.455,0,0.825,0.37,0.825,0.822V15c0,0.453-0.37,0.822-0.825,0.822H14.588z" fill="url(#SVGID_19_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M16.234,15.822h-1.646c-0.453,0-0.822-0.369-0.822-0.822v0.411 c0,0.455,0.369,0.824,0.822,0.824h1.646c0.455,0,0.825-0.369,0.825-0.824V15C17.06,15.453,16.689,15.822,16.234,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="15.4116" x2="15.4116" y1="12.9106" y2="15.4738">
<stop offset="0" style="stop-color:#A0A3A6"/>
<stop offset="0.1333" style="stop-color:#838688"/>
<stop offset="0.2606" style="stop-color:#7B7E80"/>
<stop offset="0.6606" style="stop-color:#474B4D"/>
<stop offset="1" style="stop-color:#707577"/>
</linearGradient>
-<path d="M16.647,15c0,0.228-0.184,0.411-0.413,0.411h-1.647c-0.227,0-0.41-0.184-0.41-0.411v-1.647 c0-0.228,0.184-0.411,0.41-0.411h1.647c0.229,0,0.413,0.184,0.413,0.411V15z" fill="url(#SVGID_20_)"/>
+<path d="M16.647,15c0,0.228-0.185,0.411-0.413,0.411h-1.646c-0.228,0-0.412-0.184-0.412-0.411v-1.647 c0-0.228,0.185-0.411,0.412-0.411h1.646c0.229,0,0.413,0.184,0.413,0.411V15z" fill="url(#SVGID_20_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="19.9434" x2="19.9434" y1="7.5977" y2="11.732">
<stop offset="0" style="stop-color:#686C6E"/>
<stop offset="1" style="stop-color:#E4EEF2"/>
</linearGradient>
-<path d="M13.354,11.705c-0.454,0-0.825-0.374-0.825-0.832v-2.45 c0-0.461,0.371-0.834,0.825-0.834h13.181c0.454,0,0.823,0.373,0.823,0.834v2.45c0,0.458-0.369,0.832-0.823,0.832H13.354z" fill="url(#SVGID_21_)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="19.9424" x2="19.9424" y1="8.0195" y2="11.3512">
+<path d="M13.354,11.705c-0.453,0-0.824-0.374-0.824-0.832v-2.45 c0-0.461,0.371-0.834,0.824-0.834h13.181c0.454,0,0.823,0.373,0.823,0.834v2.45c0,0.458-0.369,0.832-0.823,0.832H13.354z" fill="url(#SVGID_21_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="19.9414" x2="19.9414" y1="8.0195" y2="11.3512">
<stop offset="0" style="stop-color:#171717"/>
<stop offset="1" style="stop-color:#2E2E2E"/>
</linearGradient>
-<path d="M26.942,10.873c0,0.229-0.184,0.416-0.412,0.416H13.354c-0.227,0-0.411-0.187-0.411-0.416v-2.45 c0-0.23,0.185-0.417,0.411-0.417H26.53c0.229,0,0.412,0.187,0.412,0.417V10.873z" fill="url(#SVGID_22_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="19.9414" x2="19.9414" y1="3.9609" y2="12.5901">
+<path d="M26.941,10.873c0,0.229-0.183,0.416-0.41,0.416H13.354c-0.227,0-0.412-0.187-0.412-0.416v-2.45 c0-0.23,0.186-0.417,0.412-0.417h13.178c0.228,0,0.41,0.187,0.41,0.417V10.873z" fill="url(#SVGID_22_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="19.9424" x2="19.9424" y1="3.9609" y2="12.5901">
<stop offset="0" style="stop-color:#45E8FF"/>
<stop offset="0.1455" style="stop-color:#45E8FF"/>
<stop offset="0.5576" style="stop-color:#30A4D5"/>
<stop offset="0.8727" style="stop-color:#1347BA"/>
<stop offset="1" style="stop-color:#1C65C3"/>
</linearGradient>
-<rect fill="url(#SVGID_23_)" height="2.45" width="13.177" x="13.354" y="8.423"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="19.9414" x2="19.9414" y1="5.6362" y2="11.6377">
+<rect fill="url(#SVGID_23_)" height="2.45" width="13.178" x="13.354" y="8.423"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="19.9424" x2="19.9424" y1="5.6362" y2="11.6377">
<stop offset="0" style="stop-color:#45E8FF"/>
<stop offset="0.1455" style="stop-color:#45E8FF"/>
<stop offset="0.5576" style="stop-color:#4FADD5"/>
<stop offset="0.8727" style="stop-color:#1347BA"/>
<stop offset="1" style="stop-color:#1C65C3"/>
</linearGradient>
-<polygon fill="url(#SVGID_24_)" points="13.354,9.51 26.53,8.807 26.53,8.412 13.354,8.412 "/>
-<path d="M2.234,21.177c0,2.27,1.849,4.117,4.12,4.117h0.822c2.27,0,4.117-1.848,4.117-4.117V6.354 H4.706H2.647c-0.147,0-0.277,0.046-0.413,0.083V21.177z" fill="#050505" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M6.354,24.883h0.822c2.043,0,3.705-1.662,3.705-3.706V6.354H4.706H2.647v14.823 C2.647,23.221,4.31,24.883,6.354,24.883z" fill="#050505" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="6.7656" x2="6.7656" y1="3.1465" y2="24.8746">
+<polygon fill="url(#SVGID_24_)" points="13.354,9.51 26.531,8.807 26.531,8.412 13.354,8.412 "/>
+<path d="M2.234,21.177c0,2.27,1.849,4.117,4.119,4.117h0.822c2.27,0,4.119-1.848,4.119-4.117V6.354 h-6.59H2.647c-0.147,0-0.277,0.046-0.413,0.083V21.177z" fill="#050505" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M6.354,24.883h0.822c2.045,0,3.706-1.662,3.706-3.706V6.354H4.705H2.647v14.823 C2.647,23.221,4.31,24.883,6.354,24.883z" fill="#050505" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="6.7651" x2="6.7651" y1="3.1465" y2="24.8751">
<stop offset="0" style="stop-color:#727678"/>
<stop offset="0.7394" style="stop-color:#252629"/>
<stop offset="1" style="stop-color:#494C4F"/>
</linearGradient>
-<path d="M10.472,21.177c0,1.819-1.475,3.294-3.295,3.294H6.354c-1.82,0-3.295-1.475-3.295-3.294V6.354 c0-1.819,1.475-3.295,3.295-3.295h0.822c1.82,0,3.295,1.476,3.295,3.295V21.177z" fill="url(#SVGID_25_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="6.7656" x2="6.7656" y1="3.082" y2="8.9318">
+<path d="M10.471,21.177c0,1.819-1.474,3.294-3.295,3.294H6.354c-1.82,0-3.294-1.475-3.294-3.294V6.354 c0-1.819,1.474-3.295,3.294-3.295h0.822c1.821,0,3.295,1.476,3.295,3.295V21.177z" fill="url(#SVGID_25_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="6.7651" x2="6.7651" y1="3.082" y2="8.9318">
<stop offset="0" style="stop-color:#B5BCBF"/>
<stop offset="1" style="stop-color:#494C4F"/>
</linearGradient>
-<path d="M7.177,3.059H6.354c-1.82,0-3.295,1.476-3.295,3.295v2.47c0-1.819,1.475-3.295,3.295-3.295h0.822 c1.82,0,3.295,1.476,3.295,3.295v-2.47C10.472,4.534,8.997,3.059,7.177,3.059z" fill="url(#SVGID_26_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="6.7656" x2="6.7656" y1="3.0688" y2="7.2577">
+<path d="M7.176,3.059H6.354c-1.82,0-3.294,1.476-3.294,3.295v2.47c0-1.819,1.474-3.295,3.294-3.295h0.822 c1.821,0,3.295,1.476,3.295,3.295v-2.47C10.471,4.534,8.997,3.059,7.176,3.059z" fill="url(#SVGID_26_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="6.7651" x2="6.7651" y1="3.0688" y2="7.2577">
<stop offset="0" style="stop-color:#D5DDE0"/>
<stop offset="1" style="stop-color:#494C4F"/>
</linearGradient>
-<path d="M7.177,3.059H6.354c-1.82,0-3.295,1.476-3.295,3.295v0.411c0-1.818,1.475-3.295,3.295-3.295h0.822 c1.82,0,3.295,1.477,3.295,3.295V6.354C10.472,4.534,8.997,3.059,7.177,3.059z" fill="url(#SVGID_27_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="6.7646" x2="6.7646" y1="2.7354" y2="24.6079">
+<path d="M7.176,3.059H6.354c-1.82,0-3.294,1.476-3.294,3.295v0.411c0-1.818,1.474-3.295,3.294-3.295h0.822 c1.821,0,3.295,1.477,3.295,3.295V6.354C10.471,4.534,8.997,3.059,7.176,3.059z" fill="url(#SVGID_27_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="6.7642" x2="6.7642" y1="2.7354" y2="24.6086">
<stop offset="0" style="stop-color:#A0A7A8"/>
<stop offset="0.7576" style="stop-color:#252629"/>
<stop offset="1" style="stop-color:#1F2021"/>
</linearGradient>
-<path d="M7.177,5.528H6.354c-0.439,0-0.855,0.087-1.236,0.244V22h3.293V5.772 C8.03,5.615,7.614,5.528,7.177,5.528z" fill="url(#SVGID_28_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="6.7656" x2="6.7656" y1="18.7295" y2="24.5792">
+<path d="M7.176,5.528H6.354c-0.438,0-0.855,0.087-1.235,0.244V22H8.41V5.772 C8.03,5.615,7.613,5.528,7.176,5.528z" fill="url(#SVGID_28_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="6.7651" x2="6.7651" y1="18.7295" y2="24.5792">
<stop offset="0" style="stop-color:#252629"/>
<stop offset="1" style="stop-color:#5A5D61"/>
</linearGradient>
-<path d="M7.177,22H6.354c-1.82,0-3.295-1.476-3.295-3.294v2.471c0,1.819,1.475,3.294,3.295,3.294h0.822 c1.82,0,3.295-1.475,3.295-3.294v-2.471C10.472,20.524,8.997,22,7.177,22z" fill="url(#SVGID_29_)"/>
+<path d="M7.176,22H6.354c-1.82,0-3.294-1.476-3.294-3.294v2.471c0,1.819,1.474,3.294,3.294,3.294h0.822 c1.821,0,3.295-1.475,3.295-3.294v-2.471C10.471,20.524,8.997,22,7.176,22z" fill="url(#SVGID_29_)"/>
<rect fill="none" height="30" width="30"/>
-<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -316.6406 280.5271)" gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="676.2813" x2="676.2813" y1="533.1255" y2="503.1255">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.2545" style="stop-color:#4F88BD"/>
-<stop offset="0.7333" style="stop-color:#0055A3"/>
-<stop offset="1" style="stop-color:#64AEFB"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -224.75 -299.25)" gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="492.5" x2="492.5" y1="-626.4292" y2="-656.4292">
+<stop offset="0" style="stop-color:#B5BCBF"/>
+<stop offset="0.7091" style="stop-color:#494C4F"/>
+<stop offset="1" style="stop-color:#A8AFB2"/>
</linearGradient>
<path d="M21.5,29c-4.136,0-7.5-3.364-7.5-7.5c0-4.135,3.364-7.5,7.5-7.5c4.135,0,7.5,3.365,7.5,7.5 C29,25.636,25.635,29,21.5,29L21.5,29z" fill="url(#SVGID_30_)"/>
-<radialGradient cx="676.1436" cy="530.1011" gradientTransform="matrix(0.5 0 0 -0.5 -316.6406 280.6384)" gradientUnits="userSpaceOnUse" id="SVGID_31_" r="27.5291">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="0.15" style="stop-color:#96E9FA"/>
-<stop offset="0.7455" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
-</radialGradient>
-<path d="M28.785,21.5c0,4.024-3.263,7.286-7.285,7.286c-4.023,0-7.285-3.262-7.285-7.286 c0-4.023,3.262-7.286,7.285-7.286C25.522,14.214,28.785,17.477,28.785,21.5z" fill="url(#SVGID_31_)"/>
-<path d="M22.518,20.029v-2.035h-5.086v8.138H21.5h1.018h3.051v-6.103H22.518z M21.5,24.098h-3.052V23.08H21.5V24.098z M21.5,22.063h-3.052v-1.018H21.5V22.063z M18.448,20.029v-1.018H21.5v1.018H18.448z M24.552,24.098h-2.034V23.08h2.034V24.098z M24.552,22.063h-2.034v-1.018h2.034V22.063z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M22.518,19.329v-2.034h-5.086v8.137H21.5h1.018h3.051v-6.103H22.518z M21.5,23.397h-3.052v-1.017H21.5 V23.397z M21.5,21.363h-3.052v-1.018H21.5V21.363z M18.448,19.329v-1.018H21.5v1.018H18.448z M24.552,23.397h-2.034v-1.017h2.034 V23.397z M24.552,21.363h-2.034v-1.018h2.034V21.363z" fill="#FFFFFF"/>
-<rect fill-opacity="0.3" height="6.103" stroke-opacity="0.3" width="1.017" x="22.518" y="19.329"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="21.5" x2="21.5" y1="14.4453" y2="28.4458">
+<stop offset="0" style="stop-color:#727678"/>
+<stop offset="0.7394" style="stop-color:#252629"/>
+<stop offset="1" style="stop-color:#494C4F"/>
+</linearGradient>
+<path d="M28.5,21.5c0,3.866-3.135,7-7,7c-3.866,0-7-3.134-7-7c0-3.865,3.134-7,7-7 C25.365,14.5,28.5,17.635,28.5,21.5z" fill="url(#SVGID_31_)"/>
+<polygon fill="#FFFFFF" points="23,18 23,19 25,19 25,20 23,20 23,21 25,21 25,22 23,22 23,25 26,25 26,18 "/>
+<path d="M17,18v7h2v-2h2v2h1v-9L17,18z M19,22h-1v-1h1V22z M19,20h-1v-1h1V20z M21,22h-1v-1h1V22z M21,20h-1v-1h1V20 z" fill="#FFFFFF"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="2" x="17" y="25"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="5" x="21" y="25"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="2" x="19" y="23"/>
</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
<stop offset="0" style="stop-color:#A7E722"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_home.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_home.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
<stop offset="0" style="stop-color:#A7E722"/>
@@ -31,9 +31,8 @@
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
-<polygon fill="none" points="7.52,0 0,0 0,30 7.52,30 22.48,30 30,30 30,0 22.48,0 "/>
-<path d="M7.52,30c-0.672,0-1.299-0.26-1.775-0.732l-0.053-0.04l-0.094-0.121c-0.045-0.045-0.131-0.151-0.205-0.268 l-0.057-0.101c-0.041-0.06-0.105-0.18-0.158-0.305l-0.023-0.059l-0.033-0.114c-0.035-0.101-0.066-0.199-0.086-0.302 c-0.033-0.155-0.049-0.324-0.049-0.492V2.534C4.986,1.137,6.123,0,7.52,0H22.48c1.396,0,2.533,1.137,2.533,2.534V13.77 C28.023,15.141,30,18.163,30,21.5c0,3.895-2.619,7.258-6.385,8.226C23.258,29.905,22.869,30,22.48,30H7.52z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="1" y2="28.9273">
+<path d="M7.521,30c-0.672,0-1.3-0.26-1.776-0.732l-0.053-0.04l-0.094-0.121c-0.045-0.045-0.13-0.151-0.204-0.268 l-0.058-0.101c-0.041-0.06-0.104-0.18-0.157-0.305l-0.024-0.059l-0.033-0.114c-0.035-0.101-0.066-0.199-0.086-0.302 c-0.032-0.155-0.049-0.324-0.049-0.492V2.534C4.986,1.137,6.123,0,7.521,0h14.96c1.396,0,2.533,1.137,2.533,2.534V13.77 C28.023,15.141,30,18.163,30,21.5c0,3.895-2.619,7.258-6.385,8.226C23.258,29.905,22.869,30,22.48,30H7.521z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="14.9995" x2="14.9995" y1="1" y2="28.9277">
<stop offset="0" style="stop-color:#D1D7D9"/>
<stop offset="0.0667" style="stop-color:#D1D7D9"/>
<stop offset="0.2606" style="stop-color:#BDC2C4"/>
@@ -41,51 +40,51 @@
<stop offset="0.9636" style="stop-color:#ADB3B5"/>
<stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
-<path d="M24.014,27.467c0,0.847-0.688,1.533-1.533,1.533H7.52c-0.846,0-1.533-0.687-1.533-1.533V2.534 C5.986,1.687,6.674,1,7.52,1H22.48c0.846,0,1.533,0.687,1.533,1.534V27.467z" fill="url(#SVGID_1__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="1" y2="28.45">
+<path d="M24.014,27.467c0,0.847-0.687,1.533-1.533,1.533H7.521c-0.847,0-1.534-0.687-1.534-1.533V2.534 C5.986,1.687,6.674,1,7.521,1h14.96c0.847,0,1.533,0.687,1.533,1.534V27.467z" fill="url(#SVGID_1__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.9995" x2="14.9995" y1="1" y2="28.4505">
<stop offset="0" style="stop-color:#E4EBED"/>
<stop offset="0.0667" style="stop-color:#E4EBED"/>
<stop offset="0.2606" style="stop-color:#D6DCDE"/>
<stop offset="0.6606" style="stop-color:#B2BEC2"/>
<stop offset="1" style="stop-color:#ADB3B5"/>
</linearGradient>
-<path d="M22.48,1H7.52C6.674,1,5.986,1.687,5.986,2.534v24.933c0,0.409,0.162,0.779,0.424,1.055 c-0.023-0.094-0.041-0.188-0.041-0.287v-0.768V3.3V2.534c0-0.635,0.516-1.151,1.15-1.151H22.48c0.633,0,1.15,0.517,1.15,1.151V3.3 v24.167v0.768c0,0.099-0.018,0.193-0.041,0.287c0.26-0.275,0.424-0.646,0.424-1.055V2.534C24.014,1.687,23.326,1,22.48,1z" fill="url(#SVGID_2__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="2.9458" y2="21.7146">
+<path d="M22.48,1H7.521C6.674,1,5.986,1.687,5.986,2.534v24.933c0,0.409,0.162,0.779,0.424,1.055 c-0.023-0.094-0.041-0.188-0.041-0.287v-0.768V3.3V2.534c0-0.635,0.517-1.151,1.151-1.151h14.96c0.634,0,1.15,0.517,1.15,1.151V3.3 v24.167v0.768c0,0.099-0.018,0.193-0.041,0.287c0.261-0.275,0.424-0.646,0.424-1.055V2.534C24.014,1.687,23.327,1,22.48,1z" fill="url(#SVGID_2__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="14.9995" x2="14.9995" y1="2.9458" y2="21.7151">
<stop offset="0" style="stop-color:#B6BBBD"/>
<stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
<rect fill="url(#SVGID_3__)" fill-opacity="0.6" height="18.795" stroke-opacity="0.6" width="15.727" x="7.137" y="2.918"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="3.3267" y2="21.3309">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15.0005" x2="15.0005" y1="3.3267" y2="21.3314">
<stop offset="0" style="stop-color:#6E6E6E"/>
<stop offset="1" style="stop-color:#333333"/>
</linearGradient>
-<rect fill="url(#SVGID_4__)" height="18.029" width="14.961" x="7.52" y="3.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15" x2="15" y1="3.71" y2="20.9477">
+<rect fill="url(#SVGID_4__)" height="18.029" width="14.96" x="7.521" y="3.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9995" x2="14.9995" y1="3.71" y2="20.9482">
<stop offset="0" style="stop-color:#3BC8EB"/>
<stop offset="0.3879" style="stop-color:#2D9BD2"/>
<stop offset="0.8909" style="stop-color:#1347BA"/>
<stop offset="1" style="stop-color:#1347BA"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="17.262" width="14.191" x="7.904" y="3.685"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15" x2="15" y1="3.9844" y2="10.8451">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.9995" x2="14.9995" y1="3.9844" y2="10.8451">
<stop offset="0" style="stop-color:#85EFFF"/>
<stop offset="1" style="stop-color:#3BA1D9"/>
</linearGradient>
<polygon fill="url(#SVGID_6_)" points="22.096,9.821 7.904,11.356 7.904,4.067 22.096,4.067 "/>
<rect fill="#9FE4FF" height="0.383" width="14.191" x="7.904" y="3.685"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.9404" x2="14.9404" y1="22.1118" y2="27.8145">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.9409" x2="14.9409" y1="22.1113" y2="27.814">
<stop offset="0" style="stop-color:#B6BBBD"/>
<stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
-<path d="M13.555,27.851c-0.822,0-1.49-0.662-1.49-1.475v-2.805c0-0.813,0.668-1.476,1.49-1.476 h2.773c0.82,0,1.488,0.663,1.488,1.476v2.805c0,0.813-0.668,1.475-1.488,1.475H13.555z" fill="url(#SVGID_7_)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M13.553,27.467c-0.609,0-1.105-0.489-1.105-1.091v-2.805c0-0.602,0.496-1.09,1.105-1.09h2.775 c0.609,0,1.105,0.488,1.105,1.09v2.805c0,0.602-0.496,1.091-1.105,1.091H13.553z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="14.9404" x2="14.9404" y1="22.8438" y2="27.0903">
+<path d="M13.555,27.851c-0.822,0-1.49-0.662-1.49-1.475v-2.805c0-0.813,0.668-1.476,1.49-1.476 h2.773c0.821,0,1.489,0.663,1.489,1.476v2.805c0,0.813-0.668,1.475-1.489,1.475H13.555z" fill="url(#SVGID_7_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M13.553,27.467c-0.609,0-1.105-0.489-1.105-1.091v-2.805c0-0.602,0.496-1.09,1.105-1.09h2.775 c0.61,0,1.105,0.488,1.105,1.09v2.805c0,0.602-0.495,1.091-1.105,1.091H13.553z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="14.9409" x2="14.9409" y1="22.8438" y2="27.0903">
<stop offset="0" style="stop-color:#A6A8AB"/>
<stop offset="0.703" style="stop-color:#58595B"/>
<stop offset="1" style="stop-color:#808184"/>
</linearGradient>
-<path d="M17.051,26.376c0,0.391-0.322,0.707-0.719,0.707h-2.783c-0.396,0-0.719-0.316-0.719-0.707v-2.805 c0-0.391,0.322-0.708,0.719-0.708h2.783c0.396,0,0.719,0.317,0.719,0.708V26.376z" fill="url(#SVGID_8_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="14.9404" x2="14.9404" y1="23.5933" y2="26.3081">
+<path d="M17.051,26.376c0,0.391-0.322,0.707-0.719,0.707h-2.783c-0.396,0-0.718-0.316-0.718-0.707v-2.805 c0-0.391,0.321-0.708,0.718-0.708h2.783c0.396,0,0.719,0.317,0.719,0.708V26.376z" fill="url(#SVGID_8_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="14.9409" x2="14.9409" y1="23.5928" y2="26.3076">
<stop offset="0" style="stop-color:#D1D7D9"/>
<stop offset="0.0667" style="stop-color:#D1D7D9"/>
<stop offset="0.2606" style="stop-color:#BDC2C4"/>
@@ -93,56 +92,56 @@
<stop offset="0.9636" style="stop-color:#ADB3B5"/>
<stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
-<path d="M14.365,26.316c-0.424,0-0.768-0.344-0.768-0.769v-1.149c0-0.424,0.344-0.769,0.768-0.769h1.15 c0.424,0,0.768,0.345,0.768,0.769v1.149c0,0.425-0.344,0.769-0.768,0.769H14.365z" fill="url(#SVGID_9_)"/>
+<path d="M14.365,26.316c-0.423,0-0.767-0.344-0.767-0.769v-1.149c0-0.424,0.344-0.769,0.767-0.769h1.151 c0.423,0,0.767,0.345,0.767,0.769v1.149c0,0.425-0.344,0.769-0.767,0.769H14.365z" fill="url(#SVGID_9_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="8.833" x2="8.833" y1="22.46" y2="27.0908">
<stop offset="0" style="stop-color:#B6BBBD"/>
<stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M8.611,27.083c-0.813,0-1.475-0.66-1.475-1.476v-1.652 c0-0.813,0.662-1.474,1.475-1.474h0.443c0.813,0,1.475,0.66,1.475,1.474v1.652c0,0.815-0.662,1.476-1.475,1.476H8.611z" fill="url(#SVGID_10_)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="8.833" x2="8.833" y1="22.8452" y2="26.7065">
+<path d="M8.611,27.083c-0.813,0-1.475-0.66-1.475-1.476v-1.652 c0-0.813,0.662-1.474,1.475-1.474h0.443c0.813,0,1.475,0.66,1.475,1.474v1.652c0,0.815-0.661,1.476-1.475,1.476H8.611z" fill="url(#SVGID_10_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="8.8335" x2="8.8335" y1="22.8457" y2="26.707">
<stop offset="0" style="stop-color:#231F20"/>
<stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M8.611,26.7c-0.602,0-1.092-0.49-1.092-1.093v-1.652c0-0.602,0.49-1.092,1.092-1.092 h0.443c0.602,0,1.092,0.49,1.092,1.092v1.652c0,0.603-0.49,1.093-1.092,1.093H8.611z" fill="url(#SVGID_11_)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="8.834" x2="8.834" y1="23.2339" y2="26.3218">
+<path d="M8.611,26.7c-0.602,0-1.091-0.49-1.091-1.093v-1.652c0-0.602,0.489-1.092,1.091-1.092 h0.443c0.603,0,1.092,0.49,1.092,1.092v1.652c0,0.603-0.489,1.093-1.092,1.093H8.611z" fill="url(#SVGID_11_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="8.834" x2="8.834" y1="23.2334" y2="26.3213">
<stop offset="0" style="stop-color:#C6FF45"/>
<stop offset="0.7273" style="stop-color:#66A00E"/>
<stop offset="1" style="stop-color:#387300"/>
</linearGradient>
-<path d="M9.764,25.607c0,0.393-0.318,0.709-0.709,0.709H8.611c-0.391,0-0.707-0.316-0.707-0.709v-1.652 c0-0.392,0.316-0.707,0.707-0.707h0.443c0.391,0,0.709,0.315,0.709,0.707V25.607z" fill="url(#SVGID_12_)"/>
+<path d="M9.764,25.607c0,0.393-0.318,0.709-0.709,0.709H8.611c-0.39,0-0.707-0.316-0.707-0.709v-1.652 c0-0.392,0.317-0.707,0.707-0.707h0.443c0.391,0,0.709,0.315,0.709,0.707V25.607z" fill="url(#SVGID_12_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="20.8359" x2="20.8359" y1="22.46" y2="27.0908">
<stop offset="0" style="stop-color:#B6BBBD"/>
<stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M20.615,27.083c-0.814,0-1.477-0.66-1.477-1.476v-1.652 c0-0.813,0.662-1.474,1.477-1.474h0.441c0.814,0,1.477,0.66,1.477,1.474v1.652c0,0.815-0.662,1.476-1.477,1.476H20.615z" fill="url(#SVGID_13_)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="20.8359" x2="20.8359" y1="22.8452" y2="26.7065">
+<path d="M20.615,27.083c-0.813,0-1.476-0.66-1.476-1.476v-1.652 c0-0.813,0.662-1.474,1.476-1.474h0.441c0.814,0,1.477,0.66,1.477,1.474v1.652c0,0.815-0.662,1.476-1.477,1.476H20.615z" fill="url(#SVGID_13_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="20.8359" x2="20.8359" y1="22.8457" y2="26.707">
<stop offset="0" style="stop-color:#231F20"/>
<stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M20.615,26.7c-0.604,0-1.092-0.49-1.092-1.093v-1.652 c0-0.602,0.488-1.092,1.092-1.092h0.441c0.602,0,1.092,0.49,1.092,1.092v1.652c0,0.603-0.49,1.093-1.092,1.093H20.615z" fill="url(#SVGID_14_)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="20.8359" x2="20.8359" y1="23.2339" y2="26.3218">
+<path d="M20.615,26.7c-0.603,0-1.092-0.49-1.092-1.093v-1.652 c0-0.602,0.489-1.092,1.092-1.092h0.441c0.603,0,1.092,0.49,1.092,1.092v1.652c0,0.603-0.489,1.093-1.092,1.093H20.615z" fill="url(#SVGID_14_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="20.8359" x2="20.8359" y1="23.2334" y2="26.3213">
<stop offset="0" style="stop-color:#FFC142"/>
<stop offset="0.7455" style="stop-color:#CF4E18"/>
<stop offset="1" style="stop-color:#B52100"/>
</linearGradient>
-<path d="M21.766,25.607c0,0.393-0.318,0.709-0.709,0.709h-0.441c-0.393,0-0.709-0.316-0.709-0.709v-1.652 c0-0.392,0.316-0.707,0.709-0.707h0.441c0.391,0,0.709,0.315,0.709,0.707V25.607z" fill="url(#SVGID_15_)"/>
-<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -316.6406 360.4753)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="676.2813" x2="676.2813" y1="693.022" y2="663.022">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.2545" style="stop-color:#4F88BD"/>
-<stop offset="0.7333" style="stop-color:#0055A3"/>
-<stop offset="1" style="stop-color:#64AEFB"/>
+<path d="M21.766,25.607c0,0.393-0.317,0.709-0.709,0.709h-0.441c-0.392,0-0.709-0.316-0.709-0.709v-1.652 c0-0.392,0.317-0.707,0.709-0.707h0.441c0.392,0,0.709,0.315,0.709,0.707V25.607z" fill="url(#SVGID_15_)"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -224.75 -299.25)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="492.5" x2="492.5" y1="-626.4292" y2="-656.4292">
+<stop offset="0" style="stop-color:#FFE1A3"/>
+<stop offset="0.297" style="stop-color:#FFE1A3"/>
+<stop offset="0.6667" style="stop-color:#AD4C01"/>
+<stop offset="1" style="stop-color:#FFE1A3"/>
</linearGradient>
<path d="M21.5,29c-4.137,0-7.5-3.363-7.5-7.5c0-4.135,3.363-7.5,7.5-7.5c4.135,0,7.5,3.365,7.5,7.5 C29,25.637,25.635,29,21.5,29L21.5,29z" fill="url(#SVGID_16_)"/>
-<radialGradient cx="751.8848" cy="1129.7896" gradientTransform="matrix(0.4708 0 0 -0.4709 -332.5567 547.6061)" gradientUnits="userSpaceOnUse" id="SVGID_17_" r="29.2379">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="0.15" style="stop-color:#96E9FA"/>
-<stop offset="0.7455" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
-</radialGradient>
-<path d="M28.785,21.5c0,4.024-3.264,7.286-7.285,7.286c-4.025,0-7.285-3.262-7.285-7.286 c0-4.022,3.26-7.286,7.285-7.286C25.521,14.214,28.785,17.478,28.785,21.5z" fill="url(#SVGID_17_)"/>
-<polygon fill-opacity="0.3" points="25.703,22.889 21.498,18.435 17.297,22.889 16.658,22.209 21.498,17.077 26.342,22.209 25.703,22.889 " stroke-opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="21.5" x2="21.5" y1="14.3818" y2="28.3359">
+<stop offset="0" style="stop-color:#FFC144"/>
+<stop offset="0.297" style="stop-color:#FFC144"/>
+<stop offset="0.6667" style="stop-color:#EF6902"/>
+<stop offset="1" style="stop-color:#FEB037"/>
+</linearGradient>
+<path d="M28.5,21.5c0,3.866-3.136,7-7,7c-3.867,0-7-3.134-7-7c0-3.864,3.133-7,7-7 C25.364,14.5,28.5,17.636,28.5,21.5z" fill="url(#SVGID_17_)"/>
+<polygon fill-opacity="0.3" points="25.703,22.889 21.499,18.435 17.297,22.889 16.658,22.209 21.499,17.077 26.342,22.209 25.703,22.889 " stroke-opacity="0.3"/>
<polygon fill-opacity="0.3" points="21.5,19.845 17.627,23.951 17.627,25.793 20.531,25.793 20.531,22.889 22.469,22.889 22.469,25.793 25.373,25.793 25.373,23.95 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" points="25.703,22.188 21.498,17.734 17.297,22.188 16.658,21.51 21.498,16.377 26.342,21.51 25.703,22.188 "/>
+<polygon fill="#FFFFFF" points="25.703,22.188 21.499,17.734 17.297,22.188 16.658,21.51 21.499,16.377 26.342,21.51 25.703,22.188 "/>
<polygon fill="#FFFFFF" points="21.5,19.146 17.627,23.252 17.627,25.094 20.531,25.094 20.531,22.188 22.469,22.188 22.469,25.094 25.373,25.094 25.373,23.25 "/>
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_work.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_work.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
<stop offset="0" style="stop-color:#A7E722"/>
@@ -31,9 +31,8 @@
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
-<polygon fill="none" points="7.52,0 0,0 0,30 7.52,30 22.479,30 30,30 30,0 22.479,0 "/>
-<path d="M7.52,30c-0.699,0-1.352-0.281-1.836-0.793l-0.041-0.041l-0.055-0.07c-0.045-0.047-0.123-0.146-0.193-0.254 l-0.031-0.049l-0.041-0.079c-0.031-0.044-0.094-0.16-0.146-0.284l-0.023-0.057l-0.033-0.117c-0.035-0.096-0.064-0.191-0.084-0.291 c-0.033-0.161-0.051-0.327-0.051-0.498V2.534C4.984,1.137,6.123,0,7.52,0h14.959c1.398,0,2.535,1.137,2.535,2.534v11.236 C28.023,15.142,30,18.164,30,21.5c0,3.895-2.619,7.257-6.385,8.225C23.258,29.905,22.869,30,22.479,30H7.52z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="14.999" x2="14.999" y1="1" y2="28.9273">
+<path d="M7.52,30c-0.699,0-1.352-0.281-1.836-0.793l-0.039-0.041l-0.055-0.07c-0.045-0.047-0.125-0.146-0.195-0.254 l-0.031-0.049l-0.041-0.079c-0.031-0.044-0.094-0.16-0.145-0.284l-0.023-0.057l-0.035-0.117c-0.033-0.096-0.064-0.191-0.084-0.291 c-0.031-0.161-0.049-0.327-0.049-0.498V2.534C4.986,1.137,6.123,0,7.52,0H22.48c1.396,0,2.533,1.137,2.533,2.534v11.236 C28.023,15.142,30,18.164,30,21.5c0,3.895-2.619,7.257-6.385,8.225C23.26,29.905,22.869,30,22.48,30H7.52z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="14.9995" x2="14.9995" y1="1" y2="28.9277">
<stop offset="0" style="stop-color:#D1D7D9"/>
<stop offset="0.0667" style="stop-color:#D1D7D9"/>
<stop offset="0.2606" style="stop-color:#BDC2C4"/>
@@ -41,51 +40,51 @@
<stop offset="0.9636" style="stop-color:#ADB3B5"/>
<stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
-<path d="M24.014,27.467c0,0.847-0.688,1.533-1.535,1.533H7.52c-0.848,0-1.535-0.687-1.535-1.533V2.534 C5.984,1.687,6.672,1,7.52,1h14.959c0.848,0,1.535,0.687,1.535,1.534V27.467z" fill="url(#SVGID_1__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.999" x2="14.999" y1="1" y2="28.45">
+<path d="M24.014,27.467c0,0.847-0.686,1.533-1.533,1.533H7.52c-0.846,0-1.533-0.687-1.533-1.533V2.534 C5.986,1.687,6.674,1,7.52,1H22.48c0.848,0,1.533,0.687,1.533,1.534V27.467z" fill="url(#SVGID_1__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.9995" x2="14.9995" y1="1" y2="28.4505">
<stop offset="0" style="stop-color:#E4EBED"/>
<stop offset="0.0667" style="stop-color:#E4EBED"/>
<stop offset="0.2606" style="stop-color:#D6DCDE"/>
<stop offset="0.6606" style="stop-color:#B2BEC2"/>
<stop offset="1" style="stop-color:#ADB3B5"/>
</linearGradient>
-<path d="M22.479,1H7.52C6.672,1,5.984,1.687,5.984,2.534v24.933c0,0.409,0.164,0.779,0.424,1.055 c-0.021-0.094-0.039-0.188-0.039-0.287v-0.768V3.3V2.534c0-0.635,0.516-1.151,1.15-1.151h14.959c0.635,0,1.152,0.517,1.152,1.151 V3.3v24.167v0.768c0,0.099-0.018,0.193-0.041,0.287c0.26-0.275,0.424-0.646,0.424-1.055V2.534C24.014,1.687,23.326,1,22.479,1z" fill="url(#SVGID_2__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="2.9458" y2="21.7146">
+<path d="M22.48,1H7.52C6.674,1,5.986,1.687,5.986,2.534v24.933c0,0.409,0.162,0.779,0.424,1.055 c-0.023-0.094-0.041-0.188-0.041-0.287v-0.768V3.3V2.534c0-0.635,0.518-1.151,1.15-1.151H22.48c0.635,0,1.15,0.517,1.15,1.151V3.3 v24.167v0.768c0,0.099-0.018,0.193-0.041,0.287c0.26-0.275,0.424-0.646,0.424-1.055V2.534C24.014,1.687,23.328,1,22.48,1z" fill="url(#SVGID_2__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="14.9995" x2="14.9995" y1="2.9458" y2="21.7151">
<stop offset="0" style="stop-color:#B6BBBD"/>
<stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
<rect fill="url(#SVGID_3__)" fill-opacity="0.6" height="18.795" stroke-opacity="0.6" width="15.727" x="7.137" y="2.918"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="14.999" x2="14.999" y1="3.3267" y2="21.3309">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="14.9995" x2="14.9995" y1="3.3267" y2="21.3314">
<stop offset="0" style="stop-color:#6E6E6E"/>
<stop offset="1" style="stop-color:#333333"/>
</linearGradient>
-<rect fill="url(#SVGID_4__)" height="18.029" width="14.959" x="7.52" y="3.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15" x2="15" y1="3.71" y2="20.9477">
+<rect fill="url(#SVGID_4__)" height="18.029" width="14.961" x="7.52" y="3.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9995" x2="14.9995" y1="3.71" y2="20.9482">
<stop offset="0" style="stop-color:#3BC8EB"/>
<stop offset="0.3879" style="stop-color:#2D9BD2"/>
<stop offset="0.8909" style="stop-color:#1347BA"/>
<stop offset="1" style="stop-color:#1347BA"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="17.262" width="14.191" x="7.904" y="3.685"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15" x2="15" y1="3.9844" y2="10.8451">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.9995" x2="14.9995" y1="3.9844" y2="10.8451">
<stop offset="0" style="stop-color:#85EFFF"/>
<stop offset="1" style="stop-color:#3BA1D9"/>
</linearGradient>
<polygon fill="url(#SVGID_6_)" points="22.096,9.821 7.904,11.356 7.904,4.067 22.096,4.067 "/>
<rect fill="#9FE4FF" height="0.383" width="14.191" x="7.904" y="3.685"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.9404" x2="14.9404" y1="22.1118" y2="27.8145">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.9409" x2="14.9409" y1="22.1113" y2="27.814">
<stop offset="0" style="stop-color:#B6BBBD"/>
<stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
-<path d="M13.553,27.851c-0.82,0-1.488-0.662-1.488-1.475v-2.805 c0-0.813,0.668-1.476,1.488-1.476h2.773c0.822,0,1.49,0.663,1.49,1.476v2.805c0,0.813-0.668,1.475-1.49,1.475H13.553z" fill="url(#SVGID_7_)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M13.551,27.467c-0.607,0-1.104-0.489-1.104-1.091v-2.805c0-0.602,0.496-1.09,1.104-1.09h2.777 c0.609,0,1.105,0.488,1.105,1.09v2.805c0,0.602-0.496,1.091-1.105,1.091H13.551z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="14.9404" x2="14.9404" y1="22.8438" y2="27.0903">
+<path d="M13.555,27.851c-0.822,0-1.49-0.662-1.49-1.475v-2.805c0-0.813,0.668-1.476,1.49-1.476 h2.773c0.82,0,1.49,0.663,1.49,1.476v2.805c0,0.813-0.67,1.475-1.49,1.475H13.555z" fill="url(#SVGID_7_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M13.553,27.467c-0.609,0-1.105-0.489-1.105-1.091v-2.805c0-0.602,0.496-1.09,1.105-1.09h2.775 c0.611,0,1.105,0.488,1.105,1.09v2.805c0,0.602-0.494,1.091-1.105,1.091H13.553z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="14.9409" x2="14.9409" y1="22.8438" y2="27.0903">
<stop offset="0" style="stop-color:#A6A8AB"/>
<stop offset="0.703" style="stop-color:#58595B"/>
<stop offset="1" style="stop-color:#808184"/>
</linearGradient>
-<path d="M17.051,26.376c0,0.391-0.322,0.707-0.719,0.707h-2.785c-0.395,0-0.717-0.316-0.717-0.707v-2.805 c0-0.391,0.322-0.708,0.717-0.708h2.785c0.396,0,0.719,0.317,0.719,0.708V26.376z" fill="url(#SVGID_8_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="14.9404" x2="14.9404" y1="23.5933" y2="26.3081">
+<path d="M17.051,26.376c0,0.391-0.322,0.707-0.719,0.707h-2.783c-0.396,0-0.717-0.316-0.717-0.707v-2.805 c0-0.391,0.32-0.708,0.717-0.708h2.783c0.396,0,0.719,0.317,0.719,0.708V26.376z" fill="url(#SVGID_8_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="14.9399" x2="14.9399" y1="23.5928" y2="26.3076">
<stop offset="0" style="stop-color:#D1D7D9"/>
<stop offset="0.0667" style="stop-color:#D1D7D9"/>
<stop offset="0.2606" style="stop-color:#BDC2C4"/>
@@ -93,56 +92,56 @@
<stop offset="0.9636" style="stop-color:#ADB3B5"/>
<stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
-<path d="M14.363,26.316c-0.422,0-0.766-0.344-0.766-0.769v-1.149c0-0.424,0.344-0.769,0.766-0.769h1.152 c0.424,0,0.768,0.345,0.768,0.769v1.149c0,0.425-0.344,0.769-0.768,0.769H14.363z" fill="url(#SVGID_9_)"/>
+<path d="M14.365,26.316c-0.422,0-0.768-0.344-0.768-0.769v-1.149c0-0.424,0.346-0.769,0.768-0.769h1.152 c0.422,0,0.766,0.345,0.766,0.769v1.149c0,0.425-0.344,0.769-0.766,0.769H14.365z" fill="url(#SVGID_9_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="8.833" x2="8.833" y1="22.46" y2="27.0908">
<stop offset="0" style="stop-color:#B6BBBD"/>
<stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M8.609,27.083c-0.811,0-1.473-0.66-1.473-1.476v-1.652 c0-0.813,0.662-1.474,1.473-1.474h0.445c0.813,0,1.475,0.66,1.475,1.474v1.652c0,0.815-0.662,1.476-1.475,1.476H8.609z" fill="url(#SVGID_10_)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="8.832" x2="8.832" y1="22.8452" y2="26.7065">
+<path d="M8.611,27.083c-0.813,0-1.475-0.66-1.475-1.476v-1.652 c0-0.813,0.662-1.474,1.475-1.474h0.443c0.814,0,1.475,0.66,1.475,1.474v1.652c0,0.815-0.66,1.476-1.475,1.476H8.611z" fill="url(#SVGID_10_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="8.833" x2="8.833" y1="22.8457" y2="26.707">
<stop offset="0" style="stop-color:#231F20"/>
<stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M8.609,26.7c-0.6,0-1.09-0.49-1.09-1.093v-1.652c0-0.602,0.49-1.092,1.09-1.092h0.445 c0.602,0,1.09,0.49,1.09,1.092v1.652c0,0.603-0.488,1.093-1.09,1.093H8.609z" fill="url(#SVGID_11_)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="8.833" x2="8.833" y1="23.2339" y2="26.3218">
+<path d="M8.611,26.7c-0.602,0-1.092-0.49-1.092-1.093v-1.652c0-0.602,0.49-1.092,1.092-1.092 h0.443c0.602,0,1.092,0.49,1.092,1.092v1.652c0,0.603-0.49,1.093-1.092,1.093H8.611z" fill="url(#SVGID_11_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="8.834" x2="8.834" y1="23.2334" y2="26.3213">
<stop offset="0" style="stop-color:#C6FF45"/>
<stop offset="0.7273" style="stop-color:#66A00E"/>
<stop offset="1" style="stop-color:#387300"/>
</linearGradient>
-<path d="M9.762,25.607c0,0.393-0.316,0.709-0.707,0.709H8.609c-0.389,0-0.705-0.316-0.705-0.709v-1.652 c0-0.392,0.316-0.707,0.705-0.707h0.445c0.391,0,0.707,0.315,0.707,0.707V25.607z" fill="url(#SVGID_12_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="20.835" x2="20.835" y1="22.46" y2="27.0908">
+<path d="M9.764,25.607c0,0.393-0.318,0.709-0.709,0.709H8.611c-0.389,0-0.707-0.316-0.707-0.709v-1.652 c0-0.392,0.318-0.707,0.707-0.707h0.443c0.391,0,0.709,0.315,0.709,0.707V25.607z" fill="url(#SVGID_12_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="20.8369" x2="20.8369" y1="22.46" y2="27.0908">
<stop offset="0" style="stop-color:#B6BBBD"/>
<stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M20.615,27.083c-0.814,0-1.477-0.66-1.477-1.476v-1.652 c0-0.813,0.662-1.474,1.477-1.474h0.441c0.814,0,1.475,0.66,1.475,1.474v1.652c0,0.815-0.66,1.476-1.475,1.476H20.615z" fill="url(#SVGID_13_)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="20.835" x2="20.835" y1="22.8452" y2="26.7065">
+<path d="M20.615,27.083c-0.813,0-1.475-0.66-1.475-1.476v-1.652 c0-0.813,0.662-1.474,1.475-1.474h0.441c0.814,0,1.477,0.66,1.477,1.474v1.652c0,0.815-0.662,1.476-1.477,1.476H20.615z" fill="url(#SVGID_13_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="20.8359" x2="20.8359" y1="22.8457" y2="26.707">
<stop offset="0" style="stop-color:#231F20"/>
<stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M20.615,26.7c-0.604,0-1.094-0.49-1.094-1.093v-1.652c0-0.602,0.49-1.092,1.094-1.092 h0.441c0.602,0,1.092,0.49,1.092,1.092v1.652c0,0.603-0.49,1.093-1.092,1.093H20.615z" fill="url(#SVGID_14_)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="20.8359" x2="20.8359" y1="23.2339" y2="26.3218">
+<path d="M20.615,26.7c-0.604,0-1.092-0.49-1.092-1.093v-1.652 c0-0.602,0.488-1.092,1.092-1.092h0.441c0.604,0,1.092,0.49,1.092,1.092v1.652c0,0.603-0.488,1.093-1.092,1.093H20.615z" fill="url(#SVGID_14_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="20.8359" x2="20.8359" y1="23.2334" y2="26.3213">
<stop offset="0" style="stop-color:#FFC142"/>
<stop offset="0.7455" style="stop-color:#CF4E18"/>
<stop offset="1" style="stop-color:#B52100"/>
</linearGradient>
-<path d="M21.766,25.607c0,0.393-0.318,0.709-0.709,0.709h-0.441c-0.393,0-0.709-0.316-0.709-0.709v-1.652 c0-0.392,0.316-0.707,0.709-0.707h0.441c0.391,0,0.709,0.315,0.709,0.707V25.607z" fill="url(#SVGID_15_)"/>
+<path d="M21.766,25.607c0,0.393-0.316,0.709-0.709,0.709h-0.441c-0.391,0-0.709-0.316-0.709-0.709v-1.652 c0-0.392,0.318-0.707,0.709-0.707h0.441c0.393,0,0.709,0.315,0.709,0.707V25.607z" fill="url(#SVGID_15_)"/>
<rect fill="none" height="30" width="30"/>
-<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -353.9307 360.4753)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="750.8613" x2="750.8613" y1="693.022" y2="663.022">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.2545" style="stop-color:#4F88BD"/>
-<stop offset="0.7333" style="stop-color:#0055A3"/>
-<stop offset="1" style="stop-color:#64AEFB"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -224.75 -299.25)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="492.5" x2="492.5" y1="-626.4292" y2="-656.4292">
+<stop offset="0" style="stop-color:#B5BCBF"/>
+<stop offset="0.7091" style="stop-color:#494C4F"/>
+<stop offset="1" style="stop-color:#A8AFB2"/>
</linearGradient>
-<path d="M21.5,29c-4.137,0-7.5-3.364-7.5-7.5c0-4.135,3.363-7.5,7.5-7.5c4.135,0,7.5,3.365,7.5,7.5 C29,25.636,25.635,29,21.5,29L21.5,29z" fill="url(#SVGID_16_)"/>
-<radialGradient cx="750.7217" cy="689.9976" gradientTransform="matrix(0.5 0 0 -0.5 -353.9307 360.5867)" gradientUnits="userSpaceOnUse" id="SVGID_17_" r="27.5326">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="0.15" style="stop-color:#96E9FA"/>
-<stop offset="0.7455" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
-</radialGradient>
-<path d="M28.785,21.5c0,4.024-3.264,7.286-7.285,7.286c-4.025,0-7.287-3.262-7.287-7.286 c0-4.023,3.262-7.286,7.287-7.286C25.521,14.214,28.785,17.477,28.785,21.5z" fill="url(#SVGID_17_)"/>
-<path d="M22.516,20.029v-2.035H17.43v8.138h4.07h1.016h3.053v-6.103H22.516z M21.5,24.098h-3.053V23.08H21.5V24.098z M21.5,22.063h-3.053v-1.018H21.5V22.063z M18.447,20.029v-1.018H21.5v1.018H18.447z M24.551,24.098h-2.035V23.08h2.035V24.098z M24.551,22.063h-2.035v-1.018h2.035V22.063z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M22.516,19.329v-2.034H17.43v8.137h4.07h1.016h3.053v-6.103H22.516z M21.5,23.397h-3.053v-1.017H21.5V23.397 z M21.5,21.363h-3.053v-1.018H21.5V21.363z M18.447,19.329v-1.018H21.5v1.018H18.447z M24.551,23.397h-2.035v-1.017h2.035V23.397z M24.551,21.363h-2.035v-1.018h2.035V21.363z" fill="#FFFFFF"/>
-<rect fill-opacity="0.3" height="6.103" stroke-opacity="0.3" width="1.018" x="22.516" y="19.329"/>
+<path d="M21.5,29c-4.136,0-7.5-3.364-7.5-7.5c0-4.135,3.364-7.5,7.5-7.5c4.135,0,7.5,3.365,7.5,7.5 C29,25.636,25.635,29,21.5,29L21.5,29z" fill="url(#SVGID_16_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="21.5" x2="21.5" y1="14.4453" y2="28.4458">
+<stop offset="0" style="stop-color:#727678"/>
+<stop offset="0.7394" style="stop-color:#252629"/>
+<stop offset="1" style="stop-color:#494C4F"/>
+</linearGradient>
+<path d="M28.5,21.5c0,3.866-3.135,7-7,7c-3.866,0-7-3.134-7-7c0-3.865,3.134-7,7-7 C25.365,14.5,28.5,17.635,28.5,21.5z" fill="url(#SVGID_17_)"/>
+<polygon fill="#FFFFFF" points="23,18 23,19 25,19 25,20 23,20 23,21 25,21 25,22 23,22 23,25 26,25 26,18 "/>
+<path d="M17,18v7h2v-2h2v2h1v-9L17,18z M19,22h-1v-1h1V22z M19,20h-1v-1h1V20z M21,22h-1v-1h1V22z M21,20h-1v-1h1V20 z" fill="#FFFFFF"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="2" x="17" y="25"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="5" x="21" y="25"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="2" x="19" y="23"/>
</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_muted.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_muted.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<path d="M49.816,18.774L49.816,18.774c2.203-4.334,1.499-9.768-2.128-13.393c-3.624-3.624-9.056-4.33-13.391-2.127 l0,0c0,0-0.002,0.001-0.005,0.002c-1.055,0.538-2.049,1.242-2.932,2.125L21.019,15.725c-0.3-0.3-0.79-0.3-1.09,0l-0.544,0.544 v-0.002l-2.177,2.179c-0.299,0.3-0.299,0.789,0,1.089l-4.897,4.897c-4.51,4.51-4.51,11.821,0,16.33 c2.907,2.907,6.978,3.929,10.711,3.087c0.18-0.039,0.357-0.081,0.535-0.131c0.151-0.041,0.301-0.088,0.449-0.135 c0.041-0.015,0.083-0.024,0.125-0.038v3.85c-0.892,0.086-1.541,0.4-1.541,1.388v5.367h-5.405c-0.166,0-0.327,0.02-0.482,0.055 c-0.028,0.005-0.05,0.016-0.077,0.021c-0.13,0.033-0.258,0.074-0.378,0.128c-0.012,0.005-0.023,0.013-0.036,0.017 c-0.776,0.364-1.32,1.14-1.32,2.046v0.506c0,0.084,0.005,0.166,0.014,0.333c0.008,0.153,0.02,0.377,0.033,0.745h0.002h22.994h0.001 c0.032-0.767,0.048-0.92,0.048-1.078v-0.506c0-0.906-0.542-1.682-1.321-2.046c-0.01-0.004-0.021-0.012-0.033-0.017 c-0.122-0.054-0.248-0.095-0.378-0.128c-0.027-0.006-0.051-0.017-0.077-0.021c-0.156-0.035-0.317-0.055-0.482-0.055h-5.405 l-0.001-5.367c0-0.987-0.649-1.302-1.538-1.388v-6.742l4.788-4.79c0.301,0.3,0.79,0.3,1.09,0l2.721-2.721 c0.3-0.299,0.3-0.789,0-1.089c0,0,10.687-10.718,10.854-10.906v-0.001c0.645-0.736,1.186-1.529,1.613-2.367L49.816,18.774z" fill-opacity="0.1" stroke-opacity="0.1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_pager.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_pager.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
<stop offset="0" style="stop-color:#A7E722"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_service.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_service.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<rect fill="none" height="60" width="60"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip_home.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip_home.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<rect fill="none" height="60" width="60"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip_work.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip_work.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<rect fill="none" height="60" width="60"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_camera.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_camera.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_car.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_car.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="12.8" x2="12.8" y1="35.35" y2="50.07">
<stop offset="0" stop-color="#7B7B7B"/>
<stop offset="0.1455" stop-color="#565656"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_cellinfo.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_cellinfo.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g transform="matrix(1 0 0 1 -0.001 0)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="42.8398" x2="42.8398" y1="14.1646" y2="45.8403">
<stop offset="0" style="stop-color:#AFED23"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.3896" y2="57.7417">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_home.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_home.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.3896" y2="57.7417">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_night.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_night.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="59.999"/>
<path d="M29.998,57.387c-15.439,0-28.001-12.561-28.001-28c0-15.438,12.562-28.001,28.001-28.001 c15.44,0,27.999,12.561,27.999,28.001C57.997,44.826,45.438,57.387,29.998,57.387L29.998,57.387z" fill="#343433"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_night_home.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_night_home.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="59.999"/>
<path d="M29.998,57.387c-15.439,0-28.001-12.561-28.001-28c0-15.438,12.562-28.001,28.001-28.001 c15.44,0,27.999,12.561,27.999,28.001C57.997,44.826,45.438,57.387,29.998,57.387L29.998,57.387z" fill="#343433"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_computer.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_computer.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="9.9121" x2="50.0859" y1="30" y2="30">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_corrupted.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_corrupted.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,90 +1,57 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.3203" x2="54.7099" y1="29.5493" y2="29.5493">
-<stop offset="0" style="stop-color:#8C3720"/>
-<stop offset="1" style="stop-color:#D35B2E"/>
-</linearGradient>
-<polygon fill="url(#SVGID_1_)" points="28.186,3.899 5.25,3.899 5.25,55.199 26.68,55.199 27.065,54.275 12.431,21.137 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5.3193" x2="54.7103" y1="31.3496" y2="31.3496">
-<stop offset="0" style="stop-color:#8C3720"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="301.21" x2="291.3099" y1="-352.2012" y2="-361.051">
+<stop offset="0" style="stop-color:#6B3720"/>
+<stop offset="0.4909" style="stop-color:#6B3720"/>
<stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
-<polygon fill="url(#SVGID_2_)" points="54.751,5.7 31.786,5.7 49.331,43.654 30.653,56.1 30.28,57 54.751,57 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="44.5938" x2="5.4859" y1="28.6494" y2="28.6494">
-<stop offset="0" style="stop-color:#8C3720"/>
-<stop offset="0.4909" style="stop-color:#8C3720"/>
-<stop offset="1" style="stop-color:#D55C2E"/>
-</linearGradient>
-<polygon fill="url(#SVGID_3_)" points="17.082,11.556 28.539,3 5.25,3 5.25,54.299 27.055,54.299 27.429,53.4 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="54.4551" x2="12.414" y1="30.4497" y2="30.4497">
-<stop offset="0" style="stop-color:#8C3720"/>
-<stop offset="0.4909" style="stop-color:#8C3720"/>
-<stop offset="1" style="stop-color:#D55C2E"/>
-</linearGradient>
-<polygon fill="url(#SVGID_4_)" points="54.751,4.8 32.14,4.8 46.632,43.654 31.029,55.199 30.654,56.1 54.751,56.1 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="5.3633" x2="44.7708" y1="28.2002" y2="28.2002">
-<stop offset="0" style="stop-color:#8C3720"/>
-<stop offset="1" style="stop-color:#FF7236"/>
-</linearGradient>
-<polygon fill="url(#SVGID_5_)" points="16.182,11.556 28.539,3 5.25,3 5.25,53.4 27.429,53.4 27.815,52.47 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="12.9429" x2="54.6475" y1="29.9995" y2="29.9995">
-<stop offset="0" style="stop-color:#8C3720"/>
-<stop offset="1" style="stop-color:#FF7236"/>
-</linearGradient>
-<polygon fill="url(#SVGID_6_)" points="54.751,4.8 32.14,4.8 47.53,43.654 31.413,54.277 31.029,55.199 54.751,55.199 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="11.252" x2="1.3518" y1="32.4648" y2="41.3147">
-<stop offset="0" style="stop-color:#8C3720"/>
-<stop offset="0.4909" style="stop-color:#8C3720"/>
-<stop offset="1" style="stop-color:#FF7236"/>
-</linearGradient>
-<polygon fill="url(#SVGID_7_)" points="16.182,11.556 28.539,3 5.25,3 5.25,52.5 27.804,52.5 28.178,51.6 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="25.209" x2="15.3089" y1="45.8506" y2="54.7004">
+<polygon fill="url(#SVGID_1_)" points="54.751,6.15 32.141,6.15 43.029,45.005 31.788,54.724 31.402,55.649 54.751,55.649 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="18.7417" x2="18.7417" y1="54.6143" y2="3.2317">
<stop offset="0" style="stop-color:#6B3720"/>
<stop offset="0.4909" style="stop-color:#6B3720"/>
<stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
-<polygon fill="url(#SVGID_8_)" points="54.751,4.8 32.14,4.8 43.03,43.654 31.788,53.373 31.403,54.299 54.751,54.299 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="18.7407" x2="18.7407" y1="2.5547" y2="51.3336">
+<path d="M32.23,43.204l-7.049-8.898l7.051-11.1v-1l-7.051-8.3l3.358-8.555v-1L5.25,37.751 c0,0.988,0.571,2.373,1.273,3.072l11.854,11.854c0.699,0.699,2.081,1.271,3.072,1.271h6.728l4.054-9.744V43.204z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="294.7412" x2="294.7412" y1="-308.9053" y2="-357.6842">
<stop offset="0" style="stop-color:#FF7236"/>
<stop offset="1" style="stop-color:#AF2B1C"/>
</linearGradient>
-<path d="M25.181,31.955l7.051-11.1l-7.051-9.3L28.539,3H5.25V35.4c0,0.989,0.571,2.373,1.273,3.072 l11.854,11.854c0.7,0.699,2.081,1.272,3.072,1.272h6.728l4.053-9.744L25.181,31.955z" fill="url(#SVGID_9_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="41.7666" x2="41.7666" y1="4.355" y2="53.1344">
+<path d="M25.181,33.306l7.051-11.1l-7.051-9.3l3.358-8.555H5.25v32.4c0,0.988,0.571,2.373,1.273,3.072 l11.854,11.854c0.699,0.699,2.081,1.271,3.072,1.271h6.728l4.054-9.744L25.181,33.306z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="317.7656" x2="317.7656" y1="-310.7061" y2="-359.4865">
<stop offset="0" style="stop-color:#FF7236"/>
<stop offset="1" style="stop-color:#AF2B1C"/>
</linearGradient>
-<polygon fill="url(#SVGID_10_)" points="54.751,4.8 32.14,4.8 28.781,13.355 35.831,22.656 28.781,33.755 35.831,43.654 31.778,53.4 54.751,53.4 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="16.9014" x2="16.9014" y1="2.9995" y2="51.4486">
+<polygon fill="url(#SVGID_4_)" points="54.751,6.15 32.141,6.15 28.781,14.706 35.831,24.007 28.781,35.105 35.831,45.005 31.777,54.751 54.751,54.751 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="292.9004" x2="292.9004" y1="-309.3506" y2="-357.7997">
<stop offset="0" style="stop-color:#F0AD93"/>
<stop offset="1" style="stop-color:#B6593F"/>
</linearGradient>
-<path d="M21.45,50.699c-0.747,0-1.91-0.479-2.437-1.008L7.159,37.836C6.63,37.309,6.15,36.146,6.15,35.4 V3.899h22.036L28.539,3H5.25V35.4c0,0.989,0.571,2.373,1.273,3.072l11.854,11.854c0.7,0.699,2.081,1.272,3.072,1.272h6.728 l0.375-0.9H21.45z" fill="url(#SVGID_11_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="43.2646" x2="43.2646" y1="4.6558" y2="53.0455">
+<path d="M21.45,52.05c-0.747,0-1.91-0.479-2.437-1.008L7.159,39.187C6.63,38.659,6.15,37.497,6.15,36.751 V5.25h22.036l0.354-0.9H5.25v32.4c0,0.988,0.571,2.373,1.273,3.072l11.854,11.854c0.699,0.699,2.081,1.271,3.072,1.271h6.728 l0.375-0.899L21.45,52.05L21.45,52.05z" fill="url(#SVGID_5_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="319.2637" x2="319.2637" y1="-311.0068" y2="-359.3975">
<stop offset="0" style="stop-color:#F0AD93"/>
<stop offset="1" style="stop-color:#B6593F"/>
</linearGradient>
-<polygon fill="url(#SVGID_12_)" points="54.751,4.8 32.14,4.8 31.786,5.7 53.851,5.7 53.851,52.5 32.153,52.5 31.778,53.4 54.751,53.4 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -257 -286)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="276.2168" x2="269.5453" y1="-324.1143" y2="-330.7858">
+<polygon fill="url(#SVGID_6_)" points="54.751,6.15 32.141,6.15 31.786,7.051 53.852,7.051 53.852,53.851 32.152,53.851 31.777,54.751 54.751,54.751 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="18.916" x2="12.6232" y1="39.7666" y2="46.0594">
<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.2" style="stop-color:#FFFFFF"/>
-<stop offset="0.4242" style="stop-color:#E6E6E6"/>
-<stop offset="0.7152" style="stop-color:#BCBCBC"/>
-<stop offset="0.9515" style="stop-color:#8E8E8E"/>
+<stop offset="0.297" style="stop-color:#FFFFFF"/>
+<stop offset="0.5576" style="stop-color:#E6E6E6"/>
+<stop offset="0.7515" style="stop-color:#BCBCBC"/>
<stop offset="1" style="stop-color:#8E8E8E"/>
</linearGradient>
-<path d="M6.909,38.859c-0.373-0.414-1.068-0.83-1.547-2.609c0,0,0.788,3.649,11.588,0.05 c0,15.3,4.5,15.3,4.5,15.3c-0.992,0-2.373-0.573-3.072-1.272L6.909,38.859z" fill="url(#SVGID_13_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="32.7568" x2="32.7568" y1="4.355" y2="53.1344">
+<path d="M6.909,40.21c-0.373-0.414-1.068-0.83-1.547-2.609c0,0,0.788,3.648,11.588,0.05 c0,15.3,4.5,15.3,4.5,15.3c-0.992,0-2.373-0.572-3.072-1.271L6.909,40.21z" fill="url(#SVGID_7_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="308.7559" x2="308.7559" y1="-310.7061" y2="-359.4865">
<stop offset="0" style="stop-color:#F0AD93"/>
<stop offset="1" style="stop-color:#B6593F"/>
</linearGradient>
-<polygon fill="url(#SVGID_14_)" points="29.681,33.755 36.731,22.656 29.681,13.355 33.038,4.8 32.14,4.8 28.781,13.355 35.831,22.656 28.781,33.755 35.831,43.654 31.778,53.4 32.679,53.4 36.731,43.654 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="28.2559" x2="28.2559" y1="2.5547" y2="51.3336">
+<polygon fill="url(#SVGID_8_)" points="29.682,35.105 36.73,24.007 29.682,14.706 33.038,6.15 32.141,6.15 28.781,14.706 35.831,24.007 28.781,35.105 35.831,45.005 31.777,54.751 32.68,54.751 36.73,45.005 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="304.2559" x2="304.2559" y1="-308.9053" y2="-357.6842">
<stop offset="0" style="stop-color:#F0AD93"/>
<stop offset="1" style="stop-color:#B6593F"/>
</linearGradient>
-<polygon fill="url(#SVGID_15_)" points="32.231,20.855 25.181,11.556 28.539,3 27.639,3 24.281,11.556 31.331,20.855 24.281,31.955 31.331,41.855 27.278,51.6 28.178,51.6 32.231,41.855 25.181,31.955 "/>
+<polygon fill="url(#SVGID_9_)" points="32.23,22.206 25.181,12.907 28.539,4.351 27.639,4.351 24.281,12.907 31.331,22.206 24.281,33.306 31.331,43.206 27.277,52.95 28.178,52.95 32.23,43.206 25.181,33.306 "/>
<rect fill="none" height="60" width="60.001"/>
</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_custom.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_custom.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="24.88" x2="24.88" y1="7.58" y2="43.1">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_data_import.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_data_import.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="18.98" x2="18.98" y1="7.81" y2="45.46">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_default_server.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_default_server.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.3877" x2="29.3877" y1="52.6611" y2="57.6064">
<stop offset="0" style="stop-color:#A8B1B3"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_lock.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_lock.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_update.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_update.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialer.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialer.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="17.17" x2="17.17" y1="5.67" y2="54.05">
<stop offset="0" stop-color="#96E9FA"/>
@@ -43,4 +44,5 @@
<path d="M33.9,45.12v7.978h-7.97v-7.978h7.975m1.225-1.22h-10.42v10.43h10.42v-10.43z" fill="url(#SVGID_19)"/>
<path d="M46.81,32.22v7.975h-7.976v-7.975h7.98m1.22-1.23h-10.42v10.42h10.42v-10.42z" fill="url(#SVGID_17)"/>
<rect fill="none" height="60" width="60"/>
+</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialled_voice_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialled_voice_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="312.4795" x2="312.4795" y1="-347.8892" y2="-403.8838">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_group.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_group.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="312.4795" x2="312.4795" y1="-347.8892" y2="-403.8838">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_home.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_home.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="312.4795" x2="312.4795" y1="-347.8892" y2="-403.8838">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_setup.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_setup.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="312.4795" x2="312.4795" y1="-347.8892" y2="-403.8838">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_work.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_work.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="312.4795" x2="312.4795" y1="-347.8892" y2="-403.8838">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_end_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_end_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_fail.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_fail.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="8.9082" y2="51.5718">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_favourites.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_favourites.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<polygon fill="url(#SVGID_1_)" points="30.299,46.857 13.109,56.171 16.172,36.861 2.002,23.39 21.313,20.336 29.746,2.696 38.617,20.121 58.002,22.689 44.172,36.51 47.719,55.738 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_filemgr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_filemgr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.9995" y2="57.1831">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_folder.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_folder.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="59.999" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2163.8232" x2="-2163.8232" y1="4093.1855" y2="4081.4014">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friend.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friend.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<path d="M6.917,52.783v-1.5c0-4.818,2.172-8.519,6.283-10.699 c1.059-0.564,3.787-1.602,6.194-2.518c0.87-0.33,1.66-0.631,2.299-0.881l0.986-0.43c0.268-0.776,0.156-2.01-0.009-2.316l-0.609-0.99 l0.006-0.005c-0.477-0.811-0.928-1.653-1.347-2.516c-1.481-0.104-2.916-1.358-3.614-3.185c-0.731-1.911-0.45-3.901,0.643-4.98 c-0.984-4.118-0.784-7.288,0.595-9.426c0.821-1.273,2.087-2.172,3.585-2.55c1.423-1.708,3.591-3.575,7.675-3.575 c4.679,0.156,8.319,1.761,10.55,4.641c2.173,2.806,2.864,6.706,1.954,11.001c1.044,1.116,1.256,3.072,0.488,4.962 c-0.677,1.671-1.935,2.824-3.292,3.062c-0.272,0.561-0.566,1.127-0.875,1.689c-0.381,0.694-0.74,1.304-1.099,1.863 c-0.177,0.303-0.299,1.717,0.037,2.46l1.25,0.499l1.473,0.547c2.69,0.999,5.678,2.108,6.696,2.639 c1.05,0.547,6.29,3.635,6.289,10.707v1.5H6.917z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
<path d="M7.667,52.033v-0.75c0-4.523,2.035-7.994,5.884-10.037 c1.021-0.544,3.739-1.577,6.136-2.489c0.844-0.32,1.638-0.622,2.279-0.873l1.283-0.559c0.522-1,0.371-2.794,0.048-3.299 l-0.151-0.245l-0.104-0.169c0,0-1.311-2.285-1.853-3.443c-0.088,0.012-0.178,0.017-0.268,0.017c-1.243,0-2.495-1.089-3.115-2.71 c-0.702-1.834-0.35-3.688,0.783-4.433c-1.058-4.136-0.93-7.262,0.384-9.298c0.764-1.185,1.954-1.988,3.373-2.283 c1.427-1.767,3.432-3.499,7.257-3.499c4.433,0.148,7.868,1.652,9.958,4.351c2.067,2.669,2.696,6.425,1.771,10.577 c0,0-0.016,0.081-0.049,0.229c1.057,0.794,1.344,2.627,0.617,4.417c-0.635,1.568-1.874,2.625-3.092,2.64 c-0.316,0.673-0.664,1.354-1.037,2.032c-0.373,0.68-0.724,1.274-1.073,1.82c-0.352,0.6-0.471,2.557,0.146,3.464l1.495,0.596 l1.488,0.554c2.507,0.931,5.627,2.088,6.611,2.601s5.887,3.408,5.886,10.042v0.75H7.667z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friends.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friends.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<radialGradient cx="-70.4854" cy="-5.0225" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="12.778">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ftu.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ftu.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_games.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_games.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.752" x2="37.7069" y1="18.6255" y2="19.3878">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_audio.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_audio.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="280.6641" x2="306.9727" y1="-333.5469" y2="-333.5469">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_bluetooth.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_bluetooth.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="59.999" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="283.0508" x2="328.9473" y1="-335" y2="-335">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_group_feeds.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_group_feeds.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<radialGradient cx="-70.4854" cy="-5.0225" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="12.778">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_help.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_help.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.2666" y2="58.2666">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_hold_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_hold_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="-2349.8247" cy="1517.2324" gradientTransform="matrix(4.489659e-010 -1 -1 -4.489659e-010 1546.7637 -2331.9561)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="36.2594">
<stop offset="0" style="stop-color:#FFC144"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_homezone.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_homezone.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.002" x2="30.002" y1="11.8628" y2="56.8359">
<stop offset="0" style="stop-color:#FFFFFF"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_im.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_im.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<rect fill="none" height="60" width="60"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_imageprint.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_imageprint.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.998" x2="29.998" y1="5.7212" y2="28.1196">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_info.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_info.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<rect fill="none" height="60" width="60"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_input_device.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_input_device.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="21.5996" x2="21.5996" y1="23.4971" y2="-23.1007">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_internet_radio.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_internet_radio.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="11.647" y2="52.3348">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_java.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_java.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<rect fill="none" height="60" width="60"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_just_audio.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_just_audio.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2164" x2="-2164" y1="3649.3477" y2="3604.5469">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_key_screen.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_key_screen.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_keyboard.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_keyboard.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="14.5566" y2="45.5373">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_language.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_language.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="3.3105" x2="7.0752" y1="44.4668" y2="44.4668">
<stop offset="0" style="stop-color:#A8B1B3"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_location_new.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_location_new.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="240.1621" x2="240.1621" y1="1779.4043" y2="1824.6136">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_maps.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_maps.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="240.1621" x2="240.1621" y1="1779.4043" y2="1824.6136">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mass_storage.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mass_storage.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="1.8516" y2="57.6129">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_media_transfer.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_media_transfer.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2164" x2="-2164" y1="3649.3477" y2="3604.5469">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_meeting.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_meeting.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="23.5464" x2="23.5464" y1="13.1836" y2="47.804">
<stop offset="0" style="stop-color:#E8B888"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="9.8965" y2="49.8018">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_group.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_group.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="9.8965" y2="49.8018">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_home.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_home.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="9.8965" y2="49.8018">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_work.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_work.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="9.8965" y2="49.8018">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_video_call_unseen.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_video_call_unseen.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call_unseen.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call_unseen.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voip_call_unseen.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voip_call_unseen.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.54" x2="29.54" y1="8.111" y2="49.9">
<stop offset="0" stop-color="#666666"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile_tv.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile_tv.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="53.1709" y2="49.6078">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mono.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mono.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="1.5215" y2="58.4791">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mouse.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mouse.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="30.1362" cy="20.3848" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="35.3912">
<stop offset="0" style="stop-color:#FFFFFF"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="25.9487" x2="25.9487" y1="6.6265" y2="53.8732">
<stop offset="0" style="stop-color:#ADF54E"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_album.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_album.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 -0.0051 0.0051 1 335.906 -1118.9601)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-311.7573" x2="-311.7573" y1="1119.6411" y2="1175.6382">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_empty.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_empty.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="0" y2="62.1923">
<stop offset="0" style="stop-color:#942D2C"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_player.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_player.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 -0.0051 0.0051 1 335.906 -1118.9601)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-311.7573" x2="-311.7573" y1="1119.6411" y2="1175.6382">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_shop.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_shop.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.2197" x2="4.2197" y1="4.7148" y2="11.4634">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mycard.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mycard.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="8.8086" y2="50.5088">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="26.4722" x2="33.4727" y1="32.4502" y2="32.4502">
<stop offset="0" style="stop-color:#686E70"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network_off.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network_off.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="26.4722" x2="33.4727" y1="32.4502" y2="32.4502">
<stop offset="0" style="stop-color:#686E70"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network_settings.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network_settings.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="26.4722" x2="33.4727" y1="32.4502" y2="32.4502">
<stop offset="0" style="stop-color:#686E70"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_message.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_message.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="9.8965" y2="49.8018">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_voice_message.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_voice_message.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="4.39" y2="58.45">
<stop offset="0" stop-color="#F2F2F2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_non_default.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_non_default.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.3877" x2="29.3877" y1="52.6611" y2="57.6064">
<stop offset="0" style="stop-color:#A8B1B3"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_notes.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_notes.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="37.1992" x2="11.6714" y1="17.8169" y2="61.0179">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ok.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ok.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="5.1221" y2="44.929">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_online.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_online.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.998" x2="29.998" y1="57.6797" y2="2.0783">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_outbox.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_outbox.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.0044" x2="30.0044" y1="5.3496" y2="38.0188">
<stop offset="0" style="stop-color:#87C126"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ovi_suite.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ovi_suite.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="#44A51C" height="37.72" width="52" x="4" y="11.14"/>
<path d="M17.38,22.47c-5.662,0-8.649,3.887-8.649,9.426,0,5.611,2.19,10.02,8.586,10.02,5.891,0,8.623-3.99,8.623-9.893,0-5.65-2.69-9.56-8.56-9.56zm-0.07,16.41c-3.012,0-3.148-4.285-3.148-7.092,0-2.734,0.234-6.293,3.148-6.293,2.793,0,3.184,3.758,3.184,6.293,0.01,3.27-0.15,7.09-3.18,7.09z" fill="#FFFFFF"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ovistore.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ovistore.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9971" x2="29.9971" y1="11.1475" y2="59">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ovisync.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ovisync.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="0.3882" y2="59.6489">
<stop offset="0" style="stop-color:#A6A8AB"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_personalization.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_personalization.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<radialGradient cx="39.64" cy="18.27" gradientUnits="userSpaceOnUse" id="SVGID_1" r="29.22">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phone_as_modem.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phone_as_modem.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phonebook.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phonebook.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<rect fill="none" height="60" width="60"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_photos.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_photos.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="59.999"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="28.0479" x2="28.0478" y1="7.7354" y2="49.7556">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_pin_code.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_pin_code.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="19.1738" y2="39.8846">
<stop offset="0" style="stop-color:#A8B1B3"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_play.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_play.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<rect fill="none" height="60" width="60"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_playlist.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_playlist.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20.6719" x2="23.6638" y1="61.0908" y2="51.1174">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_positioning.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_positioning.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="307.1426" x2="307.1426" y1="-338.7412" y2="-384.8441">
<stop offset="0" style="stop-color:#4FB7EB"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_positioning_info.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_positioning_info.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="307.1426" x2="307.1426" y1="-338.7412" y2="-384.8441">
<stop offset="0" style="stop-color:#4FB7EB"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_power_management.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_power_management.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<rect fill="none" height="60" width="60"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_presentation_player.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_presentation_player.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="51.4814" y2="10.7829">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_profiles.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_profiles.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="17.9414" x2="17.9414" y1="5.0361" y2="34.0517">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_query.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_query.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.999" x2="29.999" y1="2.0928" y2="37.9271">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_radio.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_radio.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="11.647" y2="52.3348">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_received_voice_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_received_voice_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_reset.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_reset.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ring_tone.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ring_tone.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sat.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sat.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.999" x2="29.999" y1="1.999" y2="57.9139">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_search.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_search.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.4471 0.4471 4918.8623 1940.7473)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4811.7705" x2="4804.6846" y1="3354.4326" y2="3354.4326">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_security.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_security.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 39.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-89.6592" x2="-54.9037" y1="24.0742" y2="24.0742">
<stop offset="0" style="stop-color:#8C8C8C"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_server_locked.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_server_locked.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.3877" x2="29.3877" y1="52.6611" y2="57.6064">
<stop offset="0" style="stop-color:#A8B1B3"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_settings.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_settings.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="4.5" y2="55.3778">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sim.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sim.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.999" x2="29.999" y1="1.999" y2="57.9139">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sisx.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sisx.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.8462" x2="27.8462" y1="3.1968" y2="48.3761">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_social_media.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_social_media.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="50.17" y2="7.62">
<stop offset="0" stop-color="#004E8C"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_speaker.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_speaker.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.999" x2="29.999" y1="2" y2="57.9149">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_stereo.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_stereo.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.3877" x2="30.3877" y1="2.6484" y2="33.7566">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sync.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sync.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="26.2671" x2="26.2671" y1="6.1377" y2="31.7569">
<stop offset="0" style="stop-color:#A6A8AB"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_text.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_text.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20.6719" x2="23.6638" y1="61.0908" y2="51.1174">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tip.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tip.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="29.7026" cy="11.6152" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="38.4093">
<stop offset="0" style="stop-color:#FFE36A"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_todo_alarm.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_todo_alarm.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<rect fill="none" height="60" width="60"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="28.13" x2="28.13" y1="12.29" y2="51.26">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone_off.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone_off.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="28.13" x2="28.13" y1="12.29" y2="51.26">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tv_out.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tv_out.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_unknown.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_unknown.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.999" x2="29.999" y1="2.0928" y2="37.9271">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="1.8594" y2="57.8613">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_home.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_home.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="1.8594" y2="57.8613">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_work.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_work.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="1.8594" y2="57.8613">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<rect fill="none" height="60" width="60"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb_memory.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb_memory.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="23.2222" y2="0.7603">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2164" x2="-2164" y1="3649.3477" y2="3604.5469">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_active.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_active.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
<stop offset="0" style="stop-color:#A7E722"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_end.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_end.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_waiting.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_waiting.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="-1627.3691" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
<stop offset="0" style="stop-color:#FFC144"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_capture.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_capture.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2164" x2="-2164" y1="3649.3477" y2="3604.5469">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_collection.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_collection.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,105 +1,68 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="0.3882" y2="59.65">
-<stop offset="0" stop-color="#A6A8AB"/>
-<stop offset="1" stop-color="#231F20"/>
-</linearGradient>
-<path d="M0,60v-59.69h60v59.69h-60zm50.25-5.68l-20.25-20.15-20.25,20.15h40.49zm4.04-4.02v-40.29l-20.25,20.14,20.25,20.15zm-48.58,0l20.25-20.15-20.25-20.14v40.29zm24.29-24.17l20.25-20.14h-40.5l20.25,20.14z" fill="url(#SVGID_1_)" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="1.097" y2="58.95">
-<stop offset="0" stop-color="#A9AAAD"/>
-<stop offset="1" stop-color="#000000"/>
-</linearGradient>
-<path d="M0.714,59.29v-58.27h58.57v58.27m-7.32-4.26l-21.97-21.86-21.97,21.86h43.94zm3.03-3.02v-43.72l-21.97,21.86,21.97,21.86zm-50,0l21.97-21.86-21.97-21.86v43.72zm25-24.87l21.97-21.86h-43.94l21.97,21.86z" fill="url(#SVGID_2_)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="1.095" y2="57.53">
-<stop offset="0" stop-color="#F4FCFF"/>
-<stop offset="0.6242" stop-color="#C9CED1"/>
-<stop offset="1" stop-color="#9CA4A7"/>
-</linearGradient>
-<path d="M1.428,1.017v56.85h57.14v-56.85h-57.14zm26.55,28.42l-23.7,23.58v-47.15l23.7,23.57zm-21.68-25.58h47.39l-23.7,23.57-23.7-23.57zm23.7,27.59l23.7,23.57h-47.4l23.7-23.57zm2.02-2.01l23.7-23.57v47.15l-23.7-23.58z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="4.57" y2="53.6">
-<stop offset="0" stop-color="#A6A8AB"/>
-<stop offset="1" stop-color="#231F20"/>
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<path d="M56.662,4.616H9.241c-0.738,0-1.336,0.598-1.336,1.337v9.357H50.76c0.734,0,1.334,0.598,1.334,1.336v28.043 h4.568c0.738,0,1.336-0.598,1.336-1.336v-37.4C57.998,5.214,57.4,4.616,56.662,4.616z" fill="#F1F1F2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="32.9512" x2="32.9512" y1="44.6895" y2="4.6167">
+<stop offset="0" style="stop-color:#757575"/>
+<stop offset="0.2424" style="stop-color:#000000"/>
+<stop offset="0.8606" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#363636"/>
</linearGradient>
-<path d="M20,53.6c-1.924,0-3.583-1.555-3.698-3.462l-1.13-17.86h-0.17c-1.576,0-2.856-1.276-2.856-2.843v-4.264c0-1.567,1.281-2.842,2.856-2.842h12.5v-3.604c-0.361,0.029-0.728,0.043-1.099,0.043-2.795,0-5.822-0.82-8.524-2.312-4.18-2.304-7.19-6.002-7.856-9.653l-0.214-1.197,1.147-0.402c1.227-0.43,2.592-0.647,4.056-0.647,2.797,0,5.831,0.823,8.541,2.317,2.809,1.548,5.054,3.648,6.45,6.008,1.396-2.36,3.642-4.461,6.45-6.009,2.709-1.494,5.743-2.317,8.54-2.317,1.464,0,2.829,0.218,4.056,0.647l1.149,0.402-0.217,1.192c-0.666,3.65-3.676,7.349-7.855,9.654-2.703,1.49-5.73,2.31-8.523,2.31-0.372,0-0.738-0.014-1.1-0.043v3.604h12.5c1.575,0,2.855,1.275,2.855,2.842v4.264c0,1.567-1.28,2.843-2.855,2.843h-0.17l-1.132,17.86c-0.115,1.907-1.773,3.462-3.698,3.462h-20z" fill="url(#SVGID_4_)" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="5.281" y2="52.9">
-<stop offset="0" stop-color="#A9AAAD"/>
-<stop offset="1" stop-color="#000000"/>
-</linearGradient>
-<path d="M33.6,18.06h0.002c2.675,0,5.578-0.788,8.177-2.221,3.998-2.204,6.871-5.714,7.499-9.159l0.107-0.596-0.58-0.197c-1.151-0.403-2.437-0.607-3.819-0.607-2.678,0-5.589,0.791-8.194,2.228-3.18,1.751-5.6,4.251-6.8,6.931-1.199-2.687-3.617-5.185-6.795-6.936-2.607-1.438-5.518-2.228-8.195-2.228-1.383,0-2.668,0.204-3.819,0.607l-0.573,0.201,0.107,0.596c0.628,3.445,3.501,6.955,7.499,9.159,2.599,1.433,5.503,2.221,8.178,2.221,0.622,0,1.229-0.042,1.813-0.125v5.106h-13.21c-1.182,0-2.143,0.957-2.143,2.132v4.264c0,1.176,0.961,2.131,2.143,2.131h0.843l1.17,18.53c0.094,1.54,1.434,2.796,2.986,2.796h20c1.553,0,2.893-1.256,2.986-2.796l1.171-18.53h0.844c1.181,0,2.143-0.955,2.143-2.131v-4.264c0-1.175-0.962-2.132-2.143-2.132h-13.22v-5.11c0.585,0.08,1.195,0.12,1.815,0.12z" fill="url(#SVGID_5_)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="43.37" x2="16.62" y1="39.75" y2="39.75">
-<stop offset="0" stop-color="#BC5800"/>
-<stop offset="0.3" stop-color="#A23600"/>
-<stop offset="1" stop-color="#D07100"/>
+<path d="M56.662,4.616H9.241c-0.738,0-1.336,0.598-1.336,1.337v9.357H50.76c0.734,0,1.334,0.598,1.334,1.336 v23.696c0.117-0.192,0.32-0.329,0.561-0.329h2.672c0.367,0,0.668,0.302,0.668,0.668v1.336c0,0.367-0.301,0.668-0.668,0.668h-2.672 c-0.24,0-0.443-0.136-0.561-0.329v2.333h4.568c0.738,0,1.336-0.598,1.336-1.336v-37.4C57.998,5.214,57.4,4.616,56.662,4.616z M13.916,8.623c0,0.368-0.3,0.668-0.667,0.668h-2.671c-0.368,0-0.667-0.3-0.667-0.668V7.287c0-0.367,0.3-0.668,0.667-0.668h2.671 c0.366,0,0.667,0.301,0.667,0.668V8.623z M19.928,8.623c0,0.368-0.301,0.668-0.669,0.668h-2.67c-0.366,0-0.668-0.3-0.668-0.668 V7.287c0-0.367,0.299-0.668,0.668-0.668h2.67c0.368,0,0.669,0.301,0.669,0.668V8.623z M25.941,8.623c0,0.368-0.302,0.668-0.67,0.668 h-2.67c-0.369,0-0.668-0.3-0.668-0.668V7.287c0-0.367,0.3-0.668,0.668-0.668h2.67c0.368,0,0.67,0.301,0.67,0.668V8.623z M31.951,8.623c0,0.368-0.303,0.668-0.67,0.668h-2.67c-0.369,0-0.668-0.3-0.668-0.668V7.287c0-0.367,0.299-0.668,0.668-0.668h2.67 c0.365,0,0.67,0.301,0.67,0.668V8.623z M37.961,8.623c0,0.368-0.301,0.668-0.668,0.668h-2.672c-0.367,0-0.666-0.3-0.666-0.668V7.287 c0-0.367,0.299-0.668,0.666-0.668h2.672c0.367,0,0.668,0.301,0.668,0.668V8.623z M43.973,8.623c0,0.368-0.301,0.668-0.67,0.668 h-2.67c-0.369,0-0.668-0.3-0.668-0.668V7.287c0-0.367,0.299-0.668,0.668-0.668h2.67c0.369,0,0.67,0.301,0.67,0.668V8.623z M49.982,8.623c0,0.368-0.299,0.668-0.666,0.668h-2.672c-0.367,0-0.67-0.3-0.67-0.668V7.287c0-0.367,0.301-0.668,0.67-0.668h2.672 c0.365,0,0.666,0.301,0.666,0.668V8.623z M55.994,8.623c0,0.368-0.301,0.668-0.668,0.668h-2.672c-0.367,0-0.668-0.3-0.668-0.668 V7.287c0-0.367,0.301-0.668,0.668-0.668h2.672c0.367,0,0.668,0.301,0.668,0.668V8.623z" fill="url(#SVGID_1_)"/>
+<path d="M56.662,44.021H52v0.668h4.662c0.738,0,1.336-0.598,1.336-1.336 v-0.668C57.998,43.425,57.4,44.021,56.662,44.021z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="32.9531" x2="32.9531" y1="37.9053" y2="11.1899">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="0.5" style="stop-color:#666666"/>
+<stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<path d="M43.57,28.02h-27.14l1.299,21.32c0.072,1.17,1.094,2.129,2.273,2.129h20c1.18,0,2.201-0.959,2.273-2.129l1.3-21.32z" fill="url(#SVGID_6_)"/>
-<path d="M40.27,50.76h-20.54c-0.795,0-1.515-0.419-1.939-1.04,0.242,0.992,1.162,1.752,2.211,1.752h20c1.05,0,1.97-0.76,2.212-1.752-0.42,0.62-1.14,1.04-1.94,1.04z" fill="#600909" fill-opacity="0.7" stroke-opacity="0.7"/>
-<path d="M30,30.86c6.11,0,10.08,0.573,13.37,1.227l0.205-3.359h-27.15l0.205,3.359c3.29-0.65,7.26-1.23,13.37-1.23z" fill="#600909" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="28.87" x2="31.01" y1="21.27" y2="21.27">
-<stop offset="0" stop-color="#8BC53F"/>
-<stop offset="0.3758" stop-color="#33773B"/>
-<stop offset="0.6303" stop-color="#004F3C"/>
-<stop offset="1" stop-color="#007338"/>
+<path d="M7.906,11.296v4.015H50.76c0.734,0,1.334,0.598,1.334,1.336v21.365H58V11.296H7.906z" fill="url(#SVGID_2_)"/>
+<path d="M56.662,4.616H9.241c-0.738,0-1.336,0.598-1.336,1.337V6.62 c0-0.737,0.598-1.336,1.336-1.336h47.421c0.738,0,1.336,0.599,1.336,1.336V5.953C57.998,5.214,57.4,4.616,56.662,4.616z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="32.9521" x2="32.9521" y1="11.2959" y2="38.0122">
+<stop offset="0" style="stop-color:#36B5FF"/>
+<stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
-<rect fill="url(#SVGID_7_)" height="9.238" width="2.142" x="28.93" y="16.65"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="46.43" x2="13.57" y1="26.6" y2="26.6">
-<stop offset="0" stop-color="#BC5800"/>
-<stop offset="0.3" stop-color="#A23600"/>
-<stop offset="1" stop-color="#D07100"/>
+<path d="M54.658,11.296H11.246c-0.736,0-1.335,0.601-1.335,1.335v2.68h40.85c0.734,0,1.334,0.598,1.334,1.336 v21.365h2.564c0.736,0,1.336-0.602,1.336-1.337V12.631C55.994,11.896,55.395,11.296,54.658,11.296z" fill="url(#SVGID_3_)"/>
+<path d="M55.928,36.335c0.039-0.087,0.066-0.189,0.066-0.327 C55.994,36.124,55.957,36.228,55.928,36.335z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M54.658,36.675h-2.564v0.669h2.564 c0.619,0,1.119-0.436,1.27-1.009C55.758,36.712,55.256,36.675,54.658,36.675z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="32.9521" x2="32.9521" y1="38.0117" y2="11.1903">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#404040"/>
</linearGradient>
-<path d="M46.43,28.73c0,0.781-0.645,1.42-1.429,1.42h-30c-0.785,0-1.429-0.639-1.429-1.42v-4.264c0-0.782,0.644-1.421,1.429-1.421h30c0.784,0,1.429,0.64,1.429,1.421v4.262z" fill="url(#SVGID_8_)"/>
-<path d="M45,29.44h-30c-0.785,0-1.429-0.64-1.429-1.42v0.71c0,0.781,0.644,1.42,1.429,1.42h30c0.784,0,1.429-0.639,1.429-1.42v-0.71c0,0.78-0.65,1.42-1.43,1.42z" fill="#600909" fill-opacity="0.7" stroke-opacity="0.7"/>
-<path d="M45,23.05h-30c-0.785,0-1.429,0.64-1.429,1.421v0.71c0-0.781,0.644-1.421,1.429-1.421h30c0.784,0,1.429,0.64,1.429,1.421v-0.71c0-0.78-0.65-1.42-1.43-1.42z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="10.42" x2="30.04" y1="5.904" y2="16.9">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
-</linearGradient>
-<path d="M22.86,8.13c-3.974-2.19-8.299-2.669-11.43-1.572,0.57,3.138,3.167,6.474,7.142,8.665,3.973,2.19,8.299,2.669,11.43,1.572-0.57-3.13-3.17-6.47-7.14-8.66z" fill="url(#SVGID_9_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="42.12" x2="39.54" y1="18.21" y2="12.26">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
-</linearGradient>
-<path d="M37.14,8.13c3.974-2.19,8.299-2.669,11.43-1.572-0.569,3.138-3.167,6.474-7.142,8.665-3.973,2.19-8.299,2.669-11.43,1.572,0.57-3.13,3.17-6.47,7.14-8.66z" fill="url(#SVGID_10_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="18.88" x2="20.66" y1="18.17" y2="11.88">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
-</linearGradient>
-<path d="M18.57,15.22c3.973,2.19,8.299,2.669,11.43,1.572,0,0-7.308-3.236-9.777-4.551-3.304-1.759-8.794-5.685-8.794-5.685,0.57,3.141,3.17,6.475,7.14,8.665z" fill="url(#SVGID_11_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="48.8" x2="29.48" y1="4.137" y2="15.73">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
-</linearGradient>
-<path d="M37.14,8.13c-3.975,2.19-6.57,5.527-7.142,8.665,0,0,6.843-2.558,9.867-4.285,3.393-1.937,8.704-5.952,8.704-5.952-3.13-1.107-7.45-0.628-11.43,1.562z" fill="url(#SVGID_12_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="20.71" x2="20.71" y1="6.366" y2="15.88">
-<stop offset="0" stop-color="#D2FF8A"/>
-<stop offset="1" stop-color="#138F00"/>
+<path d="M54.658,11.296H11.246c-0.736,0-1.335,0.601-1.335,1.335v2.68h0.667v-2.68 c0-0.367,0.299-0.668,0.668-0.668h43.413c0.367,0,0.668,0.3,0.668,0.668v24.044c0,0.369-0.301,0.669-0.668,0.669h-2.564v0.668h2.564 c0.736,0,1.336-0.602,1.336-1.337V12.631C55.994,11.896,55.395,11.296,54.658,11.296z" fill="url(#SVGID_4_)"/>
+<path d="M53.322,12.631H12.582c-0.74,0-1.336,0.598-1.336,1.336v1.344 H50.76c0.734,0,1.334,0.598,1.334,1.336v2.861l2.564-0.197v-5.344C54.658,13.229,54.059,12.631,53.322,12.631z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M50.76,13.975H7.906v1.336H50.76c0.734,0,1.334,0.598,1.334,1.336V44.69h1.336 V16.646C53.43,15.172,52.232,13.975,50.76,13.975z" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M50.76,14.643H7.906v0.668H50.76c0.734,0,1.334,0.598,1.334,1.336v28.043h0.668 V16.646C52.762,15.541,51.863,14.643,50.76,14.643z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M50.76,15.311H3.337C2.597,15.311,2,15.908,2,16.646V54.05c0,0.737,0.597,1.334,1.337,1.334h47.419 c0.738,0,1.338-0.597,1.338-1.334V16.646C52.094,15.908,51.494,15.311,50.76,15.311z" fill="#F1F1F2"/>
+<path d="M50.98,54.16H2.892v-4.675H50.98V54.16z M50.98,20.765H2.892 V16.09H50.98V20.765z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2165)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-2166.9531" x2="-2166.9531" y1="2149.6895" y2="2109.6162">
+<stop offset="0" style="stop-color:#757575"/>
+<stop offset="0.2424" style="stop-color:#000000"/>
+<stop offset="0.8606" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#363636"/>
</linearGradient>
-<path d="M22.86,8.13c-3.974-2.19-8.299-2.669-11.43-1.572,3.953-0.562,7.701,0.2,11.08,2.193,3.334,1.965,5.657,4.691,7.488,8.043-0.57-3.13-3.17-6.47-7.14-8.66z" fill="url(#SVGID_13_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="39.29" x2="39.29" y1="6.069" y2="16.06">
-<stop offset="0" stop-color="#D2FF8A"/>
-<stop offset="1" stop-color="#138F00"/>
-</linearGradient>
-<path d="M37.49,8.751c5.281-3.037,11.08-2.193,11.08-2.193-3.13-1.097-7.45-0.618-11.43,1.572-3.975,2.19-6.57,5.527-7.142,8.665,0-0.01,1.95-4.86,7.49-8.049z" fill="url(#SVGID_14_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="18.88" x2="20.66" y1="18.17" y2="11.88">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="0.2303" stop-color="#D6FF61"/>
-<stop offset="1" stop-color="#138F00"/>
+<path d="M50.76,15.311H3.337C2.597,15.311,2,15.908,2,16.646V54.05c0,0.737,0.597,1.334,1.337,1.334h47.419 c0.738,0,1.338-0.597,1.338-1.334V16.646C52.094,15.908,51.494,15.311,50.76,15.311z M8.012,52.713c0,0.367-0.302,0.668-0.668,0.668 H4.672c-0.366,0-0.668-0.3-0.668-0.668v-1.336c0-0.366,0.301-0.668,0.668-0.668h2.671c0.367,0,0.668,0.3,0.668,0.668V52.713z M8.012,19.316c0,0.368-0.302,0.669-0.668,0.669H4.672c-0.366,0-0.668-0.301-0.668-0.669v-1.335c0-0.366,0.301-0.669,0.668-0.669 h2.671c0.367,0,0.668,0.303,0.668,0.669V19.316z M14.022,52.713c0,0.367-0.301,0.668-0.667,0.668h-2.671 c-0.367,0-0.668-0.3-0.668-0.668v-1.336c0-0.366,0.301-0.668,0.668-0.668h2.671c0.366,0,0.667,0.3,0.667,0.668V52.713z M14.022,19.316c0,0.368-0.301,0.669-0.667,0.669h-2.671c-0.367,0-0.668-0.301-0.668-0.669v-1.335c0-0.366,0.301-0.669,0.668-0.669 h2.671c0.366,0,0.667,0.303,0.667,0.669V19.316z M20.035,52.713c0,0.367-0.302,0.668-0.667,0.668h-2.671 c-0.368,0-0.668-0.3-0.668-0.668v-1.336c0-0.366,0.301-0.668,0.668-0.668h2.671c0.365,0,0.667,0.3,0.667,0.668V52.713z M20.035,19.316c0,0.368-0.302,0.669-0.667,0.669h-2.671c-0.368,0-0.668-0.301-0.668-0.669v-1.335c0-0.366,0.301-0.669,0.668-0.669 h2.671c0.365,0,0.667,0.303,0.667,0.669V19.316z M26.046,52.713c0,0.367-0.301,0.668-0.671,0.668h-2.669 c-0.367,0-0.667-0.3-0.667-0.668v-1.336c0-0.366,0.3-0.668,0.667-0.668h2.669c0.369,0,0.671,0.3,0.671,0.668V52.713z M26.046,19.316 c0,0.368-0.301,0.669-0.671,0.669h-2.669c-0.367,0-0.667-0.301-0.667-0.669v-1.335c0-0.366,0.3-0.669,0.667-0.669h2.669 c0.369,0,0.671,0.303,0.671,0.669V19.316z M32.057,52.713c0,0.367-0.303,0.668-0.669,0.668h-2.671c-0.365,0-0.666-0.3-0.666-0.668 v-1.336c0-0.366,0.301-0.668,0.666-0.668h2.671c0.366,0,0.669,0.3,0.669,0.668V52.713z M32.057,19.316 c0,0.368-0.303,0.669-0.669,0.669h-2.671c-0.365,0-0.666-0.301-0.666-0.669v-1.335c0-0.366,0.301-0.669,0.666-0.669h2.671 c0.366,0,0.669,0.303,0.669,0.669V19.316z M38.066,52.713c0,0.367-0.299,0.668-0.666,0.668h-2.672c-0.367,0-0.668-0.3-0.668-0.668 v-1.336c0-0.366,0.301-0.668,0.668-0.668H37.4c0.367,0,0.666,0.3,0.666,0.668V52.713z M38.066,19.316 c0,0.368-0.299,0.669-0.666,0.669h-2.672c-0.367,0-0.668-0.301-0.668-0.669v-1.335c0-0.366,0.301-0.669,0.668-0.669H37.4 c0.367,0,0.666,0.303,0.666,0.669V19.316z M44.08,52.713c0,0.367-0.303,0.668-0.67,0.668h-2.67c-0.367,0-0.67-0.3-0.67-0.668v-1.336 c0-0.366,0.301-0.668,0.67-0.668h2.67c0.367,0,0.67,0.3,0.67,0.668V52.713z M44.08,19.316c0,0.368-0.303,0.669-0.67,0.669h-2.67 c-0.367,0-0.67-0.301-0.67-0.669v-1.335c0-0.366,0.301-0.669,0.67-0.669h2.67c0.367,0,0.67,0.303,0.67,0.669V19.316z M50.09,52.713 c0,0.367-0.301,0.668-0.668,0.668H46.75c-0.367,0-0.668-0.3-0.668-0.668v-1.336c0-0.366,0.301-0.668,0.668-0.668h2.672 c0.367,0,0.668,0.3,0.668,0.668V52.713z M50.09,19.316c0,0.368-0.301,0.669-0.668,0.669H46.75c-0.367,0-0.668-0.301-0.668-0.669 v-1.335c0-0.366,0.301-0.669,0.668-0.669h2.672c0.367,0,0.668,0.303,0.668,0.669V19.316z" fill="url(#SVGID_5_)"/>
+<path d="M50.76,15.311H3.337C2.597,15.311,2,15.908,2,16.646v0.667 c0-0.737,0.597-1.335,1.337-1.335h47.419c0.738,0,1.338,0.598,1.338,1.335v-0.667C52.094,15.908,51.494,15.311,50.76,15.311z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
+<path d="M3.337,55.384h47.419c0.738,0,1.338-0.597,1.338-1.334v-0.67 c0,0.739-0.6,1.336-1.338,1.336H3.337C2.597,54.716,2,54.119,2,53.38v0.67C2.001,54.787,2.597,55.384,3.337,55.384z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2165)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2166.9526" x2="-2166.9526" y1="2142.9063" y2="2116.1904">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="0.5" style="stop-color:#666666"/>
+<stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<path d="M18.92,14.6c-5.35-2.86-7.487-8.042-7.487-8.042,0.57,3.138,3.167,6.474,7.142,8.665,3.973,2.19,8.299,2.669,11.43,1.572,0,0-5,1.06-11.08-2.19z" fill="url(#SVGID_15_)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="40.85" x2="39.69" y1="17.8" y2="13.28">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="0.2303" stop-color="#D6FF61"/>
-<stop offset="1" stop-color="#138F00"/>
+<rect fill="url(#SVGID_6_)" height="26.716" width="50.093" x="2.001" y="21.988"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2165)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-2166.9531" x2="-2166.9531" y1="2117.3115" y2="2142.6904">
+<stop offset="0" style="stop-color:#AFED23"/>
+<stop offset="0.8121" style="stop-color:#358C0C"/>
+<stop offset="1" style="stop-color:#67AD1A"/>
</linearGradient>
-<path d="M41.08,14.6c-3.312,1.95-6.667,2.734-11.08,2.194,3.131,1.097,7.457,0.618,11.43-1.572,3.975-2.19,6.572-5.527,7.142-8.665-1.26,3.228-3.26,5.555-7.49,8.045z" fill="url(#SVGID_16_)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="30" x2="30" y1="1.095" y2="57.53">
-<stop offset="0" stop-color="#C9CDCE"/>
-<stop offset="1" stop-color="#6E7273"/>
+<path d="M50.09,47.369c0,0.734-0.602,1.335-1.336,1.335H5.341c-0.735,0-1.337-0.601-1.337-1.335V23.325 c0-0.735,0.602-1.337,1.337-1.337h43.413c0.734,0,1.336,0.602,1.336,1.337V47.369z" fill="url(#SVGID_7_)"/>
+<path d="M48.754,47.369H5.341c-0.735,0-1.337,0.066-1.337-0.669l0,0 c0,0.735,0.602,1.337,1.337,1.337h43.413c0.734,0,1.336-0.602,1.336-1.337l0,0C50.09,47.436,49.488,47.369,48.754,47.369z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2165)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-2166.9531" x2="-2166.9531" y1="2143.0117" y2="2116.1892">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#404040"/>
</linearGradient>
-<path d="M1.428,1.017v56.85h57.14v-56.85h-57.14zm56.43,56.14h-55.72v-55.43h55.72v55.43z" fill="url(#SVGID_17_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="30" x2="30" y1="1.806" y2="57.12">
-<stop offset="0" stop-color="#E6E9E8"/>
-<stop offset="1" stop-color="#ADB2B5"/>
-</linearGradient>
-<path d="M2.142,1.727v55.43h55.72v-55.43h-55.72zm55,54.72h-54.28v-54.01h54.29v54.01z" fill="url(#SVGID_18_)"/>
+<path d="M48.754,22.656c0.367,0,0.668,0.302,0.668,0.669v24.044c0,0.369-0.301,0.668-0.668,0.668H5.341 c-0.369,0-0.668-0.299-0.668-0.668V23.325c0-0.369,0.3-0.669,0.668-0.669H48.754 M48.754,21.988H5.341 c-0.735,0-1.337,0.602-1.337,1.337v24.044c0,0.734,0.602,1.335,1.337,1.335h43.413c0.734,0,1.336-0.601,1.336-1.335V23.325 C50.09,22.59,49.488,21.988,48.754,21.988L48.754,21.988z" fill="url(#SVGID_8_)"/>
+<path d="M48.754,30.004v-5.343c0-0.736-0.598-1.336-1.338-1.336H6.675 c-0.737,0-1.334,0.6-1.334,1.336v8.683L48.754,30.004z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<rect fill="none" height="60" width="60"/>
+</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_dialled_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_dialled_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_download.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_download.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2164" x2="-2164" y1="3649.3477" y2="3604.5469">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_missed_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_missed_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_player.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_player.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2164" x2="-2164" y1="3649.3477" y2="3604.5469">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_podcast.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_podcast.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2164" x2="-2164" y1="3649.3477" y2="3604.5469">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_received_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_received_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_recent.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_recent.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2164" x2="-2164" y1="3649.3477" y2="3604.5469">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_service.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_service.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2164" x2="-2164" y1="3649.3477" y2="3604.5469">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_tv.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_tv.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2164" x2="-2164" y1="3649.3477" y2="3604.5469">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_recorder.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_recorder.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<path d="M49.816,18.774L49.816,18.774c2.203-4.334,1.499-9.768-2.128-13.393c-3.624-3.624-9.056-4.33-13.391-2.127 l0,0c0,0-0.002,0.001-0.005,0.002c-1.055,0.538-2.049,1.242-2.932,2.125L21.019,15.725c-0.3-0.3-0.79-0.3-1.09,0l-0.544,0.544 v-0.002l-2.177,2.179c-0.299,0.3-0.299,0.789,0,1.089l-4.897,4.897c-4.51,4.51-4.51,11.821,0,16.33 c2.907,2.907,6.978,3.929,10.711,3.087c0.18-0.039,0.357-0.081,0.535-0.131c0.151-0.041,0.301-0.088,0.449-0.135 c0.041-0.015,0.083-0.024,0.125-0.038v3.85c-0.892,0.086-1.541,0.4-1.541,1.388v5.367h-5.405c-0.166,0-0.327,0.02-0.482,0.055 c-0.028,0.005-0.05,0.016-0.077,0.021c-0.13,0.033-0.258,0.074-0.378,0.128c-0.012,0.005-0.023,0.013-0.036,0.017 c-0.776,0.364-1.32,1.14-1.32,2.046v0.506c0,0.084,0.005,0.166,0.014,0.333c0.008,0.153,0.02,0.377,0.033,0.745h0.002h22.994h0.001 c0.032-0.767,0.048-0.92,0.048-1.078v-0.506c0-0.906-0.542-1.682-1.321-2.046c-0.01-0.004-0.021-0.012-0.033-0.017 c-0.122-0.054-0.248-0.095-0.378-0.128c-0.027-0.006-0.051-0.017-0.077-0.021c-0.156-0.035-0.317-0.055-0.482-0.055h-5.405 l-0.001-5.367c0-0.987-0.649-1.302-1.538-1.388v-6.742l4.788-4.79c0.301,0.3,0.79,0.3,1.09,0l2.721-2.721 c0.3-0.299,0.3-0.789,0-1.089c0,0,10.687-10.718,10.854-10.906v-0.001c0.645-0.736,1.186-1.529,1.613-2.367L49.816,18.774z" fill-opacity="0.1" stroke-opacity="0.1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_active.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_active.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
<stop offset="0" style="stop-color:#A7E722"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_end.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_end.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_hold.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_hold.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="-2349.8247" cy="1517.2324" gradientTransform="matrix(4.489659e-010 -1 -1 -4.489659e-010 1546.7637 -2331.9561)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="36.2594">
<stop offset="0" style="stop-color:#FFC144"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_waiting.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_waiting.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="-1627.3691" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
<stop offset="0" style="stop-color:#FFC144"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_dialled_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_dialled_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_missed_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_missed_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_received_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_received_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_waiting_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_waiting_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<radialGradient cx="-1627.3691" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
<stop offset="0" style="stop-color:#FFC144"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_warning.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_warning.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="5.937" y2="55.9156">
<stop offset="0" style="stop-color:#FEF4CE"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_web_feeds.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_web_feeds.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<path d="M56.858,51.79c0,2.797-2.269,5.066-5.069,5.066H8.211c-2.801,0-5.066-2.27-5.066-5.066V8.212 c0-2.8,2.267-5.068,5.066-5.068h43.578c2.801,0,5.069,2.269,5.069,5.068V51.79L56.858,51.79z" fill="#F7B388"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_widget.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_widget.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientTransform="matrix(0.9999 0.0024 -0.0024 0.9999 48.3995 33.6767)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-32.1763" x2="-32.1763" y1="-30.9438" y2="-3.796">
<stop offset="0" style="stop-color:#F2C352"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wire_connect.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wire_connect.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="37.82" y2="57.77">
<stop offset="0" stop-color="#707070"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="22.8379" x2="37.5014" y1="31.7412" y2="31.7412">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan_off.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan_off.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="22.8379" x2="37.5014" y1="31.7412" y2="31.7412">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_zipmgr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_zipmgr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<rect fill="none" height="60" width="60"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_0_3mp.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_0_3mp.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30" x="0.002"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_12mp.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_12mp.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30" x="0.001"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_1_3mp.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_1_3mp.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_3mp.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_3mp.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30" x="0.003"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_9mp.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_9mp.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30" x="0.002"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_accented_characters.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_accented_characters.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<polygon points="7.79,8.82,5.865,5.946,4.046,5.946,6.243,8.82"/>
<polygon points="16.47,8.303,19,5,17.42,5,15.72,7,14,5,12.42,5,14.96,8.303"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_activitystream.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_activitystream.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M10.37,17.18c-0.731-0.662-1.288-1.417-1.714-2.314-1.002-2.12-0.705-5.979-0.611-6.944,0.072-2.494,2.419-4.848,4.767-5.638-0.98-1.273-2.62-2.288-3.874-2.288h-1.214c-1.915,0-4.342,2.367-4.342,4.388,0,0-0.29,4.066,0.575,6.022,0.475,1.067,0.918,1.963,1.889,2.645,0.003,0.14,0.012,0.733,0.003,0.87-0.118,1.98-5.847,4.35-5.847,4.35v5.72h4v-1.927l0.407-0.536c0.296-0.391,0.623-0.597,1.705-1.277,2.241-1.4,3.669-2.44,4.258-3.07z"/>
<path d="M19.52,14.01c0.908-1.782,0.423-5.978,0.423-5.978,0-1.858-2.47-4.034-4.35-4.034h-1.191c-1.88,0-4.354,2.176-4.354,4.034,0,0-0.431,4.175,0.419,5.972,0.467,0.982,1.139,1.708,2.092,2.334,0.003,0.128,0.01,0.794,0.002,0.921-0.006,0.087-0.037,0.179-0.068,0.271h3.143c0.659-1.187,1.783-2.071,3.138-2.391,0.29-0.33,0.53-0.7,0.75-1.12z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_contact.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_contact.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_calendar.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_calendar.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_contact.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_contact.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_favourites.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_favourites.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_homescreen.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_homescreen.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_video_collection.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_video_collection.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M19,13v-2h-2.677c-0.284,0.714-0.651,1.383-1.092,2h1.77v1h-2v-0.69c-0.875,1.127-1.995,2.049-3.283,2.69h3.28v3h-5v-2.345c-0.643,0.176-1.312,0.283-2,0.319v2.02h-2v2h2v1h-2v2h13v-2h-1v-1h1v-2h-2v-3h2v-2h-1v-1h1zm-8,9h-2v-1h2v1zm3,0h-2v-1h2v1zm3,0h-2v-1h2v1z"/>
<path d="M16.87,6c0.08,0.49,0.13,0.988,0.13,1.5s-0.05,1.01-0.13,1.5h4.13v17h-17v-9.677c-1.121-0.446-2.135-1.1-3-1.914v14.59h23v-23h-7.131z"/>
<path d="M14.41,1c0.813,0.865,1.468,1.879,1.914,3h9.68v20h3v-23h-14.59z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_addcity.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_addcity.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,12 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
-<rect height="3" width="4" x="5" y="5"/>
-<rect height="3" width="4" x="5" y="10"/>
-<rect height="3" width="4" x="5" y="15"/>
-<path d="M13.025,23H3V3h11v2h-3v3h3v2h-3v3h3v2h-3v3h3v0.283c0.877-1.76,2.274-3.215,4-4.146V14h0.283c1.272-0.634,2.701-1,4.217-1 c1.627,0,3.16,0.412,4.5,1.137V11H17V0H0v26h13.677C13.304,25.063,13.08,24.055,13.025,23z"/>
-<path d="M22.5,15c-4.136,0-7.5,3.364-7.5,7.5s3.364,7.5,7.5,7.5s7.5-3.364,7.5-7.5S26.636,15,22.5,15z M22.5,28 c-3.033,0-5.5-2.468-5.5-5.5s2.467-5.5,5.5-5.5s5.5,2.468,5.5,5.5S25.533,28,22.5,28z"/>
-<rect height="3" width="9" x="18" y="21"/>
-<rect height="9" width="3" x="21" y="18"/>
+</g>
+<rect height="3" width="2" x="12" y="8"/>
+<rect height="3" width="2" x="16" y="8"/>
+<rect height="3" width="2" x="12" y="13"/>
+<path d="M12,21h1.131c0.152-0.962,0.449-1.874,0.869-2.717V18h-2V21z"/>
+<path d="M16,15.591c0.602-0.565,1.27-1.06,2-1.454V13h-2V15.591z"/>
+<path d="M10,24V6.091l5-2.857l5,2.857v7.254C20.799,13.127,21.635,13,22.5,13c2.051,0,3.947,0.66,5.5,1.769V8h-6V4.93l-7-4l-7,4V11 H2v14H1v3h13.77c-0.832-1.166-1.404-2.526-1.639-4H10z M22,10h4v2h-4V10z M8,23H4v-2h4V23z M8,19H4v-2h4V19z M8,15H4v-2h4V15z"/>
+<path d="M22.5,15c-4.135,0-7.5,3.364-7.5,7.5s3.365,7.5,7.5,7.5c4.137,0,7.5-3.364,7.5-7.5S26.637,15,22.5,15z M22.5,28 c-3.033,0-5.5-2.468-5.5-5.5s2.467-5.5,5.5-5.5s5.5,2.468,5.5,5.5S25.533,28,22.5,28z"/>
+<polygon points="24,21 24,18 21,18 21,21 18,21 18,24 21,24 21,27 24,27 24,24 27,24 27,21 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M23.09,4.084l0.707-0.707c0.779-0.777,2.053-0.777,2.83,0,0.777,0.778,0.777,2.051,0,2.828l-0.707,0.708-2.83-2.829z"/>
<path d="M25.21,4.791c-3.891-3.89-10.25-3.89-14.14,0l-4.247,4.243c-1.913-0.685-2.636-0.192-3.514,0.686l-1.436,1.435,16.97,16.97,1.438-1.438c0.879-0.877,1.371-1.602,0.686-3.514l4.244-4.244c3.89-3.9,3.89-10.26,0-14.15z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_inactive.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_inactive.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="29.999"/>
<path d="M23.085,4.084l0.707-0.707c0.778-0.777,2.054-0.777,2.83,0c0.776,0.779,0.776,2.051,0,2.828l-0.707,0.709L23.085,4.084z"/>
<path d="M12.467,23.869c-1.676,0.43-3.57-0.033-4.936-1.398c-1.363-1.363-1.83-3.262-1.398-4.936L12.467,23.869z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_new.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_new.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alpha_mode.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alpha_mode.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M8.898,13h2.273l-3.217-11.65h-2.531l-3.359,11.65h1.953l0.688-2.563h3.523l0.671,2.56zm-3.89-3.875l1.469-5.789,1.43,5.789h-2.899z"/>
<path d="M18.96,12.18c0.651-0.547,0.977-1.367,0.977-2.461,0-1.567-0.742-2.521-2.227-2.859,1.292-0.458,1.938-1.354,1.938-2.688,0-0.938-0.278-1.642-0.836-2.113s-1.394-0.707-2.508-0.707h-3.891v11.65h3.617c1.3,0,2.28-0.27,2.93-0.82zm-4.4-9.516h1.281c0.542,0,0.949,0.144,1.223,0.43s0.41,0.714,0.41,1.281c0,0.667-0.149,1.153-0.449,1.461s-0.77,0.461-1.41,0.461h-1.055v-3.633zm0,9.026v-4.081h1.164c0.683,0,1.184,0.164,1.504,0.492s0.48,0.836,0.48,1.523c0,0.734-0.155,1.262-0.465,1.582s-0.812,0.48-1.504,0.48h-1.177z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_app_exit.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_app_exit.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<rect fill="none" height="30" width="30"/>
<polygon points="12,6.75,12,3,3,9.75,12,16.5,12,10.5,22.5,10.5,22.5,20.25,17.25,20.25,17.25,24,26.25,24,26.25,6.75"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_applications_all.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_applications_all.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_applications_collections.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_applications_collections.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_down.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_down.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_left.svg Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="30" width="30"/>
+<polygon points="25,28 3,15 25,2 "/>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_right.svg Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="30" width="30"/>
+<polygon points="5,2 27,15 5,28 "/>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_up.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_up.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_artists.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_artists.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_natural.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_natural.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_stretched.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_stretched.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_zoom.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_zoom.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_attach.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_attach.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_audio.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_audio.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_autoflash.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_autoflash.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_automatic.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_automatic.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_back.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_back.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace1.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace1.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<polygon points="28,13,10,13,10,9,1,15,10,21,10,17,28,17"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace2.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace2.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M12,5l-12,10,12,10h18v-20h-18zm15,17h-13.91l-8.4-7,8.4-7h13.91v14z"/>
<polygon points="15.81,20.31,19.34,16.78,22.88,20.31,25,18.19,21.46,14.66,25,11.12,22.88,9,19.34,12.54,15.81,9,13.69,11.12,17.22,14.66,13.69,18.19"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.133"/>
<path d="M22,9.767l-8.541-8.55v9.767l-3.671-3.66-1.677,1.681s3.792,3.794,5.344,5.342v0.612c-1.552,1.544-5.344,5.341-5.344,5.341l1.676,1.676,3.668-3.659v9.767l8.542-8.549s-3.717-3.717-4.883-4.88c1.16-1.18,4.88-4.883,4.88-4.883zm-3.36,9.763c-0.606,0.604-1.711,1.713-2.755,2.754v-5.502c1.05,1.05,2.2,2.19,2.76,2.75zm-2.74-7.02v-5.496c1.036,1.043,2.141,2.147,2.747,2.753-0.57,0.553-1.72,1.703-2.75,2.743z"/>
<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.133"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_headset.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_headset.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_off.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_off.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="31px" version="1.1" viewBox="0 0 31 31" width="31px" x="0px" y="0px">
+<svg baseProfile="tiny" height="31px" version="1.1" viewBox="0 0 31 31" width="31px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M15.87,7.11c1.071,1.078,2.212,2.219,2.839,2.845c-0.524,0.52-1.54,1.536-2.521,2.519l1.735,1.73 c1.587-1.591,4.252-4.249,4.252-4.249L13.348,1.12v8.52l2.522,2.516V7.11z"/>
<path d="M15.862,22.891v-4.349l-2.874-2.867c-1.762,1.756-5.163,5.162-5.163,5.162l1.732,1.731l3.79-3.781V28.88l6.427-6.434 l-1.735-1.731C17.417,21.337,16.628,22.127,15.862,22.891z"/>
<rect height="1.867" transform="matrix(-0.7079 -0.7063 0.7063 -0.7079 15.5243 37.4201)" width="35.827" x="-2.414" y="14.566"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bold.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bold.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M15.08,27c2.705,0,4.755-0.568,6.148-1.706,1.396-1.138,2.093-2.823,2.093-5.055,0-1.696-0.392-3.015-1.175-3.96-0.783-0.944-1.947-1.589-3.493-1.931,2.792-0.967,4.186-2.812,4.186-5.538,0-1.48-0.336-2.664-1.005-3.549-0.672-0.885-1.542-1.484-2.609-1.795-1.07-0.312-2.45-0.468-4.15-0.468h-8.402v24h8.402zm-2.96-13.97v-6.923h1.981c1.319,0,2.199,0.286,2.639,0.861,0.44,0.574,0.66,1.371,0.66,2.391,0,1.179-0.246,2.087-0.74,2.72-0.493,0.633-1.502,0.949-3.026,0.949h-1.513zm0,10.86v-7.838h1.578c0.924,0,1.661,0.105,2.214,0.321,0.552,0.215,0.998,0.598,1.337,1.15,0.337,0.552,0.507,1.372,0.507,2.454,0,1.321-0.264,2.303-0.79,2.947-0.523,0.644-1.594,0.965-3.203,0.965h-1.653z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_add_new.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_add_new.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_pair.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_pair.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_show_all.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_show_all.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_show_pair.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_show_pair.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_unpair.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_unpair.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bullet.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bullet.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<rect height="2" width="17" x="9" y="4"/>
<circle cx="5.5" cy="5" r="1.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M28.58,7.523l-7.359,4.248c-0.364,0.152-0.771,0.057-0.953-0.256l-1.277-2.142c-0.002,0.002-0.006,0.007-0.007,0.008-0.001-0.001,0-0.003-0.001-0.004-1.119,0.582-3.617,2.223-5.187,3.79-1.632,1.635-3.149,3.394-4.417,5.576,0,0-0.006,0.008-0.008,0.01,0.009,0.002,0.018,0.002,0.027,0.003l2.725,1.743c0.344,0.222,0.412,0.706,0.158,1.078l-4.794,7.05c-0.254,0.37-0.736,0.491-1.081,0.268,0,0-0.298-0.194-1.021-0.83h-0.003c-0.394-0.347-0.411-0.476-0.785-0.925-0.319-0.385-0.573-0.765-0.783-1.114-0.001-0.001-0.004,0-0.005-0.002-0.043-0.071-0.081-0.139-0.119-0.207-0.005-0.009-0.01-0.018-0.015-0.024-0.391-0.698-0.56-1.211-0.56-1.211-0.178-0.688-0.252-3.057,0.563-5.205,0.52-1.364,3.24-5.672,6.42-8.854,3.181-3.182,8.125-6.349,10.3-7.005,2.176-0.656,3.903-0.556,4.417-0.374,0,0,1.326,0.434,2.53,1.536,0.401,0.367,0.439,0.382,0.751,0.765,0.002,0.003,0,0.006,0.002,0.008-0.002-0.002-0.002-0.004-0.004-0.005,0.615,0.757,0.818,1.062,0.818,1.062,0.19,0.327,0.04,0.787-0.34,1.006z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call_diverted.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call_diverted.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcoder_off.svg Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
-</g>
-<polygon points="2,20 5,18 5,9 2,7 "/>
-<polygon points="11.174,7.025 13.148,9 24.026,9 24.026,19.876 26,21.85 26,11.75 29,14 29,8 26,10.25 26,7.025 "/>
-<polygon points="15.854,20 8,20 8,12.147 6.027,10.175 6.027,21.975 17.828,21.975 "/>
-<polygon points="17.149,13 21.999,13 21.999,12 16.149,12 "/>
-<rect height="35.827" transform="matrix(0.7063 -0.7079 0.7079 0.7063 -6.0767 14.6963)" width="1.868" x="13.74" y="-3.242"/>
-</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcorder.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcorder.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<polygon points="29,14 25,11 29,8 "/>
<path d="M6.027,7.025v14.949H26V7.025H6.027z M24.026,20H8V9h16.026V20z"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcorder_off.svg Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
+<polygon points="2,20 5,18 5,9 2,7 "/>
+<polygon points="11.174,7.025 13.148,9 24.026,9 24.026,19.876 26,21.85 26,11.75 29,14 29,8 26,10.25 26,7.025 "/>
+<polygon points="15.854,20 8,20 8,12.147 6.027,10.175 6.027,21.975 17.828,21.975 "/>
+<polygon points="17.149,13 21.999,13 21.999,12 16.149,12 "/>
+<rect height="35.827" transform="matrix(0.7063 -0.7079 0.7079 0.7063 -6.0767 14.6963)" width="1.868" x="13.74" y="-3.242"/>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camera.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camera.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<rect height="2" width="5" x="20" y="3.5"/>
<path d="M2,6.5v20h26v-20h-26zm23,17h-20v-14h20v14z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_capture.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_capture.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<circle cx="6.688" cy="14.67" r="1.5"/>
<path d="M17.44,19.6c-0.28,1.37-1.49,2.4-2.94,2.4-1.657,0-3-1.344-3-3,0-1.657,1.343-3,3-3,0.891,0,1.682,0.396,2.231,1.012l0.311-3.44c-0.77-0.36-1.63-0.57-2.54-0.57-3.314,0-6,2.686-6,6,0,3.313,2.686,6,6,6s6-2.687,6-6c0-0.805-0.161-1.57-0.447-2.271l-2.61,2.87z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_change_cam_mode.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_change_cam_mode.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<circle cx="4.665" cy="8.688" r="1"/>
<rect height="2" width="3.999" x="13" y="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_ciphering_off.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_ciphering_off.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_close_up.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_close_up.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M20.46,2.445l-2.465,6.77-3-8.215-2.994,8.215-2.465-6.77c-1.886,1.567-3.086,3.926-3.086,6.567,0,4.717,3.825,8.541,8.542,8.541s8.541-3.824,8.541-8.541c0-2.64-1.2-4.999-3.08-6.564z"/>
<path d="M5.016,25.12c3.401,1.809,7.383,0.973,8.887-1.869l-12.32-6.55c-1.508,2.84,0.034,6.61,3.438,8.42z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_collapse.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_collapse.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_communication.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_communication.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="29.999"/>
<path d="M19.675,3.48l-5.661,3.269c-0.279,0.117-0.592,0.042-0.732-0.196l-0.984-1.648c-0.002,0.001-0.002,0.006-0.004,0.007 c0-0.001,0-0.003,0-0.004c-0.861,0.447-2.783,1.709-3.99,2.916c-1.256,1.257-2.422,2.609-3.398,4.289c0,0-0.004,0.008-0.006,0.008 c0.008,0,0.014,0,0.021,0.002l2.096,1.342c0.264,0.17,0.318,0.543,0.123,0.828l-3.689,5.418c-0.195,0.283-0.566,0.377-0.83,0.205 c0,0-0.229-0.148-0.787-0.639c0,0,0,0-0.002,0c-0.301-0.267-0.314-0.365-0.604-0.711c-0.244-0.295-0.439-0.588-0.602-0.857 c0-0.002-0.004,0-0.004-0.002c-0.034-0.057-0.063-0.107-0.093-0.16c-0.004-0.008-0.008-0.016-0.01-0.02 c-0.301-0.537-0.43-0.932-0.43-0.932c-0.139-0.529-0.195-2.351,0.432-4.005c0.399-1.048,2.493-4.361,4.938-6.81 c2.445-2.448,6.25-4.884,7.924-5.389c1.674-0.505,3.002-0.427,3.396-0.286c0,0,1.021,0.333,1.945,1.18 c0.308,0.283,0.338,0.295,0.578,0.589c0,0.002,0,0.005,0,0.006c0-0.001,0-0.003-0.002-0.004c0.473,0.583,0.629,0.817,0.629,0.817 C20.085,2.958,19.968,3.312,19.675,3.48z"/>
<path d="M26.773,11.223C24.634,9.085,22.02,8,18.999,8c-3.005,0-5.618,1.087-7.767,3.228C9.088,13.375,8,15.982,8,18.984 c0,3.014,1.086,5.633,3.227,7.783C13.363,28.912,15.979,30,18.999,30h0.269v-2.775h-0.269c-2.265,0-4.22-0.811-5.812-2.412 c-1.598-1.594-2.406-3.555-2.406-5.828c0-2.268,0.807-4.222,2.396-5.813c1.588-1.588,3.548-2.391,5.821-2.391 c2.266,0,4.232,0.811,5.848,2.409c1.619,1.604,2.441,3.553,2.441,5.794c0,0.979-0.162,1.875-0.496,2.738 c-0.426,1.086-0.994,1.613-1.738,1.613c-0.563,0-1.313-0.209-1.313-2.008v-8.082h-2.799v0.412c-0.662-0.439-1.494-0.662-2.486-0.662 c-1.646,0-2.978,0.615-3.951,1.832c-0.907,1.119-1.368,2.523-1.368,4.172c0,1.639,0.459,3.049,1.367,4.195 c0.99,1.252,2.32,1.887,3.952,1.887c1.258,0,2.32-0.395,3.17-1.174c0.748,1.42,1.9,2.141,3.428,2.141 c1.687,0,2.99-0.832,3.875-2.469c0.711-1.295,1.07-2.842,1.07-4.596C29.999,15.969,28.915,13.357,26.773,11.223z M18.456,15.74 c1.58,0,2.349,1.033,2.349,3.158c0,2.311-0.769,3.436-2.351,3.436c-1.591,0-2.366-1.09-2.366-3.334c0-0.875,0.188-1.602,0.574-2.221 C17.086,16.08,17.673,15.74,18.456,15.74z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_conference.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_conference.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M0,0v30h30v-30h-30zm28.24,26.99l-6.012-6.012-0.454,2.042,5.218,5.219h-24.37l5.535-5.534-0.454-2.042-5.942,5.941v-23.6l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202-2.479-1.04-3.137-2.756-3.311-3.69l-3.856-3.856h23.59l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738v24.36z" fill-opacity="0.5" stroke-opacity="0.5"/>
<rect height="3.519" width="17.65" x="6.177" y="13.25"/>
<polygon points="9.706,25.59,20.29,25.59,22.06,17.65,7.941,17.65"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contact_all.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contact_all.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contacts.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contacts.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_continuous_capture.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_continuous_capture.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contrast.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contrast.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_corrupted.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_corrupted.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_email.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_email.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_event.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_event.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_message.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_message.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_day_light_saving_time.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_day_light_saving_time.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M14.95,8.815h0.005c3.328,0,6.036,2.705,6.042,6.031h1.5c-0.006-4.152-3.387-7.531-7.542-7.531h-0.005v1.496z"/>
<polygon points="21.78,14.74,24.1,14.74,22.94,16.75,21.78,18.76,20.62,16.75,19.46,14.74"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_delete.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_delete.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_details.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_details.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_dialer.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_dialer.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_disconnect.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_disconnect.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_drm_rights_expired.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_drm_rights_expired.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_drop_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_drop_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_edit.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_edit.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon points="29,7.309,29,1.119,1,1.119,1,28.87,29,28.88,29,22.68,7.012,22.68,7.012,18.01,23.77,18.01,23.77,11.99,7.012,11.99,7.012,7.309"/>
<rect fill="none" height="30" width="30"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_attach.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_attach.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon points="9.647,24.81,9.653,24.81,8.141,22.38,5.279,22.38,9.481,29.1,11.52,27.82,10.82,26.68"/>
<polygon points="10.49,22.38,12.01,24.81,16.13,24.81,14.62,22.38"/>
<polygon points="16.97,22.38,18.48,24.81,22.63,24.81,21.12,22.38"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_context.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_context.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon points="24.72,22.38,5.279,22.38,9.481,29.1,11.55,27.82,9.671,24.81,9.683,24.81,9.683,24.81,24.72,24.81"/>
<polygon points="20.52,13.07,18.45,14.36,20.32,17.36,5.279,17.36,5.279,19.8,24.72,19.8"/>
<polygon points="20.34,3.263,20.34,0.895,9.633,0.895,9.633,11.51,20.34,11.51,20.34,9.14,11.93,9.14,11.93,7.353,18.34,7.353,18.34,5.051,11.93,5.051,11.93,3.263"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_multipdp.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_multipdp.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon points="20.52,13.03,18.46,14.32,20.32,17.33,17.27,17.33,14.59,13.03,12.52,14.32,14.39,17.33,5.279,17.33,5.279,19.76,24.72,19.76"/>
<polygon points="9.48,29.07,11.55,27.78,9.68,24.78,12.73,24.78,15.41,29.07,17.48,27.78,15.6,24.78,24.72,24.78,24.72,22.34,5.279,22.34"/>
<polygon points="20.34,3.297,20.34,0.928,9.633,0.928,9.633,11.54,20.34,11.54,20.34,9.175,11.93,9.175,11.93,7.387,18.34,7.387,18.34,5.085,11.93,5.085,11.93,3.297"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_suspended.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_suspended.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon points="24.72,22.28,24.72,24.72,20.32,24.72,20.32,24.72,14.34,24.72,16.38,22.28"/>
<polygon points="5.279,22.28,10.58,22.28,8.524,24.72,5.279,24.72"/>
<polygon points="24.72,17.27,24.72,19.7,18.53,19.7,20.56,17.27"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_end_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_end_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M28.91,18.24l-7.671-2.057c-0.341-0.139-0.547-0.472-0.461-0.798l0.571-2.261c-0.002,0.001-0.008,0.001-0.01,0.001,0.001-0.001,0.002-0.002,0.002-0.003-1.125-0.355-3.859-0.922-5.933-0.923-2.159,0.001-4.325,0.161-6.604,0.766,0,0-0.009,0.002-0.012,0.002,0.006,0.007,0.012,0.013,0.017,0.02l0.648,2.953c0.081,0.374-0.194,0.738-0.608,0.816l-7.822,1.486c-0.412,0.076-0.811-0.162-0.891-0.537,0,0-0.068-0.325-0.126-1.224-0.001,0-0.001,0-0.001-0.002-0.031-0.489,0.042-0.586,0.092-1.13,0.043-0.466,0.126-0.885,0.219-1.254,0-0.001-0.003-0.003-0.002-0.005,0.019-0.074,0.039-0.145,0.059-0.216,0.002-0.009,0.005-0.018,0.006-0.025,0.203-0.72,0.43-1.17,0.43-1.17,0.338-0.572,1.855-2.187,3.813-3.068,1.239-0.572,5.882-1.621,10.09-1.622,4.205-0.001,9.565,1.174,11.44,2.178s2.946,2.212,3.165,2.671,0.59,1.164,0.658,2.688c0.023,0.509,0.037,0.543-0.01,1.002,0,0.003-0.003,0.004-0.003,0.007v-0.007c-0.094,0.907-0.161,1.243-0.161,1.243-0.1,0.36-0.5,0.56-0.9,0.46z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_enter.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_enter.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<polygon points="24,8,24,16,10,16,10,12,1,18,10,24,10,20,28,20,28,8"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exit.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exit.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_expand.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_expand.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exposure.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exposure.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M3,3v24h24v-24h-24zm21,18h-9v-3h9v3zm-18,3v-18h18l-18,18z"/>
<rect height="3" width="9" x="7" y="10"/>
<rect height="9" width="3" x="10" y="7"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking_off.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking_off.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_failed.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_failed.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M23.041,9.079L9.08,23.041C10.74,24.266,12.783,25,15,25c5.514,0,10-4.486,10-10 C25,12.783,24.266,10.739,23.041,9.079z" fill="none"/>
<path d="M20.92,6.958C19.26,5.733,17.217,4.999,15,4.999C9.486,4.999,5,9.485,5,15c0,2.216,0.733,4.26,1.958,5.919 L20.92,6.958z" fill="none"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites_remove.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites_remove.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_filter.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_filter.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon points="18.21,20.57,21.18,10.92,13.57,10.92,15.86,3.5,11.4,3.5,8.436,13.15,16.04,13.15,13.76,20.57,10.43,20.57,16,26.5,21.56,20.57"/>
<rect fill="none" height="30" width="30"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash_charging.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash_charging.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M1,14v15h11v-15h-11zm8,12h-5v-9h5v9z"/>
<rect height="2" width="5" x="4" y="11"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash_off.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash_off.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_folder.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_folder.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward_email.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward_email.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward_msg.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward_msg.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_genres.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_genres.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M14.18,10.2c0.559,0,0.954,0.538,1.188,0.989l0.728,1.406-1.15,1.151,1.159,1.401c0.223,0.27,0.445,0.515,0.681,0.75,0.296,0.297,0.625,0.552,0.969,0.77-1.075,0.782-2.249,1.651-3.119,2.521-1.016,1.015-1.342,2.373-1.657,3.687-0.337,1.404-0.656,2.73-1.724,3.799-0.231,0.231-0.386,0.251-0.523,0.251-1.333,0-3.588-2.265-4.55-3.231l-0.214-0.21-0.206-0.21c-0.966-0.961-3.227-3.213-3.229-4.546,0-0.139,0.019-0.294,0.249-0.524,1.069-1.067,2.397-1.387,3.802-1.724,1.313-0.315,2.668-0.641,3.683-1.652,0.942-0.942,1.294-1.738,1.577-2.379,0.243-0.552,0.42-0.95,1.1-1.631,0.39-0.4,0.84-0.63,1.22-0.63m13.68-8.421l-5.897,2.418s0.26,0.99-0.418,1.669l-4.405,4.405c-0.736-1.422-1.833-2.07-2.964-2.07-0.918,0-1.857,0.427-2.644,1.213-1.79,1.79-1.242,2.575-2.677,4.009-1.437,1.434-4.917,0.813-7.483,3.376-2.566,2.568,1.433,6.354,3.185,8.105,1.347,1.348,3.896,4.022,6.169,4.022,0.685,0,1.344-0.243,1.938-0.837,2.565-2.565,1.941-6.048,3.38-7.483,1.433-1.434,4.124-3.1,4.9-3.874,0.359-0.358,0.688-0.977,0.091-0.995-0.632-0.019-2.012-0.424-2.84-1.252-0.204-0.204-0.386-0.407-0.554-0.61l6.291-6.293c0.849-0.842,2.048-0.861,2.157-0.861h0.008l3.549-4.117-1.8-0.83z"/>
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<rect height="9.914" width="8" x="11" y="5"/>
<rect height="2" width="12" x="9.041" y="2.021"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag_off.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag_off.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<rect height="2" width="12" x="9.041" y="2.021"/>
<path d="M22.99,18.84c-0.051-3.396-1.641-6.347-3.99-7.942v-5.9h-8v1.852l11.99,11.99z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_go.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_go.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_gps.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_gps.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_gps_off.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_gps_off.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_group.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_group.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hard_disk.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hard_disk.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hd.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hd.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M0.998,3v24h28V3H0.998z M25.998,24h-22V6h22V24z"/>
<path d="M14.057,10.632v8.736H12.44V15.12H9.943v4.248H8.332v-8.736h1.611v3.492h2.496v-3.492H14.057z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_help_all.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_help_all.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_history.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_history.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hold_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hold_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M28.91,10.03l-7.671,2.057c-0.341,0.139-0.547,0.472-0.461,0.798l0.571,2.261c-0.002-0.001-0.008-0.001-0.01-0.001,0.001,0.001,0.002,0.002,0.002,0.003-1.125,0.355-3.859,0.922-5.933,0.923-2.159-0.001-4.325-0.161-6.604-0.766,0,0-0.009-0.002-0.012-0.002,0.006-0.007,0.012-0.013,0.017-0.02l0.648-2.953c0.081-0.374-0.194-0.738-0.608-0.816l-7.822-1.486c-0.412-0.076-0.811,0.162-0.891,0.537,0,0-0.068,0.325-0.126,1.224-0.001,0-0.001,0-0.001,0.002-0.031,0.489,0.042,0.586,0.092,1.13,0.043,0.466,0.126,0.885,0.219,1.254,0,0.001-0.003,0.003-0.002,0.005,0.019,0.074,0.039,0.145,0.059,0.216,0.002,0.009,0.005,0.018,0.006,0.025,0.203,0.72,0.43,1.17,0.43,1.17,0.338,0.572,1.855,2.187,3.813,3.068,1.244,0.559,5.891,1.607,10.1,1.608,4.205,0.001,9.565-1.174,11.44-2.178s2.946-2.212,3.165-2.671,0.59-1.164,0.658-2.688c0.023-0.509,0.037-0.543-0.01-1.002,0-0.003-0.003-0.004-0.003-0.007v0.007c-0.094-0.907-0.161-1.243-0.161-1.243-0.12-0.35-0.52-0.549-0.92-0.44z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_home.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_home.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M25.34,17.21v2.332h1.691v2.277c-0.228,0.082-0.528,0.148-1.005,0.148-1.754,0-2.802-1.453-2.802-3.889,0-1.189,0.382-5.021,4.613-3.446l0.46,0.289,0.536-2.296s-0.991-0.788-2.648-0.788c-2.989,0-5.13,2.537-5.005,6.31,0.188,5.582,3.314,6.182,4.773,6.182,1.977,0,3.043-0.787,3.043-0.787v-6.332h-3.647z"/>
<path d="M12.68,5.949h6.298v3.392h-3.878v2.937s4.93-0.916,4.631,6.4c0,0,0.152,5.113-3.726,5.584-1.121,0.139-3.352-0.305-3.352-0.305l0.026-3.436s4.743,1.521,4.743-2.199c0-3.982-4.743-2.626-4.743-2.626v-9.741z"/>
<rect height="2.625" width="2.144" x="8.896" y="21.54"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_attach.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_attach.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon points="8.182,22.26,5.341,22.26,9.513,28.94,11.54,27.67"/>
<polygon points="10.52,22.26,12.02,24.68,16.12,24.68,14.61,22.26"/>
<polygon points="16.95,22.26,18.45,24.68,22.56,24.68,21.06,22.26"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_context.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_context.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon points="24.72,22.22,5.481,22.22,9.64,28.88,11.68,27.6,9.827,24.63,9.839,24.63,9.839,24.63,24.72,24.63"/>
<polygon points="20.56,13,18.52,14.28,20.37,17.25,5.481,17.26,5.481,19.66,24.72,19.66"/>
<path d="M22.12,7.638v1.314h1.176v1.287c-0.156,0.045-0.365,0.083-0.697,0.083-1.211,0-1.936-0.821-1.936-2.193,0-0.672,0.261-2.834,3.19-1.947l0.32,0.164,0.37-1.295s-0.688-0.447-1.833-0.447c-2.073,0-3.55,1.433-3.463,3.563,0.128,3.151,2.293,3.489,3.301,3.489,1.366,0,2.104-0.447,2.104-0.447v-3.562h-2.525z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_multipdp.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_multipdp.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon points="20.47,13.06,18.42,14.34,20.28,17.32,17.24,17.32,14.58,13.06,12.53,14.34,14.39,17.32,5.341,17.32,5.341,19.74,24.64,19.74"/>
<polygon points="9.512,28.89,11.56,27.61,9.71,24.63,12.74,24.63,15.4,28.89,17.45,27.61,15.59,24.63,24.64,24.63,24.64,22.21,5.341,22.21"/>
<path d="M22.18,7.645v1.318h1.179v1.291c-0.159,0.044-0.368,0.083-0.699,0.083-1.218,0-1.943-0.822-1.943-2.201,0-0.674,0.262-2.843,3.2-1.953l0.32,0.164,0.374-1.299s-0.691-0.447-1.841-0.447c-2.076,0-3.559,1.437-3.474,3.574,0.13,3.161,2.3,3.5,3.311,3.5,1.373,0,2.112-0.449,2.112-0.449v-3.575h-2.538z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_suspended.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_suspended.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon points="24.64,22.19,24.64,24.61,14.34,24.6,16.36,22.19"/>
<polygon points="5.342,22.19,10.6,22.19,8.563,24.6,5.342,24.6"/>
<polygon points="24.64,17.21,24.64,19.63,18.5,19.62,20.52,17.21"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_img_quality.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_img_quality.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<rect height="3.375" width="3.375" x="24.38" y="13.31"/>
<rect height="3.375" width="3.375" x="19.69" y="7.781"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_info.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_info.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M15,1.702c-7.182,0-13,5.818-13,13s5.818,13,13,13,13-5.818,13-13-5.82-13-13-13zm0,3.672c1.576,0,2.854,1.204,2.854,2.688s-1.277,2.688-2.854,2.688-2.854-1.203-2.854-2.688,1.28-2.688,2.85-2.688zm4.12,18.04h-8.229v-1.443h1.123v-7.612h-1.123v-1.444h7.107v9.057h1.121v1.426z"/>
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_iso.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_iso.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_italic.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_italic.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_join_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_join_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M10.21,8.109c0.054,0.038,0.102,0.08,0.158,0.117,0.002,0.085,0.007,0.529,0.002,0.614-0.004,0.053-0.023,0.109-0.042,0.166,0.089,1.067,0.151,3.104-0.483,4.349-0.273,0.539-0.615,1.011-1.033,1.424,0.305,0.294,0.856,0.707,1.623,1.221h6.824c-0.354-0.427-0.67-0.879-0.912-1.389-0.469-0.993-0.623-2.394-0.651-3.634-1.034-0.719-2.032-1.543-2.069-2.137-0.006-0.09,0-0.523,0-0.614,0.621-0.419,1.057-0.91,1.383-1.552,0.605-1.188,0.281-3.985,0.281-3.985,0-1.242-1.64-2.692-2.89-2.692h-0.8c-1.254,0-2.902,1.45-2.902,2.689,0,0-0.172,1.68,0.018,2.992,0.761,0.665,1.314,1.533,1.494,2.428z"/>
<path d="M19.99,15.8c0.003,0.112,0.009,0.695,0.001,0.807-0.005,0.076-0.032,0.158-0.061,0.24,0-0.001,0.002-0.002,0.002-0.003h4.393c-0.027-0.081-0.055-0.162-0.06-0.237-0.007-0.118-0.001-0.687,0.001-0.807,0.814-0.549,1.385-1.194,1.814-2.037,0.795-1.559,0.369-5.229,0.369-5.229,0-1.626-2.16-3.53-3.805-3.53h-1.04c-1.645,0-3.81,1.904-3.81,3.53,0,0-0.376,3.652,0.367,5.225,0.4,0.86,0.99,1.49,1.83,2.04z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_landscape.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_landscape.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30" x="0.002"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_last_result.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_last_result.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<rect height="4" width="2" x="14" y="0"/>
<rect height="4" width="6" x="12" y="26"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light_off.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light_off.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<rect fill="none" height="30" width="30"/>
<rect height="3.75" width="5.25" x="12.33" y="21.75"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M24.64,2.317c-1.588,1.121-4.315,2.698-5.496,2.698h-0.004c-0.271-0.031-0.67-0.292-1.092-0.568-0.836-0.548-1.982-1.299-3.654-1.31-0.963,0-2.313,0.739-3.456,1.504l5.146,13.32c0.676-1.401,1.627-3.068,2.503-3.689,0.306-0.218,1.161-0.649,1.849-0.995,0.693-0.351,1.294-0.653,1.648-0.878,2.91-1.868,3.971-8.409,4.082-9.149l0.33-2.251-1.86,1.317z"/>
<polygon points="8.435,3.566,3.5,5.465,4.802,8.84,5.583,8.539,12.58,26.66,15.88,29,16.74,25.07"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location_collection.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location_collection.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M17.59,10.22c-0.906,0.64-2.466,1.541-3.142,1.541h-0.002c-0.154-0.018-0.383-0.167-0.623-0.324-0.479-0.314-1.133-0.742-2.09-0.749-0.551,0-1.32,0.422-1.975,0.859l2.935,7.61c0.387-0.801,0.93-1.753,1.432-2.108,0.176-0.124,0.664-0.371,1.057-0.568,0.396-0.2,0.738-0.373,0.942-0.502,1.664-1.067,2.27-4.806,2.332-5.228l0.193-1.287-1.06,0.757z"/>
<polygon points="8.333,10.93,5.513,12.02,6.257,13.95,6.704,13.77,10.7,24.13,12.59,25.47,13.08,23.22"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_log.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_log.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M0,0v30h30v-30h-30zm28.24,26.99l-6.012-6.012-0.454,2.042,5.218,5.219h-24.37l5.535-5.534-0.454-2.042-5.942,5.941v-23.6l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202-2.479-1.04-3.137-2.756-3.311-3.69l-3.856-3.856h23.59l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738v24.36z" fill-opacity="0.5" stroke-opacity="0.5"/>
<rect height="3.519" width="17.65" x="6.177" y="13.25"/>
<polygon points="9.706,25.59,20.29,25.59,22.06,17.65,7.941,17.65"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_low_light.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_low_light.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<rect height="4" width="2" x="14" y="0"/>
<rect height="4" width="6" x="12" y="26"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lsk_horizontal.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lsk_horizontal.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lsk_vertical.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lsk_vertical.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_memory_in_use.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_memory_in_use.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mic_mute.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mic_mute.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M12.39,8.243l4.364-4.364c1.17-1.17,3.073-1.17,4.242,0l2.13,2.121c1.169,1.17,1.169,3.073,0,4.243l-4.363,4.363,1.414,1.414,4.363-4.363c1.953-1.953,1.953-5.118,0-7.071l-2.121-2.121c-1.953-1.953-5.119-1.953-7.071,0l-4.364,4.364,1.41,1.421z"/>
<path d="M17,12.5c0-1.93-1.57-3.5-3.5-3.5-0.109,0-0.212,0.021-0.318,0.032l3.786,3.785c0.01-0.11,0.03-0.21,0.03-0.32z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mic_unmute.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mic_unmute.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M24.56,4.586l-2.121-2.121c-1.953-1.953-5.119-1.953-7.071,0l-4.95,4.95-1.42-1.415-2.121,2.121,1.414,1.415-2.828,2.828c-0.791,0.791-1.245,1.782-1.396,2.81l-0.019,0.019,0.016,0.016c-0.209,1.499,0.245,3.074,1.398,4.228l2.121,2.121c1.153,1.153,2.728,1.607,4.227,1.398l0.016,0.016,0.019-0.019c0.059-0.009,0.117-0.007,0.175-0.017v3.06h-5c-0.553,0-1,0.447-1,1v2h15v-2c0-0.553-0.447-1-1-1h-5v-4.808l2.464-2.464,1.414,1.414,2.121-2.121-1.414-1.414,4.95-4.95c1.96-1.956,1.96-5.121,0.01-7.074zm-11.04,9.914c-1.104,0-2-0.896-2-2s0.896-2,2-2,2,0.896,2,2-0.89,2-2,2zm9.62-4.26l-4.95,4.95-1.419-1.42c0.155-0.396,0.248-0.823,0.248-1.273,0-1.93-1.57-3.5-3.5-3.5-0.45,0-0.878,0.093-1.273,0.248l-0.42-0.419,4.95-4.95c1.17-1.17,3.073-1.17,4.242,0l2.12,2.121c1.17,1.17,1.17,3.073,0,4.24z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_minus.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_minus.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<rect height="4" width="22" x="4" y="13"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_missed_call_unseen.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_missed_call_unseen.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mobile.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mobile.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mono_recognize_song.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mono_recognize_song.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_more.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_more.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<circle cx="4.5" cy="14.5" r="3.5"/>
<circle cx="15.5" cy="14.5" r="3.5"/>
<circle cx="25.5" cy="14.5" r="3.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_music_albums.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_music_albums.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_new_event.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_new_event.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<polygon points="18.88,18,21.13,1,8.867,1,11.12,18"/>
<path d="M15,19c-2.756,0-5,2.243-5,5,0,2.756,2.244,5,5,5s4.999-2.244,4.999-5c0-2.76-2.24-5-5-5z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_next.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_next.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night_portrait.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night_portrait.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M22.443,18.261c-0.01-0.135-0.002-0.785,0-0.922c0.932-0.627,1.584-1.365,2.074-2.328c0.908-1.781,0.422-5.977,0.422-5.977 C24.939,7.175,22.471,5,20.59,5h-1.191c-1.879,0-4.354,2.176-4.354,4.035c0,0-0.43,4.174,0.42,5.971 c0.467,0.982,1.139,1.709,2.092,2.334c0.002,0.129,0.01,0.795,0.002,0.922c-0.117,1.822-6.258,5.09-6.559,5.484V29h2.988v-2h2v2h8 v-2h2v2H29v-5.25C28.699,23.353,22.559,20.083,22.443,18.261z"/>
<path d="M6.143,8.5c0-3.229,2.023-5.971,4.857-7.029C10.197,1.173,9.334,1,8.428,1C4.324,1,1,4.357,1,8.5S4.324,16,8.428,16 c0.906,0,1.77-0.17,2.572-0.471C8.166,14.472,6.143,11.728,6.143,8.5z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_notes_all.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_notes_all.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_notes_collections.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_notes_collections.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_offline.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_offline.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon fill="none" points="20.22,5.712,13.87,5.712,13.87,12.74,20.22,7.489"/>
<polygon fill="none" points="4.585,5.712,4.585,7.453,10.79,12.69,10.79,5.712"/>
<path d="M1.509,2.634v6.247l9.281,7.836v10.59h3.079v-10.58l9.43-7.788v-6.305h-21.79zm3.076,4.819v-1.741h6.205v6.98l-6.205-5.237zm9.285-1.741h6.349v1.776l-6.349,5.249v-7.028z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_one.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_one.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_online_support.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_online_support.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_options_menu.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_options_menu.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon points="28.5,7,15,25,1.5,7"/>
<rect fill="none" height="30" width="30"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_organize.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_organize.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon points="12,13,8.526,13,8.526,10,1,15.03,8.526,20,8.526,17,12,17"/>
<polygon points="18,17,21.47,17,21.47,20,29,14.97,21.47,10,21.47,13,18,13"/>
<polygon points="17,12,17,8.526,20,8.526,14.97,1,10,8.526,13,8.526,13,12"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_outbox.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_outbox.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<polygon points="26,20 26,24 4,24 4,20 1,20 1,29 2,29 4,29 26,29 28,29 29,29 29,20 "/>
<polygon points="11,19 19,19 19,11 23,11 15,1 7,11 11,11 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_ovistore.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_ovistore.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_1_2.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_1_2.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M6.249,10.773H6.213l-2.035,1.098l-0.306-1.206l2.557-1.368H7.78V21H6.249V10.773z"/>
<path d="M19.811,21v-0.973l1.242-1.206c2.988-2.845,4.357-4.357,4.357-6.122c0-1.188-0.559-2.286-2.305-2.286 c-1.063,0-1.945,0.54-2.484,0.99l-0.505-1.116c0.792-0.666,1.963-1.188,3.295-1.188c2.521,0,3.583,1.729,3.583,3.403 c0,2.16-1.566,3.906-4.033,6.283l-0.918,0.864v0.036h5.239V21H19.811z"/>
<g fill-opacity="0.5" stroke-opacity="0.5">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_1_3.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_1_3.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M6.249,10.773H6.213l-2.034,1.098l-0.306-1.206L6.43,9.297h1.35V21h-1.53V10.773z"/>
<path d="M20.188,19.199c0.45,0.271,1.477,0.721,2.593,0.721c2.017,0,2.664-1.278,2.646-2.269c-0.018-1.639-1.494-2.341-3.025-2.341 h-0.882v-1.188h0.882c1.152,0,2.611-0.595,2.611-1.98c0-0.937-0.594-1.765-2.053-1.765c-0.936,0-1.836,0.414-2.34,0.774 l-0.433-1.152c0.63-0.45,1.818-0.9,3.079-0.9c2.305,0,3.349,1.368,3.349,2.791c0,1.224-0.738,2.25-2.161,2.772v0.036 c1.441,0.27,2.594,1.351,2.611,2.989c0,1.872-1.477,3.511-4.268,3.511c-1.314,0-2.467-0.414-3.043-0.792L20.188,19.199z"/>
<g fill-opacity="0.5" stroke-opacity="0.5">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_1_4.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_1_4.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M6.249,10.773H6.213l-2.034,1.098l-0.306-1.206L6.43,9.297h1.35V21h-1.53V10.773z"/>
<path d="M24.707,21v-3.205H19.27v-1.026l5.223-7.472h1.71v7.273h1.639v1.225h-1.639V21H24.707z M24.707,16.57v-3.907 c0-0.611,0.019-1.224,0.055-1.836h-0.055c-0.359,0.684-0.647,1.188-0.972,1.729l-2.862,3.979v0.035H24.707z"/>
<g fill-opacity="0.5" stroke-opacity="0.5">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_1_5.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_1_5.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M6.249,10.773H6.213l-2.034,1.098l-0.306-1.206L6.43,9.297h1.35V21h-1.53V10.773z"/>
<path d="M26.797,10.629h-4.466l-0.45,3.007c0.27-0.036,0.521-0.054,0.954-0.054c0.919,0,1.801,0.18,2.521,0.63 c0.919,0.504,1.675,1.53,1.675,2.989c0,2.286-1.818,3.997-4.357,3.997c-1.278,0-2.341-0.36-2.917-0.721l0.396-1.206 c0.486,0.288,1.44,0.648,2.521,0.648c1.477,0,2.772-0.973,2.755-2.539c0-1.513-1.026-2.574-3.349-2.574 c-0.685,0-1.206,0.054-1.639,0.107l0.757-5.617h5.6V10.629z"/>
<g fill-opacity="0.5" stroke-opacity="0.5">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_2_2.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_2_2.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M2.81,21v-0.973l1.243-1.206c2.989-2.845,4.357-4.357,4.357-6.122c0-1.188-0.559-2.286-2.305-2.286 c-1.063,0-1.945,0.54-2.485,0.99l-0.504-1.116c0.792-0.666,1.963-1.188,3.295-1.188c2.521,0,3.583,1.729,3.583,3.403 c0,2.16-1.566,3.906-4.033,6.283l-0.918,0.864v0.036h5.239V21H2.81z"/>
<path d="M19.811,21v-0.973l1.242-1.206c2.988-2.845,4.357-4.357,4.357-6.122c0-1.188-0.559-2.286-2.305-2.286 c-1.063,0-1.945,0.54-2.484,0.99l-0.505-1.116c0.792-0.666,1.963-1.188,3.295-1.188c2.521,0,3.583,1.729,3.583,3.403 c0,2.16-1.566,3.906-4.033,6.283l-0.918,0.864v0.036h5.239V21H19.811z"/>
<g fill-opacity="0.5" stroke-opacity="0.5">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_2_3.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_2_3.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M2.811,21v-0.973l1.242-1.206c2.988-2.845,4.357-4.357,4.357-6.122c0-1.188-0.559-2.286-2.305-2.286 c-1.063,0-1.945,0.54-2.484,0.99l-0.505-1.116c0.792-0.666,1.963-1.188,3.295-1.188c2.521,0,3.583,1.729,3.583,3.403 c0,2.16-1.566,3.906-4.033,6.283l-0.918,0.864v0.036h5.239V21H2.811z"/>
<path d="M20.188,19.199c0.45,0.271,1.477,0.721,2.593,0.721c2.017,0,2.664-1.278,2.646-2.269c-0.018-1.639-1.494-2.341-3.025-2.341 h-0.882v-1.188h0.882c1.152,0,2.611-0.595,2.611-1.98c0-0.937-0.594-1.765-2.053-1.765c-0.936,0-1.836,0.414-2.34,0.774 l-0.433-1.152c0.63-0.45,1.818-0.9,3.079-0.9c2.305,0,3.349,1.368,3.349,2.791c0,1.224-0.738,2.25-2.161,2.772v0.036 c1.441,0.27,2.594,1.351,2.611,2.989c0,1.872-1.477,3.511-4.268,3.511c-1.314,0-2.467-0.414-3.043-0.792L20.188,19.199z"/>
<g fill-opacity="0.5" stroke-opacity="0.5">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_2_4.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_2_4.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M2.811,21v-0.973l1.242-1.206c2.988-2.845,4.357-4.357,4.357-6.122c0-1.188-0.559-2.286-2.305-2.286 c-1.063,0-1.945,0.54-2.484,0.99l-0.505-1.116c0.792-0.666,1.963-1.188,3.295-1.188c2.521,0,3.583,1.729,3.583,3.403 c0,2.16-1.566,3.906-4.033,6.283l-0.918,0.864v0.036h5.239V21H2.811z"/>
<path d="M24.707,21v-3.205H19.27v-1.026l5.223-7.472h1.71v7.273h1.639v1.225h-1.639V21H24.707z M24.707,16.57v-3.907 c0-0.611,0.019-1.224,0.055-1.836h-0.055c-0.359,0.684-0.647,1.188-0.972,1.729l-2.862,3.979v0.035H24.707z"/>
<g fill-opacity="0.5" stroke-opacity="0.5">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_2_5.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_2_5.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M2.811,21v-0.973l1.242-1.206c2.988-2.845,4.357-4.357,4.357-6.122c0-1.188-0.559-2.286-2.305-2.286 c-1.063,0-1.945,0.54-2.484,0.99l-0.505-1.116c0.792-0.666,1.963-1.188,3.295-1.188c2.521,0,3.583,1.729,3.583,3.403 c0,2.16-1.566,3.906-4.033,6.283l-0.918,0.864v0.036h5.239V21H2.811z"/>
<path d="M26.797,10.629h-4.466l-0.45,3.007c0.27-0.036,0.521-0.054,0.954-0.054c0.919,0,1.801,0.18,2.521,0.63 c0.919,0.504,1.675,1.53,1.675,2.989c0,2.286-1.818,3.997-4.357,3.997c-1.278,0-2.341-0.36-2.917-0.721l0.396-1.206 c0.486,0.288,1.44,0.648,2.521,0.648c1.477,0,2.772-0.973,2.755-2.539c0-1.513-1.026-2.574-3.349-2.574 c-0.685,0-1.206,0.054-1.639,0.107l0.757-5.617h5.6V10.629z"/>
<g fill-opacity="0.5" stroke-opacity="0.5">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_3_3.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_3_3.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M3.188,19.199c0.45,0.271,1.477,0.721,2.593,0.721c2.017,0,2.664-1.278,2.646-2.269c-0.018-1.639-1.494-2.341-3.025-2.341 H4.521v-1.188h0.882c1.152,0,2.611-0.595,2.611-1.98c0-0.937-0.594-1.765-2.053-1.765c-0.936,0-1.836,0.414-2.34,0.774L3.188,9.999 c0.63-0.45,1.818-0.9,3.079-0.9c2.305,0,3.349,1.368,3.349,2.791c0,1.224-0.738,2.25-2.161,2.772v0.036 c1.441,0.27,2.594,1.351,2.611,2.989c0,1.872-1.477,3.511-4.268,3.511c-1.314,0-2.467-0.414-3.043-0.792L3.188,19.199z"/>
<path d="M20.188,19.199c0.45,0.271,1.477,0.721,2.593,0.721c2.017,0,2.664-1.278,2.646-2.269c-0.018-1.639-1.494-2.341-3.025-2.341 h-0.882v-1.188h0.882c1.152,0,2.611-0.595,2.611-1.98c0-0.937-0.594-1.765-2.053-1.765c-0.936,0-1.836,0.414-2.34,0.774 l-0.433-1.152c0.63-0.45,1.818-0.9,3.079-0.9c2.305,0,3.349,1.368,3.349,2.791c0,1.224-0.738,2.25-2.161,2.772v0.036 c1.441,0.27,2.594,1.351,2.611,2.989c0,1.872-1.477,3.511-4.268,3.511c-1.314,0-2.467-0.414-3.043-0.792L20.188,19.199z"/>
<g fill-opacity="0.5" stroke-opacity="0.5">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_3_4.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_3_4.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M3.188,19.199c0.45,0.271,1.477,0.721,2.593,0.721c2.017,0,2.664-1.278,2.646-2.269c-0.018-1.639-1.494-2.341-3.025-2.341 H4.521v-1.188h0.882c1.152,0,2.611-0.595,2.611-1.98c0-0.937-0.594-1.765-2.053-1.765c-0.936,0-1.836,0.414-2.34,0.774L3.188,9.999 c0.63-0.45,1.818-0.9,3.079-0.9c2.305,0,3.349,1.368,3.349,2.791c0,1.224-0.738,2.25-2.161,2.772v0.036 c1.441,0.27,2.594,1.351,2.611,2.989c0,1.872-1.477,3.511-4.268,3.511c-1.314,0-2.467-0.414-3.043-0.792L3.188,19.199z"/>
<path d="M24.707,21v-3.205H19.27v-1.026l5.223-7.472h1.71v7.273h1.639v1.225h-1.639V21H24.707z M24.707,16.57v-3.907 c0-0.611,0.019-1.224,0.055-1.836h-0.055c-0.359,0.684-0.647,1.188-0.972,1.729l-2.862,3.979v0.035H24.707z"/>
<g fill-opacity="0.5" stroke-opacity="0.5">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_3_5.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_3_5.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M3.188,19.199c0.45,0.271,1.477,0.721,2.593,0.721c2.017,0,2.664-1.278,2.646-2.269c-0.018-1.639-1.494-2.341-3.025-2.341 H4.521v-1.188h0.882c1.152,0,2.611-0.595,2.611-1.98c0-0.937-0.594-1.765-2.053-1.765c-0.936,0-1.836,0.414-2.34,0.774L3.188,9.999 c0.63-0.45,1.818-0.9,3.079-0.9c2.305,0,3.349,1.368,3.349,2.791c0,1.224-0.738,2.25-2.161,2.772v0.036 c1.441,0.27,2.594,1.351,2.611,2.989c0,1.872-1.477,3.511-4.268,3.511c-1.314,0-2.467-0.414-3.043-0.792L3.188,19.199z"/>
<path d="M26.797,10.629h-4.466l-0.45,3.007c0.27-0.036,0.521-0.054,0.954-0.054c0.919,0,1.801,0.18,2.521,0.63 c0.919,0.504,1.675,1.53,1.675,2.989c0,2.286-1.818,3.997-4.357,3.997c-1.278,0-2.341-0.36-2.917-0.721l0.396-1.206 c0.486,0.288,1.44,0.648,2.521,0.648c1.477,0,2.772-0.973,2.755-2.539c0-1.513-1.026-2.574-3.349-2.574 c-0.685,0-1.206,0.054-1.639,0.107l0.757-5.617h5.6V10.629z"/>
<g fill-opacity="0.5" stroke-opacity="0.5">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_4_4.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_4_4.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M7.707,21v-3.205H2.27v-1.026l5.223-7.472h1.71v7.273h1.639v1.225H9.202V21H7.707z M7.707,16.57v-3.907 c0-0.611,0.019-1.224,0.055-1.836H7.707c-0.359,0.684-0.647,1.188-0.972,1.729l-2.862,3.979v0.035H7.707z"/>
<path d="M24.707,21v-3.205H19.27v-1.026l5.223-7.472h1.71v7.273h1.639v1.225h-1.639V21H24.707z M24.707,16.57v-3.907 c0-0.611,0.019-1.224,0.055-1.836h-0.055c-0.359,0.684-0.647,1.188-0.972,1.729l-2.862,3.979v0.035H24.707z"/>
<g fill-opacity="0.5" stroke-opacity="0.5">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_4_5.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_4_5.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M7.707,21v-3.205H2.27v-1.026l5.223-7.472h1.71v7.273h1.639v1.225H9.202V21H7.707z M7.707,16.57v-3.907 c0-0.611,0.019-1.224,0.055-1.836H7.707c-0.359,0.684-0.647,1.188-0.972,1.729l-2.862,3.979v0.035H7.707z"/>
<path d="M26.797,10.629h-4.466l-0.45,3.007c0.27-0.036,0.521-0.054,0.954-0.054c0.919,0,1.801,0.18,2.521,0.63 c0.919,0.504,1.675,1.53,1.675,2.989c0,2.286-1.818,3.997-4.357,3.997c-1.278,0-2.341-0.36-2.917-0.721l0.396-1.206 c0.486,0.288,1.44,0.648,2.521,0.648c1.477,0,2.772-0.973,2.755-2.539c0-1.513-1.026-2.574-3.349-2.574 c-0.685,0-1.206,0.054-1.639,0.107l0.757-5.617h5.6V10.629z"/>
<g fill-opacity="0.5" stroke-opacity="0.5">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_5_5.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_page_5_5.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M9.797,10.629H5.331l-0.45,3.007c0.27-0.036,0.521-0.054,0.954-0.054c0.919,0,1.801,0.18,2.521,0.63 c0.919,0.504,1.675,1.53,1.675,2.989c0,2.286-1.818,3.997-4.357,3.997c-1.278,0-2.341-0.36-2.917-0.721l0.396-1.206 c0.486,0.288,1.44,0.648,2.521,0.648c1.477,0,2.772-0.973,2.755-2.539c0-1.513-1.026-2.574-3.349-2.574 c-0.685,0-1.206,0.054-1.639,0.107l0.757-5.617h5.6V10.629z"/>
<path d="M26.797,10.629h-4.466l-0.45,3.007c0.27-0.036,0.521-0.054,0.954-0.054c0.919,0,1.801,0.18,2.521,0.63 c0.919,0.504,1.675,1.53,1.675,2.989c0,2.286-1.818,3.997-4.357,3.997c-1.278,0-2.341-0.36-2.917-0.721l0.396-1.206 c0.486,0.288,1.44,0.648,2.521,0.648c1.477,0,2.772-0.973,2.755-2.539c0-1.513-1.026-2.574-3.349-2.574 c-0.685,0-1.206,0.054-1.639,0.107l0.757-5.617h5.6V10.629z"/>
<g fill-opacity="0.5" stroke-opacity="0.5">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pause.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pause.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_attach.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_attach.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon fill="none" points="10.94,4.257,13.74,6.627,13.74,3.691,10.94,3.691"/>
<polygon fill="none" points="15.86,3.691,15.86,6.66,18.74,4.276,18.74,3.691"/>
<path d="M8.826,1.578v3.663l4.916,4.153v5.738h2.115v-5.73l4.994-4.128v-3.694h-12.02zm7.034,5.082v-2.969h2.879v0.584l-2.88,2.385zm-2.12-0.033l-2.807-2.37v-0.566h2.805v2.936h0.002z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_context.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_context.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon points="24.67,22.22,5.854,22.22,9.92,28.73,11.92,27.48,10.11,24.58,10.12,24.58,10.12,24.58,24.67,24.58"/>
<polygon points="20.6,13.21,18.6,14.46,20.41,17.37,5.854,17.37,5.854,19.72,24.67,19.72"/>
<polygon fill="none" points="11.36,4.258,14.17,6.627,14.17,3.692,11.36,3.692"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_multipdp.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_multipdp.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon fill="none" points="10.75,4.258,13.56,6.627,13.56,3.691,10.75,3.691"/>
<polygon fill="none" points="15.68,3.691,15.68,6.661,18.55,4.277,18.55,3.691"/>
<path d="M8.642,1.577v3.664l4.918,4.154v5.738h2.115v-5.728l4.993-4.129v-3.696h-12.03zm7.038,5.084v-2.97h2.88v0.586l-2.88,2.384zm-2.12-0.034l-2.808-2.369v-0.567h2.805v2.935,0.001z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_suspended.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_suspended.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon fill="none" points="19.27,4.229,16.46,6.598,16.46,3.663,19.27,3.663"/>
<polygon fill="none" points="14.34,3.663,14.34,6.632,11.46,4.247,11.46,3.663"/>
<path d="M21.38,1.548v3.664l-4.918,4.154v5.74h-2.115v-5.737l-4.994-4.13v-3.695h12.03zm-7.04,5.084v-2.969h-2.881v0.585l2.88,2.384zm2.12-0.034l2.803-2.369v-0.566h-2.803v2.935z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_person_activitystream.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_person_activitystream.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photo_albums.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photo_albums.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photos.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photos.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play_history.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play_history.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_playlist.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_playlist.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_plus.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_plus.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<rect height="4" width="22" x="4" y="13"/>
<rect height="22" width="4" x="13" y="4"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_podcast.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_podcast.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M18.8,8.537l-1.735-1.735c-1.598-1.598-4.188-1.598-5.784,0l-4.05,4.05-1.155-1.157-1.735,1.737,1.157,1.157-2.313,2.31c-0.646,0.647-1.019,1.458-1.142,2.299l-0.015,0.015,0.013,0.014c-0.171,1.226,0.2,2.515,1.144,3.457l1.735,1.735c0.943,0.944,2.231,1.315,3.457,1.145l0.014,0.013,0.015-0.016c0.048-0.007,0.096-0.005,0.144-0.013v2.506h-4.092c-0.451,0-0.818,0.366-0.818,0.818v1.636h12.27v-1.636c0-0.452-0.366-0.818-0.818-0.818h-4.09v-3.933l2.016-2.016,1.156,1.156,1.735-1.734-1.157-1.157,4.05-4.049c1.59-1.6,1.59-4.18-0.01-5.783zm-9.026,8.113c-0.903,0-1.636-0.732-1.636-1.636s0.732-1.636,1.636-1.636,1.636,0.731,1.636,1.636c0,0.91-0.73,1.64-1.636,1.64zm7.866-3.48l-4.049,4.049-1.161-1.162c0.127-0.323,0.203-0.673,0.203-1.041,0-1.579-1.284-2.863-2.863-2.863-0.368,0-0.718,0.076-1.042,0.203l-0.335-0.35,4.049-4.05c0.957-0.957,2.514-0.957,3.471,0l1.735,1.734c0.96,0.956,0.96,2.516,0,3.476z"/>
<path d="M22.21,1.066l-1.09,1.739c4.889,3.068,6.369,9.545,3.302,14.44l1.738,1.09c3.67-5.85,1.9-13.59-3.95-17.26z"/>
<path d="M20.03,4.544l-1.091,1.738c2.972,1.867,3.874,5.803,2.007,8.773l1.739,1.094c2.46-3.93,1.27-9.138-2.66-11.61z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_portrait.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_portrait.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M17.852,16.471c-0.013-0.158,0-0.438,0.002-0.596c1.086-0.732,2.026-1.654,2.6-2.777c1.061-2.08,0.672-7.391,0.672-7.391 c0-2.17-3.242-4.707-5.436-4.707h-1.392c-2.193,0-5.424,2.537-5.424,4.707c0,0-0.331,5.293,0.658,7.391 c0.545,1.145,1.504,2.076,2.615,2.807c0.002,0.147,0.014,0.418,0.004,0.565c-0.137,2.127-7.302,5.938-7.651,6.398V29h3v-2h1.999v2 h11v-2h2v2h3v-6.125C25.148,22.412,17.984,18.598,17.852,16.471z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_power.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_power.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M12.871,3.721c0.038,12.177,0.038,12.177,0.038,12.177s0.008,2.131,2.138,2.137c2.13,0.008,2.124-2.124,2.124-2.124 C17.131,3.735,17.131,3.735,17.131,3.735s-0.158-2.284-2.138-2.138C12.863,1.59,12.871,3.721,12.871,3.721L12.871,3.721z"/>
<path d="M18.112,5.663v3.796c2.921,1.176,4.832,4.033,4.832,7.37c0,4.382-3.563,7.945-7.945,7.945c-4.379,0-7.943-3.563-7.943-7.945 c0-3.279,1.831-6.101,4.674-7.313V5.704C6.927,7.12,3.408,11.563,3.408,16.818c0,6.392,5.201,11.591,11.591,11.591 c6.393,0,11.593-5.199,11.593-11.591C26.592,11.505,22.995,7.027,18.112,5.663z"/>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_predictive_text_off.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_predictive_text_off.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_predictive_text_on.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_predictive_text_on.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_presentation.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_presentation.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_previous.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_previous.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_private_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_private_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_qcif.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_qcif.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M1,3v24h28V3H1z M26,24H4V6h22V24z"/>
<path d="M7.854,18.328c-0.639-0.164-1.121-0.543-1.445-1.141c-0.326-0.599-0.488-1.465-0.488-2.601c0-1.238,0.223-2.15,0.666-2.736 c0.444-0.587,1.104-0.882,1.983-0.882c0.883,0,1.547,0.295,1.992,0.885c0.447,0.588,0.67,1.5,0.67,2.734 c0,1.139-0.172,2.023-0.516,2.65c-0.344,0.629-0.859,1.002-1.545,1.119c0.059,0.272,0.15,0.479,0.277,0.619 c0.127,0.141,0.391,0.211,0.791,0.211v0.771H9.918c-0.602,0-1.059-0.121-1.371-0.362C8.234,19.352,8.002,18.93,7.854,18.328z M8.57,17.566c0.408,0,0.717-0.213,0.932-0.637c0.213-0.427,0.318-1.207,0.318-2.343c0-1.029-0.105-1.75-0.316-2.16 c-0.213-0.411-0.524-0.618-0.934-0.618c-0.406,0-0.717,0.199-0.93,0.6c-0.213,0.398-0.32,1.125-0.32,2.18 c0,0.992,0.105,1.736,0.313,2.234C7.842,17.318,8.154,17.566,8.57,17.566z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_radio_collections.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_radio_collections.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M15.46,20.81l-1.366-1.366c0.058-0.056,0.121-0.104,0.179-0.162,1.753-1.754,1.753-4.611-0.004-6.368-0.056-0.056-0.114-0.104-0.171-0.155l1.362-1.362c0.056,0.052,0.116,0.099,0.172,0.154,2.509,2.51,2.513,6.591,0.007,9.097-0.06,0.05-0.12,0.1-0.18,0.16zm2.44,2.43l-1.367-1.366c0.061-0.056,0.125-0.106,0.184-0.164,3.094-3.095,3.092-8.133-0.008-11.23-0.057-0.056-0.115-0.104-0.172-0.155l1.363-1.363c0.057,0.055,0.115,0.1,0.172,0.155,3.852,3.853,3.857,10.11,0.01,13.96-0.05,0.06-0.11,0.11-0.17,0.17z"/>
<polygon points="5,0,5,3,27,3,27,25,30,25,30,0"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_radio_stations.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_radio_stations.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_recentlog.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_recentlog.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M0,0v30h30v-30h-30zm28.24,26.99l-6.012-6.012-0.454,2.042,5.218,5.219h-24.37l5.535-5.534-0.454-2.042-5.942,5.941v-23.6l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202-2.479-1.04-3.137-2.756-3.311-3.69l-3.856-3.856h23.59l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738v24.36z" fill-opacity="0.5" stroke-opacity="0.5"/>
<rect height="3.519" width="17.65" x="6.177" y="13.25"/>
<polygon points="9.706,25.59,20.29,25.59,22.06,17.65,7.941,17.65"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_redeye.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_redeye.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M24.13,21l3.87-11h-8.639l3.179-9h-5.302l-3.275,9.273c2.109,0.408,4.498,1.305,6.408,2.727h1.268l-0.29,0.824c0.824,0.778,1.511,1.672,1.962,2.698l0.874,1.988-0.874,1.99c-0.965,2.193-2.979,3.809-5.204,4.881l3.39,3.62,7.5-8h-4.869z"/>
<path d="M21.48,17.33c-1.524-3.469-6.775-5.315-9.979-5.315-3.205,0-8.457,1.848-9.98,5.315l-0.52,1.17,0.52,1.184c1.523,3.471,6.777,5.318,9.982,5.318,3.203,0,8.453-1.848,9.978-5.316l0.52-1.18-0.52-1.18zm-17.14,1.18c0.793-1.807,4.152-3.297,6.66-3.479v0.031c-1.693,0.244-3,1.688-3,3.449s1.307,3.205,3,3.449v0.031c-2.51-0.18-5.867-1.67-6.66-3.48zm7.66,3.48v-0.031c1.694-0.244,3-1.688,3-3.449s-1.306-3.205-3-3.449v-0.031c2.507,0.182,5.866,1.672,6.66,3.479-0.8,1.81-4.15,3.3-6.66,3.48z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reject_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reject_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M15.69,11.54c1.257-0.96,2.563-1.786,3.289-2.164,0.001,0.001,0,0.003,0.001,0.004,0.001-0.001,0.005-0.006,0.007-0.008l1.277,2.142c0.183,0.313,0.589,0.408,0.953,0.256l7.359-4.248c0.383-0.22,0.533-0.68,0.334-1.022,0,0-0.203-0.305-0.818-1.062,0.002,0.001,0.002,0.003,0.004,0.005-0.002-0.002,0-0.005-0.002-0.008-0.312-0.383-0.35-0.397-0.751-0.765-1.204-1.103-2.53-1.536-2.53-1.536-0.514-0.182-2.241-0.282-4.417,0.374-1.677,0.506-4.996,2.505-7.888,4.851l3.19,3.181z"/>
<path d="M9.396,18.76c-0.01-0.001-0.019-0.001-0.027-0.003,0.002-0.002,0.008-0.01,0.008-0.01,0.652-1.125,1.375-2.136,2.143-3.077l-3.205-3.205c-2.367,2.794-4.219,5.808-4.637,6.907-0.814,2.148-0.74,4.517-0.563,5.205,0,0,0.169,0.513,0.56,1.211,0.005,0.007,0.01,0.016,0.015,0.024,0.038,0.068,0.076,0.136,0.119,0.207,0.001,0.002,0.004,0.001,0.005,0.002,0.21,0.35,0.464,0.729,0.783,1.114,0.374,0.449,0.392,0.578,0.785,0.925h0.003c0.723,0.636,1.021,0.83,1.021,0.83,0.345,0.224,0.827,0.103,1.08-0.268l4.794-7.042c0.254-0.372,0.186-0.856-0.158-1.078l-2.724-1.74z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_remove_from_collection.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_remove_from_collection.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M0,0v30h30v-30h-30zm28.24,26.99l-6.012-6.012-0.454,2.042,5.218,5.219h-24.37l5.535-5.534-0.454-2.042-5.942,5.941v-23.6l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202-2.479-1.04-3.137-2.756-3.311-3.69l-3.856-3.856h23.59l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738v24.36z" fill-opacity="0.5" stroke-opacity="0.5"/>
<rect height="3.519" width="17.65" x="6.177" y="13.25"/>
<polygon points="9.706,25.59,20.29,25.59,22.06,17.65,7.941,17.65"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_remove_from_video_collection.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_remove_from_video_collection.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M13,22.5c0-0.169,0.017-0.333,0.025-0.5h-1.02v-1h1.131c0.11-0.693,0.293-1.364,0.546-2h-3.68v-3h5v0.689c0.875-1.127,1.995-2.048,3.283-2.689h-0.28v-1h1v-2h-13v2h2v1h-2v2h2v3h-2v2h2v1h-2v2h7.131c-0.08-0.49-0.13-0.99-0.13-1.5zm2-9.5h2v1h-2v-1zm-3,0h2v1h-2v-1zm-3,0h2v1h-2v-1zm2,9h-2v-1h2v1z"/>
<path d="M13.68,26h-9.68v-17h17v4.13c0.49-0.078,0.988-0.13,1.5-0.13s1.01,0.052,1.5,0.13v-7.13h-23v23h14.59c-0.81-0.86-1.47-1.88-1.91-3z"/>
<path d="M26,13.68c1.121,0.446,2.135,1.1,3,1.914v-14.59h-23v3h20v9.677z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat_exception.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat_exception.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_replace_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_replace_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M27.58,6.523l-7.36,4.248c-0.363,0.152-0.77,0.057-0.952-0.256l-1.278-2.142c-0.001,0.002-0.004,0.007-0.006,0.008v-0.004c-1.121,0.582-3.618,2.223-5.188,3.79-1.632,1.635-3.15,3.394-4.417,5.576,0,0-0.006,0.008-0.008,0.01,0.009,0.002,0.018,0.002,0.027,0.003l2.725,1.743c0.344,0.222,0.412,0.706,0.158,1.078l-4.795,7.05c-0.253,0.37-0.735,0.491-1.08,0.268,0,0-0.298-0.194-1.021-0.83h-0.003c-0.394-0.347-0.411-0.476-0.785-0.925-0.319-0.385-0.573-0.765-0.783-1.114-0.001-0.001-0.004,0-0.005-0.002-0.043-0.071-0.081-0.139-0.119-0.207-0.005-0.009-0.01-0.018-0.015-0.024-0.391-0.698-0.56-1.211-0.56-1.211-0.178-0.688-0.252-3.057,0.563-5.205,0.52-1.364,3.24-5.672,6.42-8.854,3.181-3.182,8.124-6.349,10.3-7.005s3.903-0.556,4.416-0.374,1.326,0.434,2.531,1.536c0.401,0.367,0.439,0.382,0.75,0.765,0.002,0.003,0.002,0.006,0.003,0.008-0.001-0.002-0.003-0.004-0.005-0.005,0.616,0.757,0.818,1.062,0.818,1.062,0.19,0.331,0.04,0.791-0.34,1.01z"/>
<path d="M24,11l-6,8h3.963v6.002h-1.96v-5h-3.997v5c0,3,2.775,5,5.5,5s5.5-2,5.5-5v-6h3l-6-8z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_all.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_all.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_all_email.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_all_email.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_email.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_email.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_restore_settings.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_restore_settings.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M29.999,13h-2c0-4.502-3.662-8.166-8.166-8.166c-0.094,0-0.188,0.002-0.279,0.004L19.479,2.84 c0.117-0.004,0.234-0.006,0.354-0.006C25.438,2.834,29.999,7.395,29.999,13L29.999,13z"/>
<polygon points="19.999,3.999 19.999,8 17,5.999 13.999,3.999 17,2.001 19.999,0 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rewind.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rewind.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rsk_horizontal.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rsk_horizontal.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rsk_vertical.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rsk_vertical.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<rect fill="none" height="30" width="30"/>
<rect height="1.5" transform="matrix(0.7071 0.7072 -0.7072 0.7071 19.6001 4.8865)" width="4.501" x="1.652" y="25.35"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search_stop.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search_stop.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g>
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30" x="0" y="0.006"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_next.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_next.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon points="13,5 23,15.066 13,25.133 "/>
<polygon points="3,5 13,15.066 3,25.133 "/>
<rect height="20" width="4" x="23" y="5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_previous.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_previous.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon points="17,25.133 7,15.066 17,5 "/>
<polygon points="27,25.133 17,15.066 27,5 "/>
<rect height="20" width="4" x="3" y="5.133"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_send.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_send.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon points="1.538,18 2,21 4,21 4,18 "/>
<polygon points="0.77,13 1.23,16 4,16 4,13 "/>
<polygon points="0,8 0.462,11 4,11 4,8 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_send_mycard.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_send_mycard.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon points="1.539,18 2,21 4,21 4,18 "/>
<polygon points="0.77,13 1.23,16 4,16 4,13 "/>
<polygon points="0,8 0.461,11 4,11 4,8 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_settings.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_settings.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M22.49,21.78c-0.146-0.146-0.423-0.106-0.619,0.089-0.195,0.195-0.234,0.472-0.088,0.618l1.592,1.591c0.146,0.146,0.423,0.107,0.618-0.088s0.235-0.473,0.089-0.619l-1.59-1.59z"/>
<path d="M27.88,20.1l-9.029-9.028c0.489-2.928-0.385-6.041-2.639-8.295-3.704-3.704-9.73-3.704-13.44,0-3.703,3.704-3.703,9.73,0,13.44,2.255,2.254,5.369,3.128,8.297,2.639l9.027,9.028c1.949,1.949,5.122,1.949,7.072,0l0.707-0.707c1.95-1.96,1.95-5.13,0-7.08zm-23.91-14.01l4.114,4.113-3.505,3.505c-1.852-2.16-2.066-5.247-0.609-7.611zm21.79,18.96l-0.707,0.707c-0.78,0.781-2.048,0.781-2.829,0l-10.26-10.27c-1.9,0.773-4.089,0.629-5.867-0.467l5.529-5.528c0.781-0.78,0.781-2.047,0-2.828l-3.516-3.51c2.092-0.456,4.365,0.122,5.988,1.745,1.91,1.909,2.38,4.717,1.41,7.071l10.25,10.26c0.79,0.77,0.79,2.04,0.01,2.82z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shake_warning.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shake_warning.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0.006 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0.006 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30" x="0.006"/>
<path d="M20.11,3.436c-0.041,0-0.084,0-0.125,0.002c-0.39-1.125-1.472-1.936-2.739-1.936c-0.104,0-0.207,0.006-0.309,0.016 C16.451,0.615,15.488,0,14.381,0c-1.106,0-2.07,0.615-2.557,1.518c-0.102-0.01-0.205-0.016-0.309-0.016 c-1.597,0-2.896,1.283-2.896,2.861v3.412C8.568,7.76,8.516,7.746,8.464,7.732c-0.263-0.066-0.531-0.1-0.797-0.1 c-0.692,0-1.313,0.225-1.771,0.629c-0.886,0.756-1.137,2.027-0.64,3.234L9.169,21h11.929l1.906-6.926V6.295 C23.005,4.717,21.707,3.436,20.11,3.436z M19.574,19h-9.065c-1.928-4.682-3.398-8.258-3.401-8.264 c-0.12-0.293-0.18-0.725,0.089-0.955c0.199-0.176,0.529-0.172,0.777-0.109c0.506,0.127,0.894,0.438,1.167,0.838 c0.259,0.377,0.711,1.797,0.96,2.664l0.518-0.1V4.363c0-0.477,0.402-0.861,0.896-0.861c0.496,0,0.896,0.385,0.896,0.861v6.861h1.074 V2.857c0-0.475,0.4-0.857,0.895-0.857c0.496,0,0.895,0.383,0.895,0.857v8.367h1.076V4.363c0-0.477,0.4-0.861,0.895-0.861 c0.496,0,0.894,0.385,0.894,0.861v6.861h1.075v-4.93c0-0.475,0.402-0.859,0.895-0.859c0.496,0,0.895,0.385,0.895,0.859v7.508h0.002 L19.574,19z"/>
<path d="M12,28.01c-5.376-0.275-9.678-3.713-9.994-7.996H0c0.31,5.382,5.51,9.708,12,10V28.01z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share_photo.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share_photo.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share_photo_off.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share_photo_off.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sharpness.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sharpness.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shift.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shift.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M15,2l-13,17h7v9h12v-9h7l-13-17zm3,14v9h-6v-9h-3.93l6.93-9.062,6.93,9.062h-3.93z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_show_view.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_show_view.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon points="20.27,13.92,20.27,22.37,8.237,22.37,8.237,19.06,0.5,24.03,8.237,29,8.237,25.69,23.71,25.69,23.71,13.92"/>
<polygon points="9.728,16.08,9.728,7.626,21.76,7.626,21.76,10.94,29.5,5.971,21.76,1,21.76,4.313,6.289,4.313,6.289,16.08"/>
<g fill-opacity="0.5" stroke-opacity="0.5">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle_off.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle_off.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon points="11.78,7.626,21.26,7.626,21.26,10.94,29,5.971,21.26,1,21.26,4.313,8.463,4.313"/>
<polygon points="5.789,9.937,5.789,16.08,9.228,16.08,9.228,13.38"/>
<polygon points="23.21,19.06,23.21,13.92,19.77,13.92,19.77,15.62"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_smiley.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_smiley.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_songs_all.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_songs_all.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sort.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sort.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_itut.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_itut.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M28.5,18.471h-27v-6.945h3.301v3.563h20.4v-3.563h3.3v6.943L28.5,18.471z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_vkb.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_vkb.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 86 30" width="86px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 86 30" width="86px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="86"/>
<rect fill="none" height="27.001" width="83.008" x="1.496" y="1.5"/>
<polygon points="80.974,8.537 80.974,17.923 5.029,17.925 5.029,8.537 1.496,8.537 1.496,21.464 84.504,21.464 84.504,8.537 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker_off.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker_off.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<polygon points="4.853,9 1,9 1,21 8,21 8,12.148 "/>
<polygon points="21,16.852 21,3 11.478,7.328 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_special_characters_itut.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_special_characters_itut.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<polygon points="8.05,11.37,5.545,12.97,5.708,10.01,4.124,10.01,4.279,12.97,1.773,11.37,1,12.73,3.625,14.08,1,15.44,1.773,16.8,4.279,15.18,4.124,18.16,5.708,18.16,5.545,15.18,8.05,16.8,8.824,15.44,6.199,14.08,8.824,12.73"/>
<path d="M21.88,14.41l-1.713-0.388c-0.247,1.096-0.565,1.96-0.955,2.591l-2.574-3.332c0.97-0.654,1.642-1.246,2.015-1.777,0.372-0.53,0.56-1.115,0.56-1.751,0-0.78-0.283-1.397-0.849-1.851-0.565-0.454-1.35-0.681-2.354-0.681-1.079,0-1.92,0.247-2.522,0.741-0.603,0.493-0.904,1.202-0.904,2.125,0,0.838,0.459,1.856,1.377,3.056-0.924,0.529-1.586,1.09-1.988,1.684-0.401,0.595-0.603,1.296-0.603,2.104,0,1.091,0.351,1.937,1.051,2.535,0.699,0.6,1.707,0.899,3.021,0.899,1.28,0,2.368-0.358,3.264-1.075l0.723,0.938h2.574l-1.765-2.272c0.75-0.88,1.3-2.06,1.64-3.54zm-6.82-5.474c0.216-0.218,0.539-0.327,0.969-0.327,0.362,0,0.651,0.106,0.869,0.319,0.218,0.212,0.327,0.482,0.327,0.809,0,0.879-0.505,1.655-1.515,2.333-0.373-0.488-0.628-0.882-0.766-1.184-0.138-0.301-0.207-0.624-0.207-0.969,0-0.441,0.1-0.768,0.32-0.985zm0.77,9.954c-0.567,0-1.063-0.188-1.484-0.563-0.422-0.376-0.633-0.917-0.633-1.623,0-0.94,0.396-1.728,1.188-2.358l2.927,3.822c-0.59,0.48-1.26,0.72-2.01,0.72z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_special_characters_qwerty.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_special_characters_qwerty.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<polygon points="8.011,17.73,7.02,17.73,4.005,18.68,4.005,19.77,6.151,19.28,6.151,26.91,4.005,26.91,4.005,28,10.04,28,10.04,26.91,8.011,26.91"/>
<path d="M13.65,25.69c0.193-0.34,0.432-0.651,0.714-0.934s0.675-0.636,1.176-1.06c0.897-0.752,1.468-1.368,1.709-1.849s0.362-0.97,0.362-1.467c0-0.884-0.269-1.553-0.807-2.006-0.538-0.454-1.324-0.681-2.358-0.681-0.839,0-1.7,0.139-2.584,0.417v1.217h0.014c0.843-0.306,1.561-0.458,2.153-0.458,0.561,0,0.98,0.134,1.262,0.399,0.279,0.268,0.42,0.665,0.42,1.193,0,0.301-0.087,0.604-0.26,0.909s-0.59,0.736-1.251,1.292c-0.552,0.465-1.007,0.893-1.367,1.281-0.36,0.391-0.663,0.86-0.909,1.412s-0.369,1.183-0.369,1.894v0.76h6.098v-1.189h-4.32c0.03-0.41,0.14-0.78,0.33-1.12z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sport.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sport.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M10.611,11.199c-0.307,0-0.617-0.094-0.881-0.289c-0.652-0.479-0.785-1.387-0.299-2.029l1.998-2.625 c0.488-0.641,1.412-0.771,2.064-0.293c0.65,0.48,0.783,1.389,0.297,2.029l-1.998,2.627C11.504,10.998,11.061,11.199,10.611,11.199 L10.611,11.199z"/>
<path d="M27.576,18.043h-4.74l-1.639-5.9L16.824,8.32l-3.979,0.141c-0.801,0.01-1.445-0.576-1.473-1.35 c-0.027-0.771,0.584-1.42,1.371-1.447l5.118-0.18l5.859,5.121l1.287,4.637h2.566c0.785,0,1.424,0.627,1.424,1.4 C28.998,17.415,28.361,18.043,27.576,18.043L27.576,18.043z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M3.949,4v17h22.1V4H3.949z M23,18H7V7h16V18z"/>
<circle cx="9.001" cy="9.02" r="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization_off.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization_off.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<rect height="35.829" transform="matrix(-0.7061 0.7082 -0.7082 -0.7061 36.214 14.9658)" width="1.867" x="14.067" y="-2.916"/>
<rect height="2" width="4" x="20.049" y="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_station_scan.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_station_scan.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stop.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stop.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<rect height="24" width="24" x="3" y="3"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_store.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_store.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M29,10v-3h-23v-3c0-0.553-0.447-1-1-1h-3c-0.553,0-1,0.447-1,1v1c0,0.553,0.447,1,1,1h1v16c0,0.553,0.448,1,1,1h22c0.553,0,1-0.447,1-1v-1c0-0.553-0.447-1-1-1h-20v-2h21v-2h-0.394l0.986-6h1.4zm-15,0h2v6h-2v-6zm-2,6h-2v-6h2v6zm6-6h2v6h-2v-6zm-12,0h2v6h-2v-6zm17.57,6h-1.57v-6h2.553l-0.98,6z"/>
<circle cx="8.5" cy="25.5" r="2.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_itut.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_itut.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M4.427,12.81c-0.771-0.426-1.315-0.787-1.635-1.083s-0.479-0.69-0.479-1.184c0-0.509,0.183-0.907,0.549-1.195,0.366-0.287,0.854-0.432,1.464-0.432,0.672,0,1.398,0.089,2.18,0.266v-1.449c-0.737-0.166-1.544-0.25-2.421-0.25-1.209,0-2.188,0.281-2.94,0.843s-1.127,1.401-1.127,2.52c0,0.703,0.169,1.329,0.507,1.88s0.993,1.098,1.963,1.64c0.888,0.504,1.496,0.912,1.822,1.225,0.327,0.313,0.491,0.743,0.491,1.29,0,0.582-0.198,1.029-0.595,1.346-0.396,0.314-0.947,0.473-1.652,0.473-0.742,0-1.594-0.13-2.554-0.391v1.479c0.877,0.227,1.768,0.34,2.672,0.34,1.475,0,2.583-0.312,3.322-0.934,0.741-0.623,1.111-1.557,1.111-2.802,0-0.691-0.181-1.314-0.54-1.868-0.361-0.56-1.074-1.14-2.138-1.73z"/>
<path d="M11.92,17.88l-1.92-7.58h-2.337l2.612,9.297h1.174c-0.233,0.725-0.471,1.206-0.712,1.443-0.241,0.238-0.572,0.357-0.994,0.357s-0.904-0.063-1.447-0.191v1.428c0.604,0.128,1.167,0.191,1.688,0.191,0.793,0,1.433-0.202,1.918-0.605,0.485-0.404,0.855-1.041,1.11-1.91l2.937-10.01h-1.996l-2.03,7.58z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_qwerty.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_qwerty.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M7.672,9.609c0-0.651-0.169-1.237-0.508-1.758s-1.008-1.06-2.008-1.617c-0.724-0.401-1.235-0.741-1.535-1.02s-0.449-0.649-0.449-1.112c0-0.479,0.172-0.854,0.516-1.125s0.801-0.407,1.375-0.407c0.63,0,1.313,0.083,2.047,0.25v-1.359c-0.692-0.156-1.45-0.234-2.273-0.234-1.137,0-2.057,0.264-2.763,0.793s-1.058,1.319-1.058,2.371c0,0.661,0.159,1.251,0.477,1.77s0.933,1.032,1.844,1.543c0.833,0.474,1.403,0.858,1.711,1.152s0.461,0.699,0.461,1.215c0,0.547-0.187,0.969-0.559,1.266s-0.89,0.445-1.551,0.445c-0.698,0-1.497-0.122-2.398-0.367v1.391c0.823,0.214,1.659,0.32,2.508,0.32,1.386,0,2.426-0.293,3.121-0.879s1.042-1.46,1.042-2.631z"/>
<path d="M13.83,13.29l2.758-9.422h-1.875l-1.92,7.132-1.8-7.133h-2.195l2.453,8.75h1.102c-0.219,0.683-0.441,1.136-0.668,1.359s-0.538,0.336-0.934,0.336-0.849-0.06-1.359-0.18v1.344c0.567,0.12,1.097,0.18,1.586,0.18,0.745,0,1.345-0.19,1.801-0.57s0.8-0.98,1.04-1.8z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tab_active.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tab_active.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tab_passive.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tab_passive.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tag.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tag.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_center.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_center.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<rect height="2" width="22" x="4" y="4"/>
<rect height="2" width="16" x="7" y="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_justify.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_justify.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<rect height="2" width="22" x="4" y="4"/>
<rect height="2" width="22" x="4" y="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_left.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_left.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<rect height="2" width="22" x="4" y="4"/>
<rect height="2" width="16" x="4" y="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_right.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_right.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<rect height="2" width="22" x="4" y="4"/>
<rect height="2" width="16" x="10" y="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tick.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tick.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tip.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tip.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_two.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_two.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M13.5,22.69c0.035-0.788,0.244-1.511,0.625-2.169,0.381-0.659,0.85-1.264,1.406-1.813,0.556-0.548,1.326-1.234,2.314-2.057,1.766-1.46,2.887-2.656,3.362-3.59s0.714-1.883,0.714-2.847c0-1.717-0.53-3.015-1.588-3.895-1.05-0.875-2.59-1.315-4.63-1.315-1.65,0-3.345,0.27-5.085,0.81v2.362h0.027c1.658-0.593,3.071-0.89,4.237-0.89,1.103,0,1.931,0.259,2.481,0.776,0.553,0.519,0.828,1.289,0.828,2.316,0,0.584-0.171,1.172-0.512,1.765s-1.162,1.429-2.462,2.509c-1.085,0.902-1.982,1.732-2.69,2.488-0.709,0.756-1.305,1.671-1.789,2.741s-0.73,2.29-0.73,3.67v1.45h12v-2.31h-8.502z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M23.14,19.59v-6.889h-6.89v5.018h-2.298v-5.018h-6.884v6.889h5.018l-0.014,2.316-5.029,0.029,0.031,6.839,6.837-0.028,0.014-4.994h2.326v5.018h6.886v-6.886h-5.019v-2.294h5.015zm-6.86,2.3h-0.03v0.026h-2.324v-2.32h0.027v-0.031h2.297v0.025h0.025v2.286z"/>
<polygon points="15.12,4.63,26.1,15.57,27.39,14.28,15.06,1.913,2.721,14.25,4.148,15.64"/>
<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.83"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_attach.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_attach.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M16.08,11.41v-3.592h-3.592v2.619h-1.198v-2.622h-3.59v3.595h2.62l-0.011,1.209-2.622,0.017,0.012,3.57,3.571-0.014,0.006-2.607h1.216v2.62h3.592v-3.595h-2.62v-1.197l2.61-0.01zm-3.57,1.2h-0.014v0.017h-1.216v-1.213h0.018v-0.015h1.198v0.015h0.014v1.19z"/>
<polygon points="11.91,3.607,17.64,9.316,18.3,8.643,11.87,2.188,5.433,8.625,6.178,9.352"/>
<polygon points="17.26,22.44,18.62,24.63,22.36,24.63,21,22.44"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_context.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_context.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M16.46,11.48v-3.576h-3.577v2.608h-1.194v-2.606h-3.58v3.581h2.609l-0.01,1.205-2.613,0.016,0.015,3.553,3.556-0.013,0.007-2.597h1.21v2.609h3.578v-3.581h-2.61v-1.192h2.605zm-3.56,1.2h-0.014v0.018h-1.21v-1.209h0.017v-0.014h1.194v0.014h0.014v1.187z"/>
<polygon points="12.3,3.709,18.01,9.396,18.68,8.726,12.27,2.296,5.854,8.708,6.596,9.432"/>
<polygon points="24.67,22.35,7.215,22.35,10.99,28.39,12.84,27.24,11.16,24.54,11.17,24.54,11.17,24.54,24.67,24.54"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_multipdp.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_multipdp.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M15.86,11.48v-3.576h-3.576v2.608h-1.194v-2.606h-3.58v3.581h2.609l-0.009,1.205-2.613,0.016,0.014,3.553,3.556-0.013,0.007-2.597h1.211v2.609h3.577v-3.581h-2.62v-1.192h2.607zm-3.56,1.2h-0.014v0.018h-1.22v-1.209h0.017v-0.014h1.194v0.014h0.014v1.187z"/>
<polygon points="11.7,3.709,17.4,9.396,18.07,8.726,11.66,2.296,5.248,8.708,5.99,9.432"/>
<polygon points="24.06,22.35,6.608,22.35,10.38,28.39,12.24,27.24,10.55,24.54,10.56,24.54,10.56,24.54,24.06,24.54"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_suspended.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_suspended.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M16.6,11.44v-3.592h-3.59v2.619h-1.2v-2.622h-3.587v3.594h2.621l-0.011,1.21-2.625,0.016,0.015,3.568,3.569-0.014,0.009-2.607h1.215v2.62h3.592v-3.6h-2.621v-1.197h2.61zm-3.57,1.2h-0.013v0.017h-1.22v-1.213h0.015v-0.02h1.2v0.014h0.013v1.2z"/>
<polygon points="12.43,3.636,18.16,9.345,18.83,8.672,12.39,2.217,5.953,8.654,6.698,9.381"/>
<polygon points="24.77,22.38,24.77,24.57,20.8,24.57,20.8,24.57,15.42,24.57,17.24,22.38"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unblock.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unblock.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_underline.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_underline.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M15.04,22.66c2.177,0,3.83-0.579,4.964-1.736,1.134-1.156,1.7-2.857,1.7-5.104v-12.82h-3.163v13.07c0,1.6-0.278,2.74-0.831,3.428-0.554,0.686-1.454,1.029-2.7,1.029-1.234,0-2.136-0.35-2.699-1.045-0.564-0.696-0.846-1.834-0.846-3.412v-13.07h-3.161v12.73c0,2.354,0.551,4.096,1.648,5.229s2.793,1.7,5.093,1.7zm-9.005,2.38v1.96h17.93v-1.956h-17.92z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unknown.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unknown.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.202"/>
<path d="M17.84,25.04c0,1.713-1.393,3.11-3.113,3.11s-3.115-1.397-3.115-3.11c0-1.717,1.395-3.115,3.115-3.115s3.1,1.4,3.1,3.12z"/>
<path d="M15.28,1.285c-2.324,0-3.988,0.716-5.086,2.191-1.04,1.396-1.688,3.248-1.918,5.509l3.837,0.662c0.161-1.211,0.444-2.098,0.862-2.689,0.565-0.796,1.331-1.214,2.223-1.214,1.052,0,1.636,0.476,1.941,0.877,0.395,0.515,0.598,1.217,0.598,2.083,0,0.886-0.437,1.832-1.295,2.805-1.35,1.568-2.227,2.667-2.598,3.262-0.359,0.576-0.631,1.217-0.805,1.906-0.185,0.697-0.279,1.639-0.281,2.793h3.725c0.048-0.754,0.179-1.393,0.388-1.936,0.285-0.721,0.901-1.594,1.89-2.687,1.256-1.382,2.096-2.552,2.488-3.476,0.388-0.909,0.585-1.868,0.585-2.838,0-2.417-0.739-4.287-2.255-5.72-1.09-1.017-2.49-1.517-4.3-1.517z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_update_existing.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_update_existing.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_usb.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_usb.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_user_defined.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_user_defined.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30" x="0.002"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M0.998,3v24h28V3H0.998z M25.998,24h-22V6h22V24z"/>
<path d="M7.757,19.004L5.63,10.996h1.542l1.552,6.455l1.595-6.455h1.316l-2.219,8.008H7.757z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga_wide.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga_wide.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30" x="0.002"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M10.79,10.17c1.569-1.567,4.066-3.208,5.188-3.79v0.004c0.002-0.001,0.005-0.006,0.006-0.008l1.278,2.142c0.183,0.313,0.589,0.408,0.952,0.256l7.36-4.248c0.384-0.22,0.532-0.68,0.333-1.022,0,0-0.202-0.305-0.818-1.062,0.002,0.001,0.004,0.003,0.005,0.005-0.001-0.002-0.001-0.005-0.003-0.008-0.311-0.383-0.349-0.397-0.75-0.765-1.205-1.103-2.531-1.536-2.531-1.536-0.513-0.182-2.24-0.282-4.416,0.374s-7.119,3.823-10.3,7.005c-3.18,3.183-5.9,7.49-6.42,8.854-0.814,2.148-0.74,4.517-0.563,5.205,0,0,0.169,0.513,0.56,1.211,0.005,0.007,0.01,0.016,0.015,0.024,0.038,0.068,0.076,0.136,0.119,0.207,0.001,0.002,0.004,0.001,0.005,0.002,0.21,0.35,0.464,0.729,0.783,1.114,0.374,0.449,0.392,0.578,0.785,0.925h0.003c0.723,0.636,1.021,0.83,1.021,0.83,0.345,0.224,0.827,0.103,1.08-0.268l4.794-7.042c0.254-0.372,0.186-0.856-0.158-1.078l-2.725-1.743c-0.01-0.001-0.019-0.001-0.027-0.003,0.002-0.002,0.008-0.01,0.008-0.01,1.264-2.19,2.782-3.95,4.41-5.58z"/>
<circle cx="22" cy="18" r="3"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_collection.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_collection.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_services.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_services.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_virtual_input.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_virtual_input.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M0,4v20h30v-20h-30zm18,3h3v3h-3v-3zm-5,0h3v3h-3v-3zm0,5h3v3h-3v-3.001zm-5-5h3v3h-3v-3zm0,5h3v3h-3v-3.001zm-2,8h-3v-3h3v3zm0-5h-3v-3h3v2.999zm0-5h-3v-3h3v3zm15,10h-13v-3h13v3zm5,0h-3v-3h3v3zm0-5h-8v-3h5v-5h3v7.999z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_voice_mailbox.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_voice_mailbox.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M23.5,8.5c-3.59,0-6.5,2.91-6.5,6.5,0,1.748,0.693,3.332,1.816,4.5h-7.633c1.12-1.17,1.81-2.75,1.81-4.5,0-3.59-2.91-6.5-6.5-6.5s-6.5,2.91-6.5,6.5,2.91,6.5,6.5,6.5h17c3.59,0,6.5-2.91,6.5-6.5s-2.91-6.5-6.5-6.5zm-20.5,6.5c0-1.93,1.57-3.5,3.5-3.5s3.5,1.57,3.5,3.5-1.57,3.5-3.5,3.5-3.5-1.57-3.5-3.5zm20.5,3.5c-1.93,0-3.5-1.57-3.5-3.5s1.57-3.5,3.5-3.5,3.5,1.57,3.5,3.5-1.57,3.5-3.5,3.5z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vol_down.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vol_down.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vol_up.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vol_up.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M10.25,14.79c1.246-0.87,1.945-2.136,1.945-3.633,0-2.197-1.599-4.414-5.167-4.414-1.955,0-3.651,0.719-4.516,1.333l-0.428,0.301,1.068,2.846,0.708-0.509c0.592-0.421,1.666-0.912,2.751-0.912,1.34,0,2.079,0.604,2.079,1.695,0,1.457-1.691,1.986-2.83,1.986h-1.854v2.935h1.855c0.561,0,3.36,0.118,3.386,2.477,0.01,0.607-0.211,1.189-0.608,1.598-0.504,0.5-1.262,0.76-2.269,0.76-1.327,0-2.6-0.544-3.134-0.868l-0.702-0.42-1.032,2.883,0.44,0.293c0.828,0.54,2.483,1.169,4.449,1.169,4.396,0,6.397-2.788,6.397-5.377,0-1.81-0.98-3.33-2.54-4.14z"/>
<path d="M21.91,14.16v3.031h3.286v3.71c-0.373,0.11-1.022,0.236-2.133,0.236-3.517,0-5.608-2.206-5.608-5.897,0-3.621,2.248-5.872,5.869-5.872,1.342,0,2.396,0.202,3.313,0.635l0.697,0.33,0.932-3.003-0.518-0.25c-0.775-0.376-2.391-0.815-4.371-0.815-2.813,0-5.209,0.891-6.922,2.573-1.656,1.624-2.561,3.932-2.561,6.5,0,2.64,0.901,5.023,2.473,6.544,1.65,1.572,3.788,2.337,6.551,2.337,2.625,0,4.689-0.718,5.266-0.938l0.424-0.167v-8.953h-6.7z"/>
<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.775"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_attach.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_attach.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon points="9.66,24.72,9.665,24.72,8.199,22.36,5.432,22.36,9.497,28.87,11.48,27.63,10.79,26.52"/>
<polygon points="10.48,22.36,11.94,24.72,15.93,24.72,14.47,22.36"/>
<polygon points="16.74,22.36,18.21,24.72,22.22,24.72,20.76,22.36"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_context.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_context.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<polygon points="24.67,22.36,5.854,22.36,9.92,28.87,11.92,27.62,10.1,24.72,10.12,24.72,10.12,24.72,24.67,24.72"/>
<polygon points="20.6,13.35,18.6,14.6,20.42,17.5,5.854,17.5,5.854,19.86,24.67,19.86"/>
<path d="M12.31,6.521c0.646-0.499,1.014-1.193,1.014-2.013,0-0.698-0.271-1.336-0.761-1.802-0.542-0.512-1.316-0.78-2.239-0.78-1.124,0-2.103,0.415-2.598,0.767l-0.295,0.215,0.674,1.803,0.51-0.365c0.321-0.227,0.9-0.491,1.479-0.491,0.485,0,1.061,0.146,1.061,0.844,0,0.825-1.068,1.005-1.481,1.005h-1.144v1.857h1.149c0.295,0,1.778,0.062,1.79,1.284,0.002,0.148-0.022,0.522-0.313,0.814-0.262,0.26-0.662,0.397-1.193,0.397-0.723,0-1.411-0.298-1.701-0.472l-0.506-0.307-0.65,1.819,0.317,0.208c0.473,0.312,1.429,0.676,2.553,0.676,2.534,0,3.688-1.619,3.688-3.123,0-1.006-0.52-1.861-1.35-2.346z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_multipdp.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_multipdp.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M11.7,6.565c0.646-0.499,1.016-1.192,1.016-2.011,0-0.699-0.272-1.336-0.762-1.803-0.537-0.512-1.314-0.779-2.239-0.779-1.125,0-2.098,0.414-2.593,0.768l-0.312,0.213,0.678,1.803,0.512-0.365c0.317-0.227,0.9-0.49,1.48-0.49,0.483,0,1.062,0.147,1.062,0.844,0,0.825-1.072,1.005-1.483,1.005h-1.151v1.857h1.148c0.294,0,1.778,0.062,1.79,1.284,0.003,0.148-0.022,0.523-0.31,0.816-0.261,0.26-0.664,0.397-1.196,0.397-0.721,0-1.409-0.299-1.698-0.472l-0.504-0.303-0.649,1.824,0.317,0.207c0.472,0.312,1.428,0.676,2.552,0.676,2.533,0,3.688-1.619,3.688-3.122,0-1.012-0.52-1.865-1.35-2.353z"/>
<path d="M18.85,6.18v1.914h1.838v1.876c-0.24,0.065-0.572,0.121-1.087,0.121-1.903,0-3.036-1.197-3.036-3.198,0-0.98,0.296-1.793,0.857-2.348,0.555-0.547,1.359-0.836,2.326-0.836,0.735,0,1.311,0.111,1.812,0.345l0.503,0.238,0.584-1.888-0.373-0.181c-0.445-0.217-1.365-0.467-2.498-0.467-3.244,0-5.421,2.087-5.421,5.19,0,1.51,0.517,2.874,1.418,3.745,0.945,0.901,2.168,1.339,3.745,1.339,1.487,0,2.661-0.407,2.99-0.532l0.309-0.121v-5.2h-3.968z"/>
<polygon points="20,13.4,17.99,14.64,19.81,17.55,16.85,17.55,14.26,13.4,12.26,14.64,14.06,17.55,5.247,17.55,5.247,19.91,24.06,19.9"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_suspended.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_suspended.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<path d="M12.4,6.522c0.646-0.5,1.016-1.195,1.016-2.014,0-0.698-0.272-1.335-0.761-1.802-0.541-0.51-1.314-0.779-2.239-0.779-1.125,0-2.103,0.413-2.598,0.768l-0.299,0.215,0.677,1.802,0.509-0.363c0.32-0.227,0.898-0.491,1.479-0.491,0.483,0,1.061,0.146,1.061,0.843,0,0.824-1.071,1.004-1.483,1.004h-1.145v1.859h1.149c0.294,0,1.777,0.061,1.789,1.282,0.004,0.15-0.022,0.523-0.31,0.817-0.263,0.26-0.665,0.397-1.196,0.397-0.721,0-1.409-0.298-1.698-0.474l-0.504-0.304-0.653,1.821,0.321,0.208c0.47,0.312,1.427,0.675,2.552,0.675,2.534,0,3.689-1.617,3.689-3.123,0-0.995-0.52-1.848-1.36-2.335z"/>
<path d="M19.56,6.135v1.914h1.838v1.876c-0.242,0.064-0.569,0.121-1.084,0.121-1.902,0-3.035-1.195-3.035-3.198,0-0.981,0.295-1.793,0.857-2.346,0.555-0.55,1.358-0.837,2.325-0.837,0.735,0,1.311,0.11,1.812,0.346l0.504,0.238,0.584-1.888-0.377-0.182c-0.441-0.217-1.367-0.467-2.495-0.467-3.243,0-5.421,2.087-5.421,5.191,0,1.509,0.517,2.875,1.418,3.744,0.945,0.902,2.168,1.34,3.746,1.34,1.486,0,2.66-0.407,2.986-0.532l0.309-0.119v-5.205h-3.975z"/>
<polygon points="24.77,22.33,24.77,24.68,20.51,24.68,20.51,24.68,14.73,24.68,16.69,22.33"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30" y="0"/>
<path d="M0.998,3v24h28v-24h-28zm25,21h-22v-18h22v18z"/>
<path d="M8.205,19.37l-1.881-8.736h1.699l1.271,6.867,1.682-6.867h1.705l1.547,6.867,1.406-6.867h1.412l-2.086,8.736h-1.752l-1.512-6.662-1.682,6.662h-1.815z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_cloudy.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_cloudy.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" fill-rule="evenodd" height="30" width="30"/>
<path d="M3.143,12c0-0.363,0.034-0.719,0.082-1.07H1.06C1.021,11.281,1,11.639,1,12 c0,0.363,0.021,0.719,0.06,1.072h2.165C3.177,12.721,3.143,12.365,3.143,12z" fill-rule="evenodd"/>
<path d="M6.26,5.744L4.73,4.217C4.173,4.666,3.665,5.174,3.216,5.73L4.744,7.26 C5.179,6.689,5.688,6.18,6.26,5.744z" fill-rule="evenodd"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_fluorescent.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_fluorescent.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_incandescent.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_incandescent.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_sunny.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_sunny.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M15.133,6.023c-4.971,0-9,4.029-9,9s4.029,9,9,9s9-4.029,9-9 S20.104,6.023,15.133,6.023z M15.133,21.023c-3.313,0-6-2.688-6-6c0-3.314,2.688-6,6-6c3.314,0,6,2.686,6,6 C21.133,18.336,18.447,21.023,15.133,21.023z" fill-rule="evenodd"/>
<path d="M16.633,28.943v-4.037c-0.994,0.15-2.006,0.146-3-0.004v4.041 C14.631,29.049,15.637,29.049,16.633,28.943z" fill-rule="evenodd"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.016"/>
<polygon points="1.508,13.46,4.905,13.46,5.106,19.98,8.233,13.46,10.95,13.46,10.95,19.98,13.87,13.46,17.47,13.46,12.03,23.65,8.845,23.65,8.777,17.31,5.924,23.65,2.663,23.65"/>
<path d="M22.78,12.06c0-1.082-1.186-1.956-2.646-1.956-1.462,0-2.649,0.874-2.649,1.956,0,0.579,0.343,1.096,0.883,1.456v10.14h3.53v-10.15c0.55-0.362,0.89-0.872,0.89-1.452z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_attach.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_attach.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="29.03" width="29.03" x="0.323" y="0.016"/>
<polygon points="5.432,6.967,7.365,6.967,7.48,10.68,9.261,6.967,10.81,6.967,10.81,10.68,12.47,6.967,14.52,6.967,11.43,12.77,9.61,12.77,9.57,9.16,7.947,12.77,6.091,12.77"/>
<path d="M17.54,6.166c0-0.615-0.674-1.112-1.508-1.112-0.833,0-1.508,0.498-1.508,1.112,0,0.33,0.195,0.625,0.503,0.829v5.772h2.009v-5.774c0.32-0.204,0.51-0.5,0.51-0.83z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_context.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_context.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="29.03" width="29.03" x="0.746" y="0.016"/>
<polygon points="5.854,6.967,7.789,6.967,7.903,10.68,9.685,6.967,11.23,6.967,11.23,10.68,12.89,6.967,14.94,6.967,11.85,12.77,10.03,12.77,9.995,9.161,8.371,12.77,6.515,12.77"/>
<path d="M17.97,6.167c0-0.616-0.674-1.113-1.508-1.113-0.832,0-1.508,0.498-1.508,1.113,0,0.329,0.194,0.625,0.503,0.828v5.772h2.009v-5.774c0.32-0.204,0.51-0.5,0.51-0.829z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_multipdp.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_multipdp.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="29.03" width="29.03" x="0.14" y="0.016"/>
<polygon points="5.247,6.99,7.181,6.99,7.296,10.7,9.077,6.99,10.62,6.99,10.62,10.7,12.28,6.99,14.34,6.99,11.24,12.79,9.426,12.79,9.387,9.183,7.763,12.79,5.907,12.79"/>
<path d="M17.36,6.189c0-0.616-0.673-1.113-1.507-1.113-0.833,0-1.508,0.498-1.508,1.113,0,0.33,0.194,0.625,0.503,0.828v5.772h2.009v-5.772c0.32-0.205,0.51-0.498,0.51-0.829z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_suspended.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_suspended.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="29.03" width="29.03" x="0.846" y="0.016"/>
<polygon points="5.954,6.974,7.889,6.974,8.003,10.69,9.785,6.974,11.33,6.974,11.33,10.69,12.99,6.974,15.04,6.974,11.95,12.78,10.13,12.78,10.09,9.168,8.47,12.78,6.614,12.78"/>
<path d="M18.07,6.174c0-0.616-0.674-1.113-1.508-1.113-0.832,0-1.508,0.498-1.508,1.113,0,0.33,0.194,0.625,0.503,0.829v5.772h2.009v-5.777c0.32-0.204,0.51-0.499,0.51-0.829z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M18.23,21.4l-2.349-9.384c1.031-0.366,1.775-1.323,1.775-2.477,0-1.469-1.188-2.656-2.655-2.656s-2.655,1.186-2.655,2.656c0,1.153,0.741,2.107,1.769,2.477l-2.345,9.384h-3.405v2.654h13.28v-2.654h-3.403z"/>
<path d="M6,9.54c0,2.967,1.627,5.158,1.676,5.232,0.267-0.181,0.721-0.494,0.99-0.674-0.052-0.071-1.474-2.087-1.474-4.558,0-2.675,1.422-4.486,1.474-4.561-0.269-0.186-0.721-0.499-0.985-0.68-0.052,0.074-1.681,2.359-1.681,5.239z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan_offline.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan_offline.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M16.14,13.04l-0.258-1.03c1.031-0.366,1.775-1.323,1.775-2.477,0-1.469-1.188-2.656-2.655-2.656-1.382,0-2.503,1.056-2.63,2.407l3.77,3.756z"/>
<polygon points="18.62,21.4,18.23,21.4,18.1,20.88,13.13,15.94,11.77,21.4,8.355,21.4,8.355,24.05,21.28,24.05"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_work.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_work.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
-<path d="M19,13v-11h-17v26h27v-15h-10zm-14,12v-20h11v2h-3v3h3v2h-3v3h3v2h-3v3h3v5h-11zm21-3h-6v-2h6v2zm0-4h-6v-2h6v2z"/>
-<rect height="3" width="4" x="7" y="7"/>
-<rect height="3" width="4" x="7" y="12"/>
-<rect height="3" width="4" x="7" y="17"/>
+<rect height="3" width="2" x="7" y="10"/>
+<rect height="3" width="2" x="11" y="10"/>
+<rect height="3" width="2" x="7" y="15"/>
+<rect height="3" width="2" x="11" y="15"/>
+<path d="M18,8V1L2,7v21h26V8H18z M15,25h-3v-5H8v5H5V9.079l10-3.75V25z M25,23h-6v-2h6V23z M25,18h-6v-2h6V18z M25,13h-6v-2h6V13z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_world_clock.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_world_clock.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<path d="M15,1c-7.732,0-14,6.268-14,14s6.268,14,14,14c7.733,0,14-6.268,14-14s-6.27-14-14-14zm-9.16,20.42c-0.775-1.102-1.351-2.348-1.689-3.689l1.636-0.323,1.4,2.8-1.347,1.21zm16.27,2.22l-0.701-0.635,1.398-2.799,1.885,0.371c-0.68,1.18-1.55,2.22-2.59,3.07zm1.11-13.12l-1.61-0.62,0.914,1.239,0.656-0.291s0.803,0.768,0.766,1.021c-0.035,0.257-1.238,1.424-1.238,1.424l-1.057,0.376-1.391-1.144-1.06-0.88,0.656,1.567,0.877,0.914s1.533-0.219,1.752-0.037c0.221,0.182-0.291,1.572-0.291,1.572l-2.557,2.626-0.256,2.627c-1.424,0.732-1.569,1.859-1.569,1.859s-0.364-0.068-1.313,0.99-1.973,0.781-1.973,0.781c-1.204,0-1.423-0.781-1.423-1.039,0-0.254-1.205-2.225-1.205-2.885,0-0.656,0.365-1.459,0.365-1.459,0.072-0.949-0.949-3.501-0.949-3.501h-1.059l-0.365-0.806c-3.432,0.73-3.577-0.146-4.089-1.096-0.511-0.949,0.074-3.504,0.402-3.905,0.21-0.257,1.328-1.063,2.109-1.614l7.998,2.552,1.41-2.78-5.6-1.399-3.122,1.175c0.058-0.04,0.1-0.068,0.1-0.068l-0.329-0.475c-0.22-0.473,1.205-1.131,1.205-1.131,0.548,0.366,0.912,0,0.912,0l0.146-0.365-0.15-0.547,0.677-0.842c1.08-0.352,2.24-0.548,3.44-0.548,1.259,0,2.465,0.219,3.595,0.604l-0.8,0.796,1.399,1.4,1.326-1.326c2.934,1.677,5.043,4.64,5.546,8.119-0.585-1.176-1.067-2.545-1.067-2.545l-1.79-0.32z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="30" width="30"/>
<path d="M25.809,4.191c-4.1-4.102-10.748-4.102-14.849,0C7.221,7.93,6.902,13.782,9.983,17.895l-1.499,1.499l-0.707-0.707 l-4.949,4.95l3.535,3.535l4.95-4.95l-0.707-0.707l1.499-1.498c4.112,3.081,9.965,2.763,13.703-0.977 C29.91,14.939,29.91,8.291,25.809,4.191z M23.688,16.918c-2.924,2.925-7.683,2.924-10.605,0c-2.924-2.923-2.926-7.682,0-10.605 c2.924-2.925,7.682-2.924,10.605,0S26.612,13.994,23.688,16.918z"/>
<rect height="2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -15.239 48.7386)" width="4.999" x="-0.025" y="26.525"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom_in.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom_in.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom_out.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom_out.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<g fill-opacity="0.5" stroke-opacity="0.5">
<rect fill="none" height="30" width="30"/>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_add.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_add.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<polygon fill-opacity="0.6" points="11,29 11,19 1,19 1,11 11,11 11,1 19,1 19,11 29,11 29,19 19,19 19,29 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_anniversary.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_anniversary.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<rect fill-opacity="0.6" height="7" stroke-opacity="0.6" width="6" x="4.5" y="10"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_assistant.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_assistant.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15.591,29c-0.845,0-1.65-0.228-2.338-0.659c-0.373-0.132-0.747-0.308-1.116-0.522H9.091 c-2.506,0-4.545-2.039-4.545-4.545v-0.378c-0.774-0.247-1.49-0.751-2.076-1.476l-0.092-0.13c-0.146-0.187-0.309-0.417-0.453-0.671 c-0.041-0.07-0.077-0.148-0.112-0.227l-0.063-0.129c-0.091-0.18-0.181-0.359-0.256-0.555c-0.049-0.127-0.089-0.266-0.128-0.404 L1.29,19.057c-0.037-0.113-0.073-0.227-0.101-0.347c-0.081-0.358-0.136-0.723-0.165-1.085c-0.028-0.353-0.031-0.715-0.008-1.074 c0.007-0.119,0.024-0.234,0.042-0.35l0.029-0.221c0.018-0.15,0.036-0.3,0.067-0.443c0.038-0.178,0.089-0.346,0.143-0.515l0.05-0.167 c0.024-0.086,0.049-0.17,0.079-0.251c0.091-0.243,0.202-0.466,0.319-0.687c0.026-0.057,0.051-0.107,0.079-0.154 c0.136-0.238,0.298-0.471,0.492-0.703c0.34-0.403,0.707-0.719,1.103-0.949C3.928,5.832,8.905,1,15,1s11.072,4.832,11.581,11.111 c0.394,0.229,0.757,0.537,1.083,0.925c0.213,0.257,0.375,0.489,0.516,0.733l0.072,0.143c0.119,0.227,0.23,0.449,0.322,0.693 c0.029,0.08,0.055,0.164,0.078,0.25l0.051,0.167c0.053,0.169,0.104,0.337,0.143,0.517c0.03,0.142,0.049,0.291,0.066,0.441 l0.029,0.221c0.019,0.115,0.035,0.23,0.043,0.352c0.021,0.357,0.02,0.72-0.009,1.074c-0.028,0.36-0.084,0.725-0.164,1.08 c-0.028,0.124-0.065,0.242-0.104,0.359l-0.068,0.229c-0.04,0.143-0.081,0.283-0.133,0.416c-0.074,0.196-0.165,0.377-0.257,0.557 l-0.062,0.127c-0.035,0.077-0.07,0.154-0.111,0.227c-0.145,0.252-0.307,0.482-0.477,0.701l-0.073,0.103 c-0.839,1.038-1.933,1.623-3.083,1.65c0,0-0.172,0.011-0.217,0.011c-0.734-0.039-1.35-0.281-1.834-0.713 c-0.498,1.055-1.043,2.051-1.623,2.969l-0.047,0.106l-0.08,0.118c-0.185,0.246-0.39,0.49-0.605,0.729 c-0.201,0.218-0.339,0.359-0.484,0.496l-0.104,0.094c-0.133,0.119-0.241,0.213-0.348,0.301C18.429,28.295,17.078,29,15.591,29 L15.591,29z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_attachment.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_attachment.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M10.465,29L6,22.303V9h4v12.092L12.605,25h5.789L21,21.092V5h-6v13.5c0,0.275,0.224,0.5,0.5,0.5 s0.5-0.225,0.5-0.5V6h4v12.5c0,2.481-2.019,4.5-4.5,4.5S11,20.981,11,18.5V4c0-1.654,1.346-3,3-3h8c1.654,0,3,1.346,3,3v18.303 L20.535,29H10.465z" fill-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_authorised.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_authorised.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<polygon fill="none" points="0,0 0,30 4.358,30 25.643,30 30,30 30,0 "/>
<g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_blocked.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_blocked.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<path d="M15,0.502c-8.009,0-14.5,6.489-14.5,14.499s6.491,14.5,14.5,14.5c8.009,0,14.5-6.49,14.5-14.5 S23.009,0.502,15,0.502z" fill-opacity="0.35" stroke-opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -376.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="297.4795" x2="297.4795" y1="-381.5396" y2="-400.9155">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bluetooth_offline.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bluetooth_offline.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15,30C7.495,30,4,25.224,4,14.969C4,4.757,7.495,0,15,0 s11,4.757,11,14.969C26,25.364,22.607,30,15,30L15,30z" fill-opacity="0.6" fill-rule="evenodd" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_low_battery.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_low_battery.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<polygon fill-opacity="0.35" points="6.199,29 6.199,3.6 11.4,3.6 11.4,1 18.6,1 18.6,3.6 23.799,3.6 23.799,29 " stroke-opacity="0.35"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_high.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_high.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<rect fill-opacity="0.35" height="12" stroke-opacity="0.35" width="8" x="1" y="15"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_low.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_low.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<rect fill-opacity="0.35" height="12" stroke-opacity="0.35" width="8" x="1" y="15"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_medium.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_medium.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<rect fill-opacity="0.35" height="12" stroke-opacity="0.35" width="8" x="1" y="15"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_business_card.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_business_card.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<rect fill-opacity="0.6" height="22" width="28" x="1" y="4"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_calendar.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_calendar.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<path d="M22,4c0-1.104-0.896-2-2-2s-2,0.896-2,2h-6c0-1.104-0.897-2-2-2S8,2.896,8,4H2v24h26V4H22z" fill-opacity="0.6"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1412 0)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1427" x2="-1427" y1="10.3691" y2="27.0025">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_car.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_car.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M27.606,11.991l-1.636-5.233C25.588,5.226,23.461,3,21,3H9C6.539,3,4.412,5.226,4.045,6.702l-1.652,5.291 C1.547,12.727,1,13.795,1,15v6c0,0.883,0.391,1.67,1,2.22V25c0,1.103,1.01,2,2.25,2h2.5C7.99,27,9,26.103,9,25v-1h12v1 c0,1.103,1.01,2,2.25,2h2.5c1.24,0,2.25-0.897,2.25-2v-1.78c0.609-0.55,1-1.337,1-2.22v-6C29,13.795,28.453,12.725,27.606,11.991z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_charger.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_charger.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M23,10V1h-5v9h-6V1H7v9H4v7c0,3.52,2.613,6.433,6,6.92V26h2v3h6v-3h2v-2.08c3.387-0.487,6-3.4,6-6.92v-7H23z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_collapse.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_collapse.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill-opacity="0.6" height="30" stroke-opacity="0.6" width="30"/>
<rect fill="url(#SVGID_1_)" height="28" width="28" x="1" y="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_company_details.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_company_details.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<rect fill-opacity="0.6" height="21" stroke-opacity="0.6" width="15" x="14" y="8"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connected.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connected.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connection.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connection.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30" x="0.002"/>
<path d="M20.752,15.001H1.27c-0.555,0-0.998,0.273-1.186,0.73c-0.186,0.459-0.059,0.966,0.34,1.355l10.515,10.314 c0.339,0.335,0.687,0.404,0.918,0.404c0.565,0,1.165-0.448,1.165-1.28v-4.398h7.73c0.842,0,1.527-0.69,1.527-1.538v-4.051 C22.279,15.69,21.594,15.001,20.752,15.001z" fill-opacity="0.35" stroke-opacity="0.35"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_contacts.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_contacts.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M4,1v5C2.896,6,2,6.897,2,8s0.896,2,2,2v1c-1.104,0-2,0.897-2,2s0.896,2,2,2v1c-1.104,0-2,0.897-2,2 s0.896,2,2,2v1c-1.104,0-2,0.897-2,2s0.896,2,2,2v4h24V1H4z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_corrupted.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_corrupted.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<polygon fill-opacity="0.6" points="17.131,28 13.66,22.792 18.681,18.775 13.68,10.775 18.772,6.701 16.683,2 28,2 28,28 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="21" x2="21" y1="3" y2="27.0005">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_day.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_day.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M22,4c0-1.104-0.896-2-2-2c-1.103,0-2,0.896-2,2h-6c0-1.104-0.896-2-2-2C8.897,2,8,2.896,8,4H3v24h24V4H22z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_disconnected.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_disconnected.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30" x="0"/>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_draft.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_draft.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<polygon fill="url(#SVGID_1_)" points="27,2 27,28 9.586,28 3,21.404 3,2 "/>
<polygon fill="#FFFFFF" points="4,21 10,21 10,27 "/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_drm_rights_expired.svg Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<path d="M23.984,8.778c-0.472-3.282-0.868-5.2-1.181-5.701C22.725,2.951,20.813,0,14.888,0 C8.912,0,7.265,3.002,7.227,3.079C6.853,3.7,6.363,6.517,6.012,8.826c-0.098,1.013,0.428,2.248,1.291,2.927 c1.198,0.784,2.063,1.291,2.696,1.623v2.622h1V25l4,4.824l4-4.825V23l-0.635-0.616l1.211-1.303l-1.244-1.34l1.351-1.388 l-1.302-1.276L19,16.43v-0.432h1v-2.632c0.646-0.34,1.527-0.859,2.756-1.665C23.544,11.078,24.075,9.847,23.984,8.778z M12.5,5h5 C17.771,5,18,5.229,18,5.5S17.771,6,17.5,6h-5C12.229,6,12,5.771,12,5.5S12.229,5,12.5,5z" fill-opacity="0.6"/>
+<polygon fill="url(#SVGID_1_)" points="12,24.641 12,14.998 11,14.998 11,12 19,12 19,14.998 18,14.998 18,16.027 16.977,17.102 18.271,18.37 16.952,19.727 18.211,21.081 16.967,22.42 18,23.423 18,24.639 15,28.258 "/>
+<polygon fill="url(#SVGID_1_)" points="12,24.641 12,14.998 11,14.998 11,12 19,12 19,14.998 18,14.998 18,16.027 16.977,17.102 18.271,18.37 16.952,19.727 18.211,21.081 16.967,22.42 18,23.423 18,24.639 15,28.258 "/>
+<rect fill-opacity="0.3" height="2" width="8" x="11" y="12"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -208.8501 -268.8496)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="222.8494" x2="222.8494" y1="-283.8496" y2="-297.1074">
+<stop offset="0" style="stop-color:#D0D2D3"/>
+<stop offset="1" style="stop-color:#F1F1F2"/>
+</linearGradient>
+<polygon fill="url(#SVGID_3_)" points="13,15 13,25.846 15,28.258 15,15 "/>
+<polygon fill-opacity="0.3" points="14,15 14,27.053 15,28.258 15,15 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -208.8501 -268.8496)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="223.8494" x2="223.8494" y1="-269.8496" y2="-281.8496">
+<stop offset="0" style="stop-color:#919191"/>
+<stop offset="1" style="stop-color:#0D0D0D"/>
+</linearGradient>
+<path d="M21.955,3.606c0,0-1.628-2.606-7.066-2.606c-5.44,0-6.806,2.595-6.806,2.595 C7.732,4.177,7.007,8.921,7.007,8.921C6.942,9.6,7.322,10.498,7.851,10.916c0,0,3.186,2.084,3.854,2.084h6.578 c0.668,0,3.854-2.084,3.854-2.084c0.528-0.418,0.914-1.316,0.857-1.996C22.994,8.92,22.314,4.183,21.955,3.606z M17.5,7h-5 C11.675,7,11,6.325,11,5.5S11.675,4,12.5,4h5C18.325,4,19,4.675,19,5.5S18.325,7,17.5,7z" fill="url(#SVGID_4_)"/>
+<path d="M8.083,4.595c0,0,1.364-2.595,6.806-2.595 c5.438,0,7.066,2.606,7.066,2.606c0.297,0.476,0.812,3.783,0.981,4.923c0.048-0.21,0.072-0.418,0.058-0.609 c0,0-0.68-4.737-1.039-5.313c0,0-1.628-2.606-7.066-2.606c-5.44,0-6.806,2.595-6.806,2.595C7.732,4.177,7.007,8.921,7.007,8.921 c-0.019,0.197,0.01,0.413,0.059,0.63C7.242,8.432,7.791,5.078,8.083,4.595z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M12.5,8h5C18.325,8,19,7.325,19,6.5 c0-0.176-0.036-0.343-0.093-0.5c-0.208,0.58-0.758,1-1.407,1h-5c-0.648,0-1.199-0.42-1.407-1C11.036,6.157,11,6.324,11,6.5 C11,7.325,11.675,8,12.5,8z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<rect fill="none" height="30" width="30" x="0"/>
+<defs>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -208.8501 -268.8496)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="223.8494" x2="223.8494" y1="-280.8496" y2="-297.1074">
+<stop offset="0" style="stop-color:#8C8E8F"/>
+<stop offset="1" style="stop-color:#D9D9D9"/>
+</linearGradient>
+</defs>
+</g>
+<g>
+<rect fill-opacity="0.6" height="34.27" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(0.7073 -0.707 0.707 0.7073 -6.2126 14.9968)" width="3.169" x="13.42" y="-2.134"/>
+<polygon fill="url(#SVGID_1__)" points="26,26.99,3.015,4.005,4.006,3.014,26.99,26"/>
+<rect fill="none" height="30" width="30"/>
+<defs>
+<linearGradient gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="339.8" x2="339.8" y1="-397.3" y2="-425.3">
+<stop offset="0" stop-color="#DE8029"/>
+<stop offset="0.2606" stop-color="#DE4E29"/>
+<stop offset="1" stop-color="#D82E09"/>
+</linearGradient>
+</defs>
+</g>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15,29C7.28,29,1,22.72,1,15S7.28,1,15,1s14,6.28,14,14S22.72,29,15,29L15,29z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email_home.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email_home.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15,29C7.28,29,1,22.72,1,15S7.28,1,15,1s14,6.28,14,14S22.72,29,15,29L15,29z" fill-opacity="0.6" stroke-opacity="0.6"/>
@@ -15,17 +15,17 @@
<rect fill="none" height="30" width="30"/>
</g>
<g>
-<rect fill="none" height="30" width="30"/>
-<path d="M21,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S25.411,30,21,30L21,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -66 -46)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="87" x2="87" y1="-60.9688" y2="-75.1651">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S26.411,30,22,30L22,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="22" x2="22" y1="14.9683" y2="29.1646">
+<stop offset="0" style="stop-color:#FFC144"/>
+<stop offset="1" style="stop-color:#EF6902"/>
</linearGradient>
-<circle cx="21" cy="22" fill="url(#SVGID_1__)" r="7"/>
-<polygon fill-opacity="0.2" points="25.34,24 20.999,19.4 16.66,24 16,23.3 20.999,18 26,23.3 " stroke-opacity="0.2"/>
-<polygon fill-opacity="0.2" points="20.999,20.857 17,25.098 17,27 20,27 20,24 22,24 22,27 25,27 25,25.098 " stroke-opacity="0.2"/>
-<path d="M21,16c3.697,0,6.717,2.869,6.975,6.5 C27.986,22.334,28,22.169,28,22c0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C14.283,18.869,17.303,16,21,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<polygon fill="#FFFFFF" points="25.34,23 20.999,18.4 16.66,23 16,22.3 20.999,17 26,22.3 "/>
-<polygon fill="#FFFFFF" points="20.999,19.857 17,24.098 17,26 20,26 20,23 22,23 22,26 25,26 25,24.098 "/>
+<circle cx="22" cy="22" fill="url(#SVGID_1__)" r="7"/>
+<polygon fill-opacity="0.2" points="26.34,24 21.999,19.4 17.66,24 17,23.3 21.999,18 27,23.3 26.34,24 " stroke-opacity="0.2"/>
+<polygon fill-opacity="0.2" points="21.999,20.857 18,25.098 18,27 21,27 21,24 23,24 23,27 26,27 26,25.097 " stroke-opacity="0.2"/>
+<path d="M22,16c3.697,0,6.717,2.869,6.975,6.5C28.986,22.334,29,22.169,29,22c0-3.865-3.134-7-7-7 s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C15.283,18.869,18.303,16,22,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<polygon fill="#FFFFFF" points="26.34,23 21.999,18.4 17.66,23 17,22.3 21.999,17 27,22.3 26.34,23 "/>
+<polygon fill="#FFFFFF" points="21.999,19.857 18,24.098 18,26 21,26 21,23 23,23 23,26 26,26 26,24.097 "/>
+<rect fill="none" height="30" width="30"/>
</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email_work.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email_work.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15,29C7.28,29,1,22.72,1,15S7.28,1,15,1s14,6.28,14,14S22.72,29,15,29L15,29z" fill-opacity="0.6" stroke-opacity="0.6"/>
@@ -15,18 +15,20 @@
<rect fill="none" height="30" width="30"/>
</g>
<g>
+<rect fill="none" height="30" width="30"/>
<g>
-<rect fill="none" height="30" width="30"/>
+<path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S26.411,30,22,30L22,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -549.9609 -796.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="571.9609" x2="571.9609" y1="811.0391" y2="825.0391">
+<stop offset="0" style="stop-color:#A0A7A8"/>
+<stop offset="1" style="stop-color:#252629"/>
+</linearGradient>
+<circle cx="22" cy="22" fill="url(#SVGID_1__)" r="7"/>
+<path d="M22,16c3.697,0,6.717,2.869,6.975,6.5 C28.986,22.334,29,22.169,29,22c0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C15.283,18.869,18.303,16,22,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<polygon fill="#FFFFFF" points="24,19 24,20 26,20 26,21 24,21 24,22 26,22 26,23 24,23 24,26 27,26 27,19 "/>
+<path d="M17,19v7h2v-2h2v2h2v-9L17,19z M19,23h-1v-1h1V23z M19,21h-1v-1h1V21z M22,23h-1v-1h1V23z M22,21h-1v-1h1 V21z" fill="#FFFFFF"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="2" x="17" y="26"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="6" x="21" y="26"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="2" x="19" y="24"/>
</g>
-<path d="M21,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S25.411,30,21,30L21,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="21" x2="21" y1="14.9683" y2="29.1646">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
-</linearGradient>
-<circle cx="21" cy="22" fill="url(#SVGID_1__)" r="7"/>
-<path d="M22,21v-2h-5v8h4h1h3v-6H22z M21,25h-3v-1h3V25z M21,23h-3v-1h3V23z M18,21v-1h3v1H18z M24,25h-2v-1h2V25z M24,23h-2v-1h2V23z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M21,16c3.697,0,6.717,2.869,6.975,6.5C27.986,22.334,28,22.169,28,22c0-3.865-3.134-7-7-7 s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C14.283,18.869,17.303,16,21,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M22,20v-2h-5v8h4h1h3v-6H22z M21,24h-3v-1h3V24z M21,22h-3v-1h3V22z M18,20v-1h3v1H18z M24,24h-2v-1h2V24z M24,22h-2v-1h2V22z" fill="#FFFFFF"/>
-<rect fill-opacity="0.3" height="6" stroke-opacity="0.3" width="1" x="22" y="20"/>
</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_expand.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_expand.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill-opacity="0.6" height="30" stroke-opacity="0.6" width="30"/>
<rect fill="url(#SVGID_1_)" height="28" width="28" x="1" y="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fail.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fail.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15,29C7.279,29,1,22.72,1,15S7.279,1,15,1c7.719,0,14,6.28,14,14S22.719,29,15,29L15,29z" fill-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_family.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_family.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M29.813,21.146c-0.169-0.236-0.379-0.376-1.244-0.929c-2.185-1.396-3.446-2.377-3.757-2.901 c0.68-0.589,1.246-1.319,1.624-2.104c0.813-1.688,0.663-5.425,0.645-5.798C27.081,7.225,24.279,5,22.265,5h-0.54 c-2.014,0-4.814,2.225-4.814,4.379c-0.015,0.417-0.122,4.122,0.633,5.807c0.357,0.799,0.924,1.544,1.627,2.145 c-0.295,0.47-1.26,1.247-2.865,2.314c-2.509-1.551-3.941-2.637-4.252-3.217c0.787-0.644,1.444-1.451,1.882-2.323 c0.923-1.842,0.751-5.937,0.729-6.349C14.664,5.396,11.545,3,9.303,3H8.686c-2.242,0-5.36,2.396-5.359,4.719 c-0.018,0.457-0.14,4.52,0.717,6.36c0.413,0.888,1.072,1.712,1.888,2.368c-0.353,0.61-1.813,1.707-4.353,3.268 c-0.967,0.593-1.201,0.742-1.38,0.982L0,20.963V27h30v-5.594L29.813,21.146z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_favorite.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_favorite.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<polygon fill-opacity="0.6" points="15,0.734 19.635,10.126 30,11.632 22.5,18.943 24.27,29.266 15,24.393 5.73,29.266 7.5,18.943 0,11.632 10.365,10.126 " stroke-opacity="0.6"/>
<polygon fill="url(#SVGID_1_)" points="15,23.262 7.058,27.438 8.574,18.594 2.149,12.331 11.029,11.04 15,2.994 18.971,11.04 27.852,12.331 21.426,18.594 22.941,27.438 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<path d="M26,8v-2h-1.586l-5-5h-14.41v5h-1v2c-1.654,0-3,1.346-3,3v8c0,1.654,1.346,3,3,3v3h1v4h20v-4h1v-3c1.654,0,3-1.346,3-3v-8c0-1.654-1.35-3-3-3z" fill-opacity="0.6" stroke-opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="7" y2="10">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_home.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_home.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,102 +1,104 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
-<path d="M26,8v-2h-1.586l-5-5h-14.41v5h-1v2c-1.654,0-3,1.346-3,3v8c0,1.654,1.346,3,3,3v3h1v4h20v-4h1v-3c1.654,0,3-1.346,3-3v-8c0-1.654-1.35-3-3-3z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="7" y2="10">
-<stop offset="0" stop-color="#808080"/>
-<stop offset="1" stop-color="#636363"/>
+<rect fill="none" height="30" width="30"/>
+<g>
+<path d="M26,8.001v-2h-1.586l-5-5H5v5H4v2c-1.654,0-3,1.346-3,3v8c0,1.653,1.346,3,3,3 v3h1v4h20v-4h1v-3c1.654,0,3-1.347,3-3v-8C29,9.347,27.654,8.001,26,8.001z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="297.4795" x2="297.4795" y1="-382.0205" y2="-385.0205">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="1" style="stop-color:#636363"/>
</linearGradient>
-<rect fill="url(#SVGID_1_)" height="3" width="20" x="5" y="7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="21" y2="24">
-<stop offset="0" stop-color="#808080"/>
-<stop offset="1" stop-color="#636363"/>
+<rect fill="url(#SVGID_1_)" height="3" width="20" x="5" y="7.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="297.4795" x2="297.4795" y1="-396.0205" y2="-399.0205">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="1" style="stop-color:#636363"/>
</linearGradient>
-<rect fill="url(#SVGID_2_)" height="3" width="20" x="5" y="21"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15" x2="15" y1="2.002" y2="28.06">
-<stop offset="0" stop-color="#EDEDED"/>
-<stop offset="1" stop-color="#BDBDBD"/>
+<rect fill="url(#SVGID_2_)" height="3" width="20" x="5" y="21.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="297.4795" x2="297.4795" y1="-377.0225" y2="-403.0858">
+<stop offset="0" style="stop-color:#EDEDED"/>
+<stop offset="1" style="stop-color:#BDBDBD"/>
</linearGradient>
-<rect fill="url(#SVGID_3_)" height="10" width="18" x="6" y="18"/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="2" x="8" y="23.5"/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="11" x="11" y="23.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15" x2="15" y1="2" y2="28.07">
-<stop offset="0" stop-color="#EDEDED"/>
-<stop offset="1" stop-color="#BDBDBD"/>
+<rect fill="url(#SVGID_3_)" height="10" width="18" x="6" y="18.001"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="2" x="8" y="23.501"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="11.001" x="10.999" y="23.501"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="297.4795" x2="297.4795" y1="-377.0205" y2="-403.0858">
+<stop offset="0" style="stop-color:#EDEDED"/>
+<stop offset="1" style="stop-color:#BDBDBD"/>
</linearGradient>
-<polygon fill="url(#SVGID_4_)" points="24,7,24,19,6,19,6,2,19,2"/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="2" x="8" y="5"/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="11" x="11" y="5"/>
-<polygon fill="#FFFFFF" points="19,7,24,7,19,2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15" x2="15" y1="9.115" y2="21.01">
-<stop offset="0" stop-color="#E6E6E6"/>
-<stop offset="1" stop-color="#626262"/>
+<polygon fill="url(#SVGID_4_)" points="24,7.001 24,19.001 6,19.001 6,2.001 19,2.001 "/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="2" x="8" y="5.001"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="11" x="11" y="5.001"/>
+<polygon fill="#FFFFFF" points="19,7.001 24,7.001 19,2.001 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="297.4795" x2="297.4795" y1="-384.1367" y2="-396.0269">
+<stop offset="0" style="stop-color:#E6E6E6"/>
+<stop offset="1" style="stop-color:#626262"/>
</linearGradient>
-<path d="M28,19c0,1.1-0.9,2-2,2h-22c-1.1,0-2-0.9-2-2v-8c0-1.1,0.9-2,2-2h22c1.1,0,2,0.9,2,2v8z" fill="url(#SVGID_5_)"/>
-<path d="M26,9h-22c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h22c1.1,0,2,0.9,2,2v-1c0-1.1-0.9-2-2-2z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15.5" x2="15.5" y1="11" y2="20.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<path d="M28,19.001c0,1.101-0.9,2-2,2H4c-1.1,0-2-0.899-2-2v-8c0-1.1,0.9-2,2-2h22c1.1,0,2,0.9,2,2V19.001z" fill="url(#SVGID_5_)"/>
+<path d="M26,9.001H4c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h22 c1.1,0,2,0.9,2,2v-1C28,9.901,27.1,9.001,26,9.001z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="297.9795" x2="297.9795" y1="-386.0205" y2="-396.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_6_)" height="2" width="3" x="14" y="11"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="19.5" x2="19.5" y1="11" y2="20.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<rect fill="url(#SVGID_6_)" height="2" width="3" x="14" y="11.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="301.9795" x2="301.9795" y1="-386.0205" y2="-396.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_7_)" height="2" width="3" x="18" y="11"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="23.5" x2="23.5" y1="11" y2="20.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<rect fill="url(#SVGID_7_)" height="2" width="3" x="18" y="11.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="305.9795" x2="305.9795" y1="-386.0205" y2="-396.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_8_)" height="2" width="3" x="22" y="11"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="15.5" x2="15.5" y1="10" y2="19.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<rect fill="url(#SVGID_8_)" height="2" width="3" x="22" y="11.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="297.9795" x2="297.9795" y1="-385.0205" y2="-395.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_9_)" height="2" width="3" x="14" y="14"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="19.5" x2="19.5" y1="10" y2="19.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<rect fill="url(#SVGID_9_)" height="2" width="3" x="14" y="14.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="301.9795" x2="301.9795" y1="-385.0205" y2="-395.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_10_)" height="2" width="3" x="18" y="14"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="23.5" x2="23.5" y1="10" y2="19.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<rect fill="url(#SVGID_10_)" height="2" width="3" x="18" y="14.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="305.9795" x2="305.9795" y1="-385.0205" y2="-395.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_11_)" height="2" width="3" x="22" y="14"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="15.5" x2="15.5" y1="9" y2="18.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<rect fill="url(#SVGID_11_)" height="2" width="3" x="22" y="14.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="297.9795" x2="297.9795" y1="-384.0205" y2="-394.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_12_)" height="2" width="3" x="14" y="17"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="19.5" x2="19.5" y1="9" y2="18.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<rect fill="url(#SVGID_12_)" height="2" width="3" x="14" y="17.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="301.9795" x2="301.9795" y1="-384.0205" y2="-394.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_13_)" height="2" width="3" x="18" y="17"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="23.5" x2="23.5" y1="9" y2="18.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<rect fill="url(#SVGID_13_)" height="2" width="3" x="18" y="17.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="305.9795" x2="305.9795" y1="-384.0205" y2="-394.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_14_)" height="2" width="3" x="22" y="17"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="8" x2="8" y1="11.19" y2="14.06">
-<stop offset="0" stop-color="#30BCE8"/>
-<stop offset="1" stop-color="#048CC6"/>
+<rect fill="url(#SVGID_14_)" height="2" width="3" x="22" y="17.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="290.4795" x2="290.4795" y1="-386.209" y2="-389.0847">
+<stop offset="0" style="stop-color:#30BCE8"/>
+<stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
-<rect fill="url(#SVGID_15_)" height="3" width="8" x="4" y="11"/>
-<rect fill-opacity="0.4" height="1" stroke-opacity="0.4" width="20" x="5" y="8"/>
-<rect fill-opacity="0.4" height="1" stroke-opacity="0.4" width="20" x="5" y="21"/>
-<rect fill="none" height="30" width="30"/>
-<path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8,8,3.589,8,8-3.59,8-8,8z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="22" x2="22" y1="14.97" y2="29.16">
-<stop offset="0" stop-color="#4EDEFF"/>
-<stop offset="1" stop-color="#048CC6"/>
+<rect fill="url(#SVGID_15_)" height="3" width="8" x="4" y="11.001"/>
+<rect fill-opacity="0.4" height="1" stroke-opacity="0.4" width="20" x="5" y="8.001"/>
+<rect fill-opacity="0.4" height="1" stroke-opacity="0.4" width="20" x="5" y="21.001"/>
+<path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S26.411,30,22,30L22,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="304.4795" x2="304.4795" y1="-389.9883" y2="-404.1846">
+<stop offset="0" style="stop-color:#FFC144"/>
+<stop offset="1" style="stop-color:#EF6902"/>
</linearGradient>
<circle cx="22" cy="22" fill="url(#SVGID_16_)" r="7"/>
-<polygon fill-opacity="0.2" points="26.34,24,22,19.4,17.66,24,17,23.3,22,18,27,23.3,26.34,24" stroke-opacity="0.2"/>
-<polygon fill-opacity="0.2" points="22,20.86,18,25.1,18,27,21,27,21,24,23,24,23,27,26,27,26,25.1" stroke-opacity="0.2"/>
-<path d="M22,16c3.697,0,6.717,2.869,6.975,6.5,0.01-0.17,0.02-0.33,0.02-0.5,0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5,0.26-3.63,3.28-6.5,6.98-6.5z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<polygon fill="#FFFFFF" points="26.34,23,22,18.4,17.66,23,17,22.3,22,17,27,22.3,26.34,23"/>
-<polygon fill="#FFFFFF" points="22,19.86,18,24.1,18,26,21,26,21,23,23,23,23,26,26,26,26,24.1"/>
+<polygon fill-opacity="0.2" points="26.34,24 21.999,19.4 17.66,24 17,23.3 21.999,18 27,23.3 " stroke-opacity="0.2"/>
+<polygon fill-opacity="0.2" points="21.999,20.857 18,25.098 18,27 21,27 21,24 23,24 23,27 26,27 26,25.098 " stroke-opacity="0.2"/>
+<path d="M22,16c3.697,0,6.717,2.869,6.975,6.5 C28.986,22.334,29,22.169,29,22c0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C15.283,18.869,18.303,16,22,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<polygon fill="#FFFFFF" points="26.34,23 21.999,18.4 17.66,23 17,22.3 21.999,17 27,22.3 "/>
+<polygon fill="#FFFFFF" points="21.999,19.857 18,24.098 18,26 21,26 21,23 23,23 23,26 26,26 26,24.098 "/>
+</g>
</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_work.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_work.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,101 +1,105 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
-<path d="M26,8v-2h-1.586l-5-5h-14.41v5h-1v2c-1.654,0-3,1.346-3,3v8c0,1.654,1.346,3,3,3v3h1v4h20v-4h1v-3c1.654,0,3-1.346,3-3v-8c0-1.654-1.35-3-3-3z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="7" y2="10">
-<stop offset="0" stop-color="#808080"/>
-<stop offset="1" stop-color="#636363"/>
+<rect fill="none" height="30" width="30"/>
+<g>
+<path d="M26,8.001v-2h-1.586l-5-5H5v5H4v2c-1.654,0-3,1.346-3,3v8c0,1.653,1.346,3,3,3 v3h1v4h20v-4h1v-3c1.654,0,3-1.347,3-3v-8C29,9.347,27.654,8.001,26,8.001z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="297.4795" x2="297.4795" y1="-382.0205" y2="-385.0205">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="1" style="stop-color:#636363"/>
</linearGradient>
-<rect fill="url(#SVGID_1_)" height="3" width="20" x="5" y="7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="21" y2="24">
-<stop offset="0" stop-color="#808080"/>
-<stop offset="1" stop-color="#636363"/>
+<rect fill="url(#SVGID_1_)" height="3" width="20" x="5" y="7.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="297.4795" x2="297.4795" y1="-396.0205" y2="-399.0205">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="1" style="stop-color:#636363"/>
</linearGradient>
-<rect fill="url(#SVGID_2_)" height="3" width="20" x="5" y="21"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15" x2="15" y1="2.002" y2="28.06">
-<stop offset="0" stop-color="#EDEDED"/>
-<stop offset="1" stop-color="#BDBDBD"/>
+<rect fill="url(#SVGID_2_)" height="3" width="20" x="5" y="21.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="297.4795" x2="297.4795" y1="-377.0225" y2="-403.0858">
+<stop offset="0" style="stop-color:#EDEDED"/>
+<stop offset="1" style="stop-color:#BDBDBD"/>
</linearGradient>
-<rect fill="url(#SVGID_3_)" height="10" width="18" x="6" y="18"/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="2" x="8" y="23.5"/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="11" x="11" y="23.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15" x2="15" y1="2" y2="28.07">
-<stop offset="0" stop-color="#EDEDED"/>
-<stop offset="1" stop-color="#BDBDBD"/>
+<rect fill="url(#SVGID_3_)" height="10" width="18" x="6" y="18.001"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="2" x="8" y="23.501"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="11.001" x="10.999" y="23.501"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="297.4795" x2="297.4795" y1="-377.0205" y2="-403.0858">
+<stop offset="0" style="stop-color:#EDEDED"/>
+<stop offset="1" style="stop-color:#BDBDBD"/>
</linearGradient>
-<polygon fill="url(#SVGID_4_)" points="24,7,24,19,6,19,6,2,19,2"/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="2" x="8" y="5"/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="11" x="11" y="5"/>
-<polygon fill="#FFFFFF" points="19,7,24,7,19,2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15" x2="15" y1="9.115" y2="21.01">
-<stop offset="0" stop-color="#E6E6E6"/>
-<stop offset="1" stop-color="#626262"/>
+<polygon fill="url(#SVGID_4_)" points="24,7.001 24,19.001 6,19.001 6,2.001 19,2.001 "/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="2" x="8" y="5.001"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="11" x="11" y="5.001"/>
+<polygon fill="#FFFFFF" points="19,7.001 24,7.001 19,2.001 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="297.4795" x2="297.4795" y1="-384.1367" y2="-396.0269">
+<stop offset="0" style="stop-color:#E6E6E6"/>
+<stop offset="1" style="stop-color:#626262"/>
</linearGradient>
-<path d="M28,19c0,1.1-0.9,2-2,2h-22c-1.1,0-2-0.9-2-2v-8c0-1.1,0.9-2,2-2h22c1.1,0,2,0.9,2,2v8z" fill="url(#SVGID_5_)"/>
-<path d="M26,9h-22c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h22c1.1,0,2,0.9,2,2v-1c0-1.1-0.9-2-2-2z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15.5" x2="15.5" y1="11" y2="20.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<path d="M28,19.001c0,1.101-0.9,2-2,2H4c-1.1,0-2-0.899-2-2v-8c0-1.1,0.9-2,2-2h22c1.1,0,2,0.9,2,2V19.001z" fill="url(#SVGID_5_)"/>
+<path d="M26,9.001H4c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h22 c1.1,0,2,0.9,2,2v-1C28,9.901,27.1,9.001,26,9.001z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="297.9795" x2="297.9795" y1="-386.0205" y2="-396.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_6_)" height="2" width="3" x="14" y="11"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="19.5" x2="19.5" y1="11" y2="20.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<rect fill="url(#SVGID_6_)" height="2" width="3" x="14" y="11.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="301.9795" x2="301.9795" y1="-386.0205" y2="-396.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_7_)" height="2" width="3" x="18" y="11"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="23.5" x2="23.5" y1="11" y2="20.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<rect fill="url(#SVGID_7_)" height="2" width="3" x="18" y="11.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="305.9795" x2="305.9795" y1="-386.0205" y2="-396.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_8_)" height="2" width="3" x="22" y="11"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="15.5" x2="15.5" y1="10" y2="19.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<rect fill="url(#SVGID_8_)" height="2" width="3" x="22" y="11.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="297.9795" x2="297.9795" y1="-385.0205" y2="-395.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_9_)" height="2" width="3" x="14" y="14"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="19.5" x2="19.5" y1="10" y2="19.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<rect fill="url(#SVGID_9_)" height="2" width="3" x="14" y="14.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="301.9795" x2="301.9795" y1="-385.0205" y2="-395.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_10_)" height="2" width="3" x="18" y="14"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="23.5" x2="23.5" y1="10" y2="19.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<rect fill="url(#SVGID_10_)" height="2" width="3" x="18" y="14.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="305.9795" x2="305.9795" y1="-385.0205" y2="-395.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_11_)" height="2" width="3" x="22" y="14"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="15.5" x2="15.5" y1="9" y2="18.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<rect fill="url(#SVGID_11_)" height="2" width="3" x="22" y="14.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="297.9795" x2="297.9795" y1="-384.0205" y2="-394.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_12_)" height="2" width="3" x="14" y="17"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="19.5" x2="19.5" y1="9" y2="18.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<rect fill="url(#SVGID_12_)" height="2" width="3" x="14" y="17.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="301.9795" x2="301.9795" y1="-384.0205" y2="-394.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_13_)" height="2" width="3" x="18" y="17"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="23.5" x2="23.5" y1="9" y2="18.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<rect fill="url(#SVGID_13_)" height="2" width="3" x="18" y="17.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="305.9795" x2="305.9795" y1="-384.0205" y2="-394.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_14_)" height="2" width="3" x="22" y="17"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="8" x2="8" y1="11.19" y2="14.06">
-<stop offset="0" stop-color="#30BCE8"/>
-<stop offset="1" stop-color="#048CC6"/>
+<rect fill="url(#SVGID_14_)" height="2" width="3" x="22" y="17.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="290.4795" x2="290.4795" y1="-386.209" y2="-389.0847">
+<stop offset="0" style="stop-color:#30BCE8"/>
+<stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
-<rect fill="url(#SVGID_15_)" height="3" width="8" x="4" y="11"/>
-<rect fill-opacity="0.4" height="1" stroke-opacity="0.4" width="20" x="5" y="8"/>
-<rect fill-opacity="0.4" height="1" stroke-opacity="0.4" width="20" x="5" y="21"/>
-<rect fill="none" height="30" width="30"/>
-<path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8,8,3.589,8,8-3.59,8-8,8z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="22" x2="22" y1="14.97" y2="29.16">
-<stop offset="0" stop-color="#4EDEFF"/>
-<stop offset="1" stop-color="#048CC6"/>
+<rect fill="url(#SVGID_15_)" height="3" width="8" x="4" y="11.001"/>
+<rect fill-opacity="0.4" height="1" stroke-opacity="0.4" width="20" x="5" y="8.001"/>
+<rect fill-opacity="0.4" height="1" stroke-opacity="0.4" width="20" x="5" y="21.001"/>
+<path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S26.411,30,22,30L22,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="304.4795" x2="304.4795" y1="-390.0195" y2="-404.0195">
+<stop offset="0" style="stop-color:#A0A7A8"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
<circle cx="22" cy="22" fill="url(#SVGID_16_)" r="7"/>
-<path d="M23,21v-2h-5v8h8v-6h-3zm-1,4h-3v-1h3v1zm0-2h-3v-1h3v1zm-3-2v-1h3v1h-3zm6,4h-2v-1h2v1zm0-2h-2v-1h2v1z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M22,16c3.697,0,6.717,2.869,6.975,6.5,0.01-0.17,0.02-0.33,0.02-0.5,0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5,0.26-3.63,3.28-6.5,6.98-6.5z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M23,20v-2h-5v8h8v-6h-3zm-1,4h-3v-1h3v1zm0-2h-3v-1h3v1zm-3-2v-1h3v1h-3zm6,4h-2v-1h2v1zm0-2h-2v-1h2v1z" fill="#FFFFFF"/>
-<rect fill-opacity="0.3" height="6" stroke-opacity="0.3" width="1" x="23" y="20"/>
+<path d="M22,16c3.697,0,6.717,2.869,6.975,6.5 C28.986,22.334,29,22.169,29,22c0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C15.283,18.869,18.303,16,22,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<polygon fill="#FFFFFF" points="24,19 24,20 26,20 26,21 24,21 24,22 26,22 26,23 24,23 24,26 27,26 27,19 "/>
+<path d="M17,19v7h2v-2h2v2h2v-9L17,19z M19,23h-1v-1h1V23z M19,21h-1v-1h1V21z M22,23h-1v-1h1V23z M22,21h-1v-1h1 V21z" fill="#FFFFFF"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="2" x="17" y="26"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="6" x="21" y="26"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="2" x="19" y="24"/>
+</g>
</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_flash.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_flash.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<path d="M15,29C7.281,29,1,22.72,1,15S7.281,1,15,1c7.72,0,14,6.28,14,14S22.72,29,15,29L15,29z" fill-opacity="0.6" stroke-opacity="0.6"/>
<radialGradient cx="-2686.7461" cy="511.4414" gradientTransform="matrix(2.2479 0 0 -2.2479 6054.5376 1164.6696)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="5.7832">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_folder.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_folder.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<polygon fill-opacity="0.6" points="1,27 1,3 14,3 14,6 29,6 29,27 " stroke-opacity="0.6"/>
<polygon fill="#FEAB29" points="13,7 13,4 2,4 2,26 28,26 28,7 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_follow_up.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_follow_up.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M26.618,6.5H21.25c-0.896,0-1.607-0.439-2.508-0.996C17.602,4.799,16.309,4,14.375,4H11V1H4v4h1v24h5 V18.5h4.375c1.366,0,2.313,0.585,3.315,1.205C18.721,20.342,19.785,21,21.25,21h5.368l-3.625-7.25L26.618,6.5z" fill-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_forward.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_forward.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<polygon fill-opacity="0.6" points="15,20 1,20 1,10 15,10 15,2.865 29.563,15 15,27.135 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_gprs.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_gprs.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15,29C7.279,29,1,22.719,1,15C1,7.279,7.279,1,15,1c7.719,0,14,6.279,14,14C29,22.719,22.719,29,15,29 L15,29z" fill-opacity="0.6"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_home.svg Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<g>
+<path d="M0,30V0h30v30H0z M23.599,26.25l-8.732-8.732L6.134,26.25H23.599z M26.25,23.599V6.134l-8.732,8.732 L26.25,23.599z M3.75,23.331l8.465-8.465L3.75,6.401V23.331z M14.866,12.215L23.33,3.75H6.402L14.866,12.215z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="0.9941" y2="29.1902">
+<stop offset="0" style="stop-color:#E6E6E6"/>
+<stop offset="0.6182" style="stop-color:#A8A8A8"/>
+<stop offset="1" style="stop-color:#CCCCCC"/>
+</linearGradient>
+<path d="M0.938,0.938v28.125h28.125V0.938H0.938z M13.541,14.866L2.813,25.595V4.138L13.541,14.866z M4.139,2.813h21.455L14.866,13.541L4.139,2.813z M14.866,16.192l10.995,10.995H3.871L14.866,16.192z M16.192,14.866L27.188,3.871 v21.99L16.192,14.866z" fill="url(#SVGID_1_)"/>
+<g>
+<polygon fill-opacity="0.6" points="8.547,25.313 7.61,17.813 5.625,17.813 5.625,12.199 24.375,12.199 24.375,17.813 22.391,17.813 21.453,25.313 " stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="12.103" y2="23.9943">
+<stop offset="0" style="stop-color:#A0F800"/>
+<stop offset="1" style="stop-color:#319E00"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2_)" points="6.563,13.137 6.563,16.875 8.438,16.875 9.375,24.375 20.625,24.375 21.563,16.875 23.438,16.875 23.438,13.137 "/>
+<path d="M13.125,14.063v-2.886c-0.348,0.048-0.692,0.073-1.03,0.073c-0.804,0-1.568-0.139-2.272-0.414 C5.866,9.294,5.955,6.329,5.96,6.204l0.019-0.408l0.312-0.265c0.103-0.088,1.06-0.855,2.881-0.855c0.958,0,1.99,0.212,3.066,0.632 c1.3,0.506,2.174,1.126,2.762,1.716c0.588-0.589,1.462-1.209,2.762-1.716c1.076-0.42,2.108-0.632,3.066-0.632 c1.82,0,2.777,0.767,2.881,0.855l0.313,0.265l0.019,0.408c0.005,0.125,0.094,3.091-3.862,4.632 c-0.704,0.275-1.469,0.414-2.272,0.414c-0.338,0-0.683-0.025-1.03-0.073v2.886H13.125z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M10.163,9.963c1.436,0.559,2.896,0.346,3.899,0.057v3.105h1.875V10.02 c1.003,0.289,2.464,0.502,3.899-0.057c3.375-1.316,3.267-3.717,3.267-3.717s-1.627-1.379-5.002-0.064 C16.242,6.907,15.392,7.849,15,8.551c-0.392-0.702-1.242-1.644-3.102-2.369C8.523,4.866,6.896,6.246,6.896,6.246 S6.788,8.647,10.163,9.963z" fill="url(#SVGID_3_)"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="4.9224" y2="12.8702">
+<stop offset="0" style="stop-color:#A0F800"/>
+<stop offset="1" style="stop-color:#319E00"/>
+</linearGradient>
+</defs>
+</g>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.9995" x2="14.9995" y1="12.5542" y2="17.3683">
+<stop offset="0" style="stop-color:#D07100"/>
+<stop offset="1" style="stop-color:#A23600"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" height="3.738" width="16.875" x="6.563" y="13.137"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9995" x2="14.9995" y1="16.8408" y2="24.5597">
+<stop offset="0" style="stop-color:#D07100"/>
+<stop offset="1" style="stop-color:#A23600"/>
+</linearGradient>
+<polygon fill="url(#SVGID_5_)" points="20.625,24.375 9.375,24.375 8.438,16.875 21.563,16.875 "/>
+<path d="M23.104,6.246c0,0-1.627-1.379-5.002-0.064C16.242,6.907,15.392,7.849,15,8.551 c-0.392-0.702-1.242-1.644-3.102-2.369C8.523,4.866,6.896,6.246,6.896,6.246s-0.109,2.401,3.267,3.717 c1.436,0.559,2.896,0.346,3.899,0.057v3.105h1.875V10.02c1.003,0.289,2.464,0.502,3.899-0.057 C23.212,8.647,23.104,6.246,23.104,6.246z" fill="url(#SVGID_3_)"/>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<path d="M14.063,9.082c-1.003,0.289-2.464,0.502-3.899-0.057C8.06,8.205,7.31,6.963,7.042,6.144 c-0.094,0.06-0.146,0.102-0.146,0.102s-0.109,2.401,3.267,3.717c1.436,0.559,2.896,0.346,3.899,0.057V9.082z"/>
+<path d="M22.958,6.144c-0.268,0.819-1.018,2.061-3.121,2.881c-1.436,0.559-2.896,0.346-3.899,0.057v0.938 c1.003,0.289,2.464,0.502,3.899-0.057c3.375-1.316,3.267-3.717,3.267-3.717S23.052,6.204,22.958,6.144z"/>
+<rect height="0.938" width="1.875" x="14.063" y="12.188"/>
+</g>
+<rect fill="#FFFFFF" fill-opacity="0.3" height="0.926" stroke-opacity="0.3" width="16.875" x="6.563" y="13.137"/>
+<polygon fill-opacity="0.2" points="21.445,17.813 21.563,16.875 8.438,16.875 8.555,17.813 " stroke-opacity="0.2"/>
+</g>
+</g>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_homescreen.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_homescreen.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2.5088" y2="28.7349">
<stop offset="0" style="stop-color:#A5A7AA"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_offline.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_offline.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15,29C7.279,29,1,22.719,1,15C1,7.279,7.279,1,15,1c7.719,0,14,6.279,14,14C29,22.719,22.719,29,15,29 L15,29z" fill-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_widget.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_widget.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<path d="M4.63,28.028c-0.878,0-1.593-0.714-1.593-1.592v-8.962c0-0.878,0.714-1.593,1.593-1.593h8.962 c0.878,0,1.592,0.715,1.592,1.593v8.962c0,0.877-0.714,1.592-1.592,1.592H4.63z" fill-opacity="0.6"/>
<path d="M17.167,28.028c-0.878,0-1.592-0.714-1.592-1.592v-8.961c0-0.878,0.714-1.593,1.592-1.593h8.963 c0.878,0,1.592,0.714,1.592,1.593v8.961c0,0.877-0.714,1.592-1.592,1.592H17.167z" fill-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_html.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_html.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<polygon fill-opacity="0.6" points="27,29 27,1 3,1 3,22.414 9.586,29 " stroke-opacity="0.6"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1444 0)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1459" x2="-1459" y1="2" y2="28.0005">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hwr.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hwr.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g fill-opacity="0.6" stroke-opacity="0.6">
<path d="M4,29c-1.65,0-3-1.35-3-3V4c0-1.65,1.35-3,3-3h22c1.65,0,3,1.35,3,3v22c0,1.65-1.35,3-3,3H4z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_image.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_image.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill-opacity="0.6" height="24" stroke-opacity="0.6" width="30" y="3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="4" y2="26">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_internet.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_internet.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15,29C7.28,29,1,22.72,1,15S7.28,1,15,1s14,6.28,14,14S22.72,29,15,29L15,29z" fill-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_intranet.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_intranet.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M13,29v-2.173c-0.742-0.125-1.47-0.321-2.18-0.587l-1.088,1.885l-3.465-2l1.088-1.885 c-0.581-0.481-1.115-1.015-1.596-1.596l-1.885,1.088l-2-3.465L3.76,19.18C3.495,18.47,3.298,17.741,3.172,17H1v-4h2.172 c0.126-0.741,0.322-1.47,0.587-2.18L1.876,9.732l2-3.465L5.76,7.355C6.241,6.774,6.775,6.241,7.356,5.76L6.268,3.875l3.465-2 L10.82,3.76C11.53,3.494,12.258,3.298,13,3.173V1h4v2.173c0.742,0.125,1.471,0.321,2.18,0.587l1.088-1.885l3.465,2L22.645,5.76 c0.58,0.481,1.114,1.015,1.596,1.596l1.885-1.088l1.999,3.465L26.24,10.82c0.266,0.71,0.461,1.438,0.588,2.18H29v4h-2.172 c-0.127,0.741-0.322,1.47-0.588,2.18l1.884,1.088l-1.999,3.465l-1.885-1.088c-0.481,0.581-1.016,1.114-1.596,1.596l1.088,1.885 l-3.465,2L19.18,26.24c-0.709,0.266-1.438,0.462-2.18,0.587V29H13z" fill-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_itut.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_itut.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M3.5,25.5c-1.65,0-3.001-1.35-3.001-3v-15c0-1.65,1.351-3,3.001-3h23 c1.65,0,3,1.35,3,3v15c0,1.65-1.35,3-3,3H3.5z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_java.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_java.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15.781,24v-3.441l0.494-0.29C17.316,19.659,18,19.209,18,18.548C18,17.137,16.358,16,15,16 c-1.359,0-3,1.137-3,2.548c0,0.666,0.684,1.114,1.728,1.722l0.497,0.289V24H11c-1.654,0-3-1.346-3-3H7.937 c-0.597,0.972-1.407,2-2.832,2C2.686,23,1,20.629,1,18.5S2.686,14,5.104,14c1.438,0,2.249,1.052,2.83,2H8v-4c0-1.654,1.346-3,3-3h1 V8.937c-0.971-0.597-2-1.406-2-2.832C10,3.686,12.371,2,14.5,2S19,3.686,19,6.104c0,1.438-1.051,2.249-2,2.83V9h7 c1.654,0,3,1.346,3,3v9c0,1.654-1.346,3-3,3H15.781z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_keyboard.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_keyboard.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<path d="M3.5,25c-1.65,0-3-1.35-3-3V7c0-1.65,1.35-3,3-3h23c1.65,0,3,1.35,3,3v15 c0,1.65-1.35,3-3,3H3.5z" fill-opacity="0.6" stroke-opacity="0.6"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-187.52" x2="-187.52" y1="403.9805" y2="384.9805">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M25,7H11.858c-0.447-1.721-2-3-3.858-3C6.085,4,4.483,5.354,4.094,7.155C2.884,7.542,2,8.664,2,10v13 c0,1.654,1.346,3,3,3h20c1.654,0,3-1.346,3-3V10C28,8.346,26.654,7,25,7z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_home.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_home.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,60 +1,86 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
-<path d="M25,7h-13.14c-0.447-1.721-1.999-3-3.857-3-1.915,0-3.518,1.354-3.906,3.155-1.21,0.387-2.094,1.509-2.094,2.845v13c0,1.654,1.346,3,3,3h20c1.654,0,3-1.346,3-3v-13c0-1.654-1.35-3-3-3z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="8.16" y2="25.01">
-<stop offset="0" stop-color="#E6E6E6"/>
-<stop offset="1" stop-color="#626262"/>
+<g>
+<path d="M25,7.002H11.857c-0.447-1.721-1.999-3-3.857-3 c-1.915,0-3.518,1.354-3.906,3.155C2.884,7.544,2,8.666,2,10.002v13c0,1.654,1.346,3,3,3h20c1.654,0,3-1.346,3-3v-13 C28,8.348,26.654,7.002,25,7.002z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="297.4795" x2="297.4795" y1="-383.1855" y2="-400.0298">
+<stop offset="0" style="stop-color:#E6E6E6"/>
+<stop offset="1" style="stop-color:#626262"/>
</linearGradient>
-<path d="M27,23c0,1.1-0.9,2-2,2h-20c-1.1,0-2-0.9-2-2v-13c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2v13z" fill="url(#SVGID_1)"/>
-<path d="M25,8h-20c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2v-1c0-1.1-0.9-2-2-2z" fill="#FFFFFF" fill-opacity="0.4"/>
-<path d="M8,24c2.205,0,4-1.794,4-4v-12h-8v12c0,2.21,1.795,4,4,4z" fill-opacity="0.1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="8" x2="8" y1="5.17" y2="23.01">
-<stop offset="0" stop-color="#A0A7A8"/>
-<stop offset="1" stop-color="#252629"/>
+<path d="M27,23.002c0,1.1-0.9,2-2,2H5c-1.1,0-2-0.9-2-2v-13c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V23.002z" fill="url(#SVGID_1_)"/>
+<path d="M25,8.002H5c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h20 c1.1,0,2,0.9,2,2v-1C27,8.902,26.1,8.002,25,8.002z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M8,24.002c2.205,0,4-1.794,4-4v-12H4v12C4,22.208,5.795,24.002,8,24.002z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="290.4795" x2="290.4795" y1="-380.1953" y2="-398.0303">
+<stop offset="0" style="stop-color:#A0A7A8"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<path d="M11,20c0,1.65-1.35,3-3,3s-3-1.35-3-3v-12c0-1.65,1.35-3,3-3s3,1.35,3,3v12z" fill="url(#SVGID_2)"/>
-<path d="M8,5c-1.65,0-3,1.35-3,3v1c0-1.65,1.35-3,3-3s3,1.35,3,3v-1c0-1.65-1.35-3-3-3z" fill="#FFFFFF" fill-opacity="0.3"/>
-<path d="M10,11v11.22c0.609-0.55,1-1.337,1-2.217v-11l-1,2z" fill-opacity="0.3"/>
-<path d="M6,22.22v-11.22l-1-2v11c0,0.88,0.391,1.67,1,2.22z" fill-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="14.5" x2="14.5" y1="14" y2="23.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<path d="M11,20.002c0,1.65-1.35,3-3,3l0,0c-1.65,0-3-1.35-3-3v-12c0-1.65,1.35-3,3-3l0,0c1.65,0,3,1.35,3,3 V20.002z" fill="url(#SVGID_2_)"/>
+<path d="M8,5.002c-1.65,0-3,1.35-3,3v1c0-1.65,1.35-3,3-3s3,1.35,3,3v-1 C11,6.352,9.65,5.002,8,5.002z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M10,11.002v11.217c0.609-0.55,1-1.337,1-2.217v-11L10,11.002z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M6,22.219V11.002l-1-2v11C5,20.882,5.391,21.669,6,22.219z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="296.9795" x2="296.9795" y1="-389.0215" y2="-399.0012">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_3)" height="2" width="3" x="13" y="14"/>
-<rect fill="url(#SVGID_3)" height="2" width="3" x="17" y="14"/>
-<rect fill="url(#SVGID_3)" height="2" width="3" x="21" y="14"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="14.5" x2="14.5" y1="13" y2="22.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<rect fill="url(#SVGID_3_)" height="2" width="3" x="13" y="14.002"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="300.9795" x2="300.9795" y1="-389.0215" y2="-399.0012">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" height="2" width="3" x="17" y="14.002"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="304.9795" x2="304.9795" y1="-389.0215" y2="-399.0012">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
+</linearGradient>
+<rect fill="url(#SVGID_5_)" height="2" width="3" x="21" y="14.002"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="296.9795" x2="296.9795" y1="-388.0215" y2="-398.0013">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_6)" height="2" width="3" x="13" y="17"/>
-<rect fill="url(#SVGID_6)" height="2" width="3" x="17" y="17"/>
-<rect fill="url(#SVGID_6)" height="2" width="3" x="21" y="17"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="14.5" x2="14.5" y1="12" y2="21.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<rect fill="url(#SVGID_6_)" height="2" width="3" x="13" y="17.002"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="300.9795" x2="300.9795" y1="-388.0215" y2="-398.0013">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
+</linearGradient>
+<rect fill="url(#SVGID_7_)" height="2" width="3" x="17" y="17.002"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="304.9795" x2="304.9795" y1="-388.0215" y2="-398.0013">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
+</linearGradient>
+<rect fill="url(#SVGID_8_)" height="2" width="3" x="21" y="17.002"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="296.9795" x2="296.9795" y1="-387.0215" y2="-397.0013">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
+</linearGradient>
+<rect fill="url(#SVGID_9_)" height="2" width="3" x="13" y="20.002"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="300.9795" x2="300.9795" y1="-387.0215" y2="-397.0013">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_9)" height="2" width="3" x="13" y="20"/>
-<rect fill="url(#SVGID_9)" height="2" width="3" x="17" y="20"/>
-<rect fill="url(#SVGID_9)" height="2" width="3" x="21" y="20"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="18.5" x2="18.5" y1="10.19" y2="13.06">
-<stop offset="0" stop-color="#30BCE8"/>
-<stop offset="1" stop-color="#048CC6"/>
+<rect fill="url(#SVGID_10_)" height="2" width="3" x="17" y="20.002"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="304.9795" x2="304.9795" y1="-387.0215" y2="-397.0013">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
+</linearGradient>
+<rect fill="url(#SVGID_11_)" height="2" width="3" x="21" y="20.002"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="300.9795" x2="300.9795" y1="-385.21" y2="-388.0856">
+<stop offset="0" style="stop-color:#30BCE8"/>
+<stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
-<rect fill="url(#SVGID_12)" height="3" width="11" x="13" y="10"/>
-<path d="M21,30c-4.411,0-8-3.589-8-8s3.589-8,8-8,8,3.589,8,8-3.59,8-8,8z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="21" x2="21" y1="14.97" y2="29.16">
-<stop offset="0" stop-color="#4EDEFF"/>
-<stop offset="1" stop-color="#048CC6"/>
+<rect fill="url(#SVGID_12_)" height="3" width="11" x="13" y="10.002"/>
+<path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S26.411,30,22,30L22,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="304.4795" x2="304.4795" y1="-389.9883" y2="-404.1846">
+<stop offset="0" style="stop-color:#FFC144"/>
+<stop offset="1" style="stop-color:#EF6902"/>
</linearGradient>
-<circle cx="21" cy="22" fill="url(#SVGID_13)" r="7"/>
-<polygon fill-opacity="0.2" points="25.34,24,21,19.4,16.66,24,16,23.3,21,18,26,23.3,25.34,24"/>
-<polygon fill-opacity="0.2" points="21,20.86,17,25.1,17,27,20,27,20,24,22,24,22,27,25,27,25,25.1"/>
-<path d="M21,16c3.697,0,6.717,2.869,6.975,6.5,0.01-0.17,0.02-0.33,0.02-0.5,0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5,0.26-3.63,3.28-6.5,6.98-6.5z" fill="#FFFFFF" fill-opacity="0.4"/>
-<polygon fill="#FFFFFF" points="25.34,23,21,18.4,16.66,23,16,22.3,21,17,26,22.3,25.34,23"/>
-<polygon fill="#FFFFFF" points="21,19.86,17,24.1,17,26,20,26,20,23,22,23,22,26,25,26,25,24.1"/>
+<circle cx="22" cy="22" fill="url(#SVGID_13_)" r="7"/>
+<polygon fill-opacity="0.2" points="26.34,24 21.999,19.4 17.66,24 17,23.3 21.999,18 27,23.3 " stroke-opacity="0.2"/>
+<polygon fill-opacity="0.2" points="21.999,20.857 18,25.098 18,27 21,27 21,24 23,24 23,27 26,27 26,25.098 " stroke-opacity="0.2"/>
+<path d="M22,16c3.697,0,6.717,2.869,6.975,6.5 C28.986,22.334,29,22.169,29,22c0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C15.283,18.869,18.303,16,22,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<polygon fill="#FFFFFF" points="26.34,23 21.999,18.4 17.66,23 17,22.3 21.999,17 27,22.3 "/>
+<polygon fill="#FFFFFF" points="21.999,19.857 18,24.098 18,26 21,26 21,23 23,23 23,26 26,26 26,24.098 "/>
+</g>
</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_work.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_work.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,59 +1,87 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
-<path d="M25,7h-13.14c-0.447-1.721-1.999-3-3.857-3-1.915,0-3.518,1.354-3.906,3.155-1.21,0.387-2.094,1.509-2.094,2.845v13c0,1.654,1.346,3,3,3h20c1.654,0,3-1.346,3-3v-13c0-1.654-1.35-3-3-3z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="8.16" y2="25.01">
-<stop offset="0" stop-color="#E6E6E6"/>
-<stop offset="1" stop-color="#626262"/>
+<g>
+<path d="M25,7.001H11.857c-0.447-1.721-1.999-3-3.857-3 c-1.915,0-3.518,1.354-3.906,3.155C2.884,7.543,2,8.665,2,10.001v13c0,1.653,1.346,3,3,3h20c1.654,0,3-1.347,3-3v-13 C28,8.347,26.654,7.001,25,7.001z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="297.4795" x2="297.4795" y1="-383.1855" y2="-400.0296">
+<stop offset="0" style="stop-color:#E6E6E6"/>
+<stop offset="1" style="stop-color:#626262"/>
+</linearGradient>
+<path d="M27,23.001c0,1.101-0.9,2-2,2H5c-1.1,0-2-0.899-2-2v-13c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V23.001z " fill="url(#SVGID_1_)"/>
+<path d="M25,8.001H5c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h20 c1.1,0,2,0.9,2,2v-1C27,8.901,26.1,8.001,25,8.001z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M8,24.001c2.205,0,4-1.794,4-4v-12H4v12C4,22.207,5.795,24.001,8,24.001z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="290.4795" x2="290.4795" y1="-380.1943" y2="-398.0293">
+<stop offset="0" style="stop-color:#A0A7A8"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<path d="M27,23c0,1.1-0.9,2-2,2h-20c-1.1,0-2-0.9-2-2v-13c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2v13z" fill="url(#SVGID_1)"/>
-<path d="M25,8h-20c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2v-1c0-1.1-0.9-2-2-2z" fill="#FFFFFF" fill-opacity="0.4"/>
-<path d="M8,24c2.205,0,4-1.794,4-4v-12h-8v12c0,2.21,1.795,4,4,4z" fill-opacity="0.1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="8" x2="8" y1="5.17" y2="23.01">
-<stop offset="0" stop-color="#A0A7A8"/>
-<stop offset="1" stop-color="#252629"/>
+<path d="M11,20.001c0,1.649-1.35,3-3,3l0,0c-1.65,0-3-1.351-3-3v-12c0-1.65,1.35-3,3-3l0,0 c1.65,0,3,1.35,3,3V20.001z" fill="url(#SVGID_2_)"/>
+<path d="M8,5.001c-1.65,0-3,1.35-3,3v1c0-1.65,1.35-3,3-3s3,1.35,3,3v-1 C11,6.351,9.65,5.001,8,5.001z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M10,11.001v11.217c0.609-0.55,1-1.337,1-2.217v-11L10,11.001z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M6,22.218V11.001l-1-2v11C5,20.881,5.391,21.668,6,22.218z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="296.9795" x2="296.9795" y1="-389.0205" y2="-399.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<path d="M11,20c0,1.65-1.35,3-3,3s-3-1.35-3-3v-12c0-1.65,1.35-3,3-3s3,1.35,3,3v12z" fill="url(#SVGID_2)"/>
-<path d="M8,5c-1.65,0-3,1.35-3,3v1c0-1.65,1.35-3,3-3s3,1.35,3,3v-1c0-1.65-1.35-3-3-3z" fill="#FFFFFF" fill-opacity="0.3"/>
-<path d="M10,11v11.22c0.609-0.55,1-1.337,1-2.217v-11l-1,2z" fill-opacity="0.3"/>
-<path d="M6,22.22v-11.22l-1-2v11c0,0.88,0.391,1.67,1,2.22z" fill-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="14.5" x2="14.5" y1="14" y2="23.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<rect fill="url(#SVGID_3_)" height="2" width="3" x="13" y="14.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="300.9795" x2="300.9795" y1="-389.0205" y2="-399.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" height="2" width="3" x="17" y="14.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="304.9795" x2="304.9795" y1="-389.0205" y2="-399.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
+</linearGradient>
+<rect fill="url(#SVGID_5_)" height="2" width="3" x="21" y="14.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="296.9795" x2="296.9795" y1="-388.0205" y2="-398.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_3)" height="2" width="3" x="13" y="14"/>
-<rect fill="url(#SVGID_3)" height="2" width="3" x="17" y="14"/>
-<rect fill="url(#SVGID_3)" height="2" width="3" x="21" y="14"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="14.5" x2="14.5" y1="13" y2="22.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<rect fill="url(#SVGID_6_)" height="2" width="3" x="13" y="17.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="300.9795" x2="300.9795" y1="-388.0205" y2="-398.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
+</linearGradient>
+<rect fill="url(#SVGID_7_)" height="2" width="3" x="17" y="17.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="304.9795" x2="304.9795" y1="-388.0205" y2="-398.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_6)" height="2" width="3" x="13" y="17"/>
-<rect fill="url(#SVGID_6)" height="2" width="3" x="17" y="17"/>
-<rect fill="url(#SVGID_6)" height="2" width="3" x="21" y="17"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="14.5" x2="14.5" y1="12" y2="21.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<rect fill="url(#SVGID_8_)" height="2" width="3" x="21" y="17.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="296.9795" x2="296.9795" y1="-387.0205" y2="-397.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
+</linearGradient>
+<rect fill="url(#SVGID_9_)" height="2" width="3" x="13" y="20.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="300.9795" x2="300.9795" y1="-387.0205" y2="-397.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_9)" height="2" width="3" x="13" y="20"/>
-<rect fill="url(#SVGID_9)" height="2" width="3" x="17" y="20"/>
-<rect fill="url(#SVGID_9)" height="2" width="3" x="21" y="20"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="18.5" x2="18.5" y1="10.19" y2="13.06">
-<stop offset="0" stop-color="#30BCE8"/>
-<stop offset="1" stop-color="#048CC6"/>
+<rect fill="url(#SVGID_10_)" height="2" width="3" x="17" y="20.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="304.9795" x2="304.9795" y1="-387.0205" y2="-397.0002">
+<stop offset="0" style="stop-color:#696D6F"/>
+<stop offset="1" style="stop-color:#252629"/>
+</linearGradient>
+<rect fill="url(#SVGID_11_)" height="2" width="3" x="21" y="20.001"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="300.9795" x2="300.9795" y1="-385.209" y2="-388.0847">
+<stop offset="0" style="stop-color:#30BCE8"/>
+<stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
-<rect fill="url(#SVGID_12)" height="3" width="11" x="13" y="10"/>
-<path d="M21,30c-4.411,0-8-3.589-8-8s3.589-8,8-8,8,3.589,8,8-3.59,8-8,8z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="21" x2="21" y1="14.97" y2="29.16">
-<stop offset="0" stop-color="#4EDEFF"/>
-<stop offset="1" stop-color="#048CC6"/>
+<rect fill="url(#SVGID_12_)" height="3" width="11" x="13" y="10.001"/>
+<path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S26.411,30,22,30L22,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="304.4795" x2="304.4795" y1="-390.0195" y2="-404.0195">
+<stop offset="0" style="stop-color:#A0A7A8"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<circle cx="21" cy="22" fill="url(#SVGID_13)" r="7"/>
-<path d="M22,21v-2h-5v8h8v-6h-3zm-1,4h-3v-1h3v1zm0-2h-3v-1h3v1zm-3-2v-1h3v1h-3zm6,4h-2v-1h2v1zm0-2h-2v-1h2v1z" fill-opacity="0.2"/>
-<path d="M21,16c3.697,0,6.717,2.869,6.975,6.5,0.01-0.17,0.02-0.33,0.02-0.5,0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5,0.26-3.63,3.28-6.5,6.98-6.5z" fill="#FFFFFF" fill-opacity="0.4"/>
-<path d="M22,20v-2h-5v8h8v-6h-3zm-1,4h-3v-1h3v1zm0-2h-3v-1h3v1zm-3-2v-1h3v1h-3zm6,4h-2v-1h2v1zm0-2h-2v-1h2v1z" fill="#FFFFFF"/>
-<rect fill-opacity="0.3" height="6" width="1" x="22" y="20"/>
+<circle cx="22" cy="22" fill="url(#SVGID_13_)" r="7"/>
+<path d="M22,16c3.697,0,6.717,2.869,6.975,6.5 C28.986,22.334,29,22.169,29,22c0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C15.283,18.869,18.303,16,22,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<polygon fill="#FFFFFF" points="24,19 24,20 26,20 26,21 24,21 24,22 26,22 26,23 24,23 24,26 27,26 27,19 "/>
+<path d="M17,19v7h2v-2h2v2h2v-9L17,19z M19,23h-1v-1h1V23z M19,21h-1v-1h1V21z M22,23h-1v-1h1V23z M22,21h-1v-1h1 V21z" fill="#FFFFFF"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="2" x="17" y="26"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="6" x="21" y="26"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="2" x="19" y="24"/>
+</g>
</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_link.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_link.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15,29C7.279,29,1,22.719,1,15C1,7.279,7.279,1,15,1c7.719,0,14,6.279,14,14C29,22.719,22.719,29,15,29L15,29 z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_location.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_location.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<g fill-opacity="0.5" stroke-opacity="0.5">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_lock.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_lock.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M25,13h-1v-3c0-4.963-4.037-9-9-9c-4.963,0-9,4.037-9,9v3H5c-1.654,0-3,1.346-3,3v10 c0,1.654,1.346,3,3,3h20c1.654,0,3-1.346,3-3V16C28,14.346,26.654,13,25,13z M12,10c0-1.654,1.346-3,3-3c1.654,0,3,1.346,3,3v3h-6 V10z" fill-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_meeting.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_meeting.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M27.771,5.936L21.92,6.904l0.234,1.459c-0.145-0.002-0.285-0.004-0.4-0.004C19.391,6.07,17.258,5,15.063,5 c-1.342,0-2.463,0.404-3.451,0.76l-0.273,0.102c-0.482,0.221-1.266,1.016-2.053,1.916c-0.309,0.018-0.621,0.023-0.914,0.07 l-0.453,0.07L8.08,6.904L2.229,5.936L0,19.752l5.852,0.969l0.041-0.254c0.158,0.254,0.363,0.477,0.613,0.641 c0.34,0.23,2.76,1.828,4.266,2.824l1.139,0.752C12.211,24.885,12.633,25,13.066,25c0.344,0,0.676-0.07,0.971-0.203 c0.117-0.051,0.613-0.332,1.18-0.684c0.383,0.053,0.768,0.09,1.158,0.09h0.018l2.125-0.078c1.697-0.061,3.5-1.969,4.752-3.627 c0.016,0,0.027,0.006,0.043,0.006l0,0c0.359,0,0.648-0.066,0.703-0.08l0.082-0.02l0.051,0.316L30,19.752L27.771,5.936z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_message.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_message.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<rect fill-opacity="0.6" height="20" width="28" x="1" y="5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_missed_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_missed_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M18,29c-6.065,0-11-4.935-11-11v-3H0L11,0.333L22,15h-8v3c0,2.206,1.795,4,4,4s4-1.794,4-4v-1h7v1 C29,24.065,24.065,29,18,29L18,29z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mms.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mms.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill-opacity="0.6" height="24" stroke-opacity="0.6" width="30" y="3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="4" y2="26">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M7.963,29.301C6.328,29.301,5,27.971,5,26.338V3.994C5,2.36,6.328,1.032,7.963,1.032h14.074 C23.672,1.032,25,2.36,25,3.994v22.344c0,1.633-1.328,2.963-2.963,2.963H7.963z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_home.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_home.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,57 +1,59 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
<g>
-<rect fill="none" height="30" width="30"/>
-<path d="M6.963,30c-1.635,0-2.963-1.33-2.963-2.96v-24.08c0-1.634,1.328-2.962,2.963-2.962h14.07c1.63,0,2.96,1.328,2.96,2.962v24.08c0,1.63-1.33,2.96-2.96,2.96h-14.08z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="14" x2="14" y1="-5.6" y2="28.94">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#9B9D9E"/>
+<path d="M7.963,30C6.328,30,5,28.671,5,27.038V2.962C5,1.328,6.328,0,7.963,0h14.074 C23.672,0,25,1.328,25,2.962v24.076C25,28.671,23.672,30,22.037,30H7.963z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="297.4795" x2="297.4795" y1="-369.4189" y2="-403.9581">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#9B9D9E"/>
</linearGradient>
-<path d="M23,27.04c0,1.08-0.88,1.96-1.96,1.96h-14.08c-1.084,0-1.963-0.88-1.963-1.96v-24.08c0-1.084,0.879-1.962,1.963-1.962h14.07c1.08,0,1.96,0.878,1.96,1.962v24.08z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="14" x2="14" y1="21.78" y2="28.08">
-<stop offset="0" stop-color="#A6A8AB"/>
-<stop offset="0.7" stop-color="#58595B"/>
-<stop offset="1" stop-color="#808184"/>
+<path d="M24,27.038C24,28.121,23.121,29,22.037,29H7.963C6.879,29,6,28.121,6,27.038V2.962 C6,1.878,6.879,1,7.963,1h14.074C23.121,1,24,1.878,24,2.962V27.038z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="297.4795" x2="297.4795" y1="-396.8003" y2="-403.0957">
+<stop offset="0" style="stop-color:#A6A8AB"/>
+<stop offset="0.703" style="stop-color:#58595B"/>
+<stop offset="1" style="stop-color:#808184"/>
</linearGradient>
-<rect fill="url(#SVGID_2)" height="4" width="4" x="12" y="24"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="14" x2="14" y1="23.89" y2="27.04">
-<stop offset="0" stop-color="#F0F0F0"/>
-<stop offset="1" stop-color="#9B9D9E"/>
+<rect fill="url(#SVGID_2_)" height="4" width="4" x="13" y="24"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="297.4795" x2="297.4795" y1="-398.9097" y2="-402.0574">
+<stop offset="0" style="stop-color:#F0F0F0"/>
+<stop offset="1" style="stop-color:#9B9D9E"/>
</linearGradient>
-<rect fill="url(#SVGID_3)" height="2" width="2" x="13" y="25"/>
-<path d="M21.04,1h-14.08c-1.084,0-1.963,0.878-1.963,1.962v1c0-1.084,0.879-1.962,1.963-1.962h14.07c1.08,0,1.96,0.878,1.96,1.962v-1c0-1.084-0.88-1.962-1.96-1.962z" fill="#FFFFFF" fill-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="14" x2="14" y1="22.94" y2="3.12">
-<stop offset="0" stop-color="#DADADB"/>
-<stop offset="1" stop-color="#9B9D9E"/>
+<rect fill="url(#SVGID_3_)" height="2" width="2" x="14" y="25"/>
+<path d="M22.037,1H7.963C6.879,1,6,1.878,6,2.962v1 C6,2.878,6.879,2,7.963,2h14.074C23.121,2,24,2.878,24,3.962v-1C24,1.878,23.121,1,22.037,1z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="297.4805" x2="297.4805" y1="-397.9575" y2="-378.1375">
+<stop offset="0" style="stop-color:#DADADB"/>
+<stop offset="1" style="stop-color:#9B9D9E"/>
</linearGradient>
-<rect fill="url(#SVGID_4)" height="20.03" width="16" x="6" y="3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="14" x2="14" y1="4" y2="22">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="1" stop-color="#1347BA"/>
+<rect fill="url(#SVGID_4_)" height="20.032" width="16" x="7" y="3"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="297.4795" x2="297.4795" y1="-379.0195" y2="-397.0217">
+<stop offset="0" style="stop-color:#3BC8EB"/>
+<stop offset="1" style="stop-color:#1347BA"/>
</linearGradient>
-<rect fill="url(#SVGID_5)" height="18.03" width="14" x="7" y="4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="8" x2="8" y1="25" y2="26.98">
-<stop offset="0" stop-color="#1CAB00"/>
-<stop offset="1" stop-color="#1F6300"/>
+<rect fill="url(#SVGID_5_)" height="18.032" width="14" x="8" y="4"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="291.4795" x2="291.4795" y1="-400.0195" y2="-402.0039">
+<stop offset="0" style="stop-color:#1CAB00"/>
+<stop offset="1" style="stop-color:#1F6300"/>
+</linearGradient>
+<rect fill="url(#SVGID_6_)" height="2" width="4" x="7" y="25"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="303.4795" x2="303.4795" y1="-400.0195" y2="-402.0195">
+<stop offset="0" style="stop-color:#E63B00"/>
+<stop offset="1" style="stop-color:#8C0000"/>
</linearGradient>
-<rect fill="url(#SVGID_6)" height="2" width="4" x="6" y="25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="20" x2="20" y1="25" y2="27">
-<stop offset="0" stop-color="#E63B00"/>
-<stop offset="1" stop-color="#8C0000"/>
+<rect fill="url(#SVGID_7_)" height="2" width="4" x="19" y="25"/>
+<polygon fill="#FFFFFF" fill-opacity="0.2" points="22,10.13 22,4 8,4 8,11.269 " stroke-opacity="0.2"/>
+<path d="M22,29.998c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8 S26.411,29.998,22,29.998L22,29.998z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="304.4795" x2="304.4795" y1="-389.9863" y2="-404.1826">
+<stop offset="0" style="stop-color:#FFC144"/>
+<stop offset="1" style="stop-color:#EF6902"/>
</linearGradient>
-<rect fill="url(#SVGID_7)" height="2" width="4" x="18" y="25"/>
-<polygon fill="#FFFFFF" fill-opacity="0.2" points="21,10.13,21,4,7,4,7,11.27"/>
-<path d="M21,30c-4.411,0-8-3.589-8-8s3.589-8,8-8,8,3.589,8,8-3.59,8-8,8z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="21" x2="21" y1="14.97" y2="29.16">
-<stop offset="0" stop-color="#4EDEFF"/>
-<stop offset="1" stop-color="#048CC6"/>
-</linearGradient>
-<circle cx="21" cy="22" fill="url(#SVGID_8)" r="7"/>
-<polygon fill-opacity="0.2" points="25.34,24,21,19.4,16.66,24,16,23.3,21,18,26,23.3,25.34,24"/>
-<polygon fill-opacity="0.2" points="21,20.86,17,25.1,17,27,20,27,20,24,22,24,22,27,25,27,25,25.1"/>
-<path d="M21,16c3.697,0,6.717,2.869,6.975,6.5,0.01-0.17,0.02-0.33,0.02-0.5,0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5,0.26-3.63,3.28-6.5,6.98-6.5z" fill="#FFFFFF" fill-opacity="0.4"/>
-<polygon fill="#FFFFFF" points="25.34,23,21,18.4,16.66,23,16,22.3,21,17,26,22.3,25.34,23"/>
-<polygon fill="#FFFFFF" points="21,19.86,17,24.1,17,26,20,26,20,23,22,23,22,26,25,26,25,24.1"/>
+<circle cx="22" cy="21.998" fill="url(#SVGID_8_)" r="7"/>
+<polygon fill-opacity="0.2" points="26.34,23.998 21.999,19.398 17.66,23.998 17,23.298 21.999,17.998 27,23.298 " stroke-opacity="0.2"/>
+<polygon fill-opacity="0.2" points="21.999,20.855 18,25.096 18,26.998 21,26.998 21,23.998 23,23.998 23,26.998 26,26.998 26,25.096 " stroke-opacity="0.2"/>
+<path d="M22,15.998c3.697,0,6.717,2.869,6.975,6.5 c0.012-0.166,0.025-0.331,0.025-0.5c0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5 C15.283,18.867,18.303,15.998,22,15.998z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<polygon fill="#FFFFFF" points="26.34,22.998 21.999,18.398 17.66,22.998 17,22.298 21.999,16.998 27,22.298 "/>
+<polygon fill="#FFFFFF" points="21.999,19.855 18,24.096 18,25.998 21,25.998 21,22.998 23,22.998 23,25.998 26,25.998 26,24.096 "/>
+</g>
+<rect fill="none" height="30" width="30"/>
</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_work.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_work.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,54 +1,60 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
-<rect fill="none" height="30" width="30"/>
-<path d="M6.963,30c-1.635,0-2.963-1.33-2.963-2.96v-24.08c0-1.634,1.328-2.962,2.963-2.962h14.07c1.63,0,2.96,1.328,2.96,2.962v24.08c0,1.63-1.33,2.96-2.96,2.96h-14.08z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="14" x2="14" y1="-5.6" y2="28.94">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#9B9D9E"/>
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<g>
+<path d="M7.963,30C6.328,30,5,28.671,5,27.038V2.962C5,1.328,6.328,0,7.963,0h14.074 C23.672,0,25,1.328,25,2.962v24.076C25,28.671,23.672,30,22.037,30H7.963z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="297.4795" x2="297.4795" y1="-369.4189" y2="-403.9581">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#9B9D9E"/>
</linearGradient>
-<path d="M23,27.04c0,1.08-0.88,1.96-1.96,1.96h-14.08c-1.084,0-1.963-0.88-1.963-1.96v-24.08c0-1.084,0.879-1.962,1.963-1.962h14.07c1.08,0,1.96,0.878,1.96,1.962v24.08z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="14" x2="14" y1="21.78" y2="28.08">
-<stop offset="0" stop-color="#A6A8AB"/>
-<stop offset="0.7" stop-color="#58595B"/>
-<stop offset="1" stop-color="#808184"/>
+<path d="M24,27.038C24,28.121,23.121,29,22.037,29H7.963C6.879,29,6,28.121,6,27.038V2.962 C6,1.878,6.879,1,7.963,1h14.074C23.121,1,24,1.878,24,2.962V27.038z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="297.4795" x2="297.4795" y1="-396.8003" y2="-403.0956">
+<stop offset="0" style="stop-color:#A6A8AB"/>
+<stop offset="0.703" style="stop-color:#58595B"/>
+<stop offset="1" style="stop-color:#808184"/>
</linearGradient>
-<rect fill="url(#SVGID_2)" height="4" width="4" x="12" y="24"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="14" x2="14" y1="23.89" y2="27.04">
-<stop offset="0" stop-color="#F0F0F0"/>
-<stop offset="1" stop-color="#9B9D9E"/>
+<rect fill="url(#SVGID_2_)" height="4" width="4" x="13" y="24"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="297.4795" x2="297.4795" y1="-398.9097" y2="-402.0574">
+<stop offset="0" style="stop-color:#F0F0F0"/>
+<stop offset="1" style="stop-color:#9B9D9E"/>
</linearGradient>
-<rect fill="url(#SVGID_3)" height="2" width="2" x="13" y="25"/>
-<path d="M21.04,1h-14.08c-1.084,0-1.963,0.878-1.963,1.962v1c0-1.084,0.879-1.962,1.963-1.962h14.07c1.08,0,1.96,0.878,1.96,1.962v-1c0-1.084-0.88-1.962-1.96-1.962z" fill="#FFFFFF" fill-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="14" x2="14" y1="22.94" y2="3.12">
-<stop offset="0" stop-color="#DADADB"/>
-<stop offset="1" stop-color="#9B9D9E"/>
+<rect fill="url(#SVGID_3_)" height="2" width="2" x="14" y="25"/>
+<path d="M22.037,1H7.963C6.879,1,6,1.878,6,2.962v1 C6,2.878,6.879,2,7.963,2h14.074C23.121,2,24,2.878,24,3.962v-1C24,1.878,23.121,1,22.037,1z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="297.4805" x2="297.4805" y1="-397.9575" y2="-378.1375">
+<stop offset="0" style="stop-color:#DADADB"/>
+<stop offset="1" style="stop-color:#9B9D9E"/>
</linearGradient>
-<rect fill="url(#SVGID_4)" height="20.03" width="16" x="6" y="3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="14" x2="14" y1="4" y2="22">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="1" stop-color="#1347BA"/>
+<rect fill="url(#SVGID_4_)" height="20.032" width="16" x="7" y="3"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="297.4795" x2="297.4795" y1="-379.0195" y2="-397.0217">
+<stop offset="0" style="stop-color:#3BC8EB"/>
+<stop offset="1" style="stop-color:#1347BA"/>
</linearGradient>
-<rect fill="url(#SVGID_5)" height="18.03" width="14" x="7" y="4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="8" x2="8" y1="25" y2="26.98">
-<stop offset="0" stop-color="#1CAB00"/>
-<stop offset="1" stop-color="#1F6300"/>
+<rect fill="url(#SVGID_5_)" height="18.032" width="14" x="8" y="4"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="291.4795" x2="291.4795" y1="-400.0195" y2="-402.0039">
+<stop offset="0" style="stop-color:#1CAB00"/>
+<stop offset="1" style="stop-color:#1F6300"/>
+</linearGradient>
+<rect fill="url(#SVGID_6_)" height="2" width="4" x="7" y="25"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="303.4795" x2="303.4795" y1="-400.0195" y2="-402.0195">
+<stop offset="0" style="stop-color:#E63B00"/>
+<stop offset="1" style="stop-color:#8C0000"/>
</linearGradient>
-<rect fill="url(#SVGID_6)" height="2" width="4" x="6" y="25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="20" x2="20" y1="25" y2="27">
-<stop offset="0" stop-color="#E63B00"/>
-<stop offset="1" stop-color="#8C0000"/>
+<rect fill="url(#SVGID_7_)" height="2" width="4" x="19" y="25"/>
+<polygon fill="#FFFFFF" fill-opacity="0.2" points="22,10.13 22,4 8,4 8,11.269 " stroke-opacity="0.2"/>
+<path d="M22,29.999c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8 S26.411,29.999,22,29.999L22,29.999z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="304.4795" x2="304.4795" y1="-390.0186" y2="-404.0186">
+<stop offset="0" style="stop-color:#A0A7A8"/>
+<stop offset="1" style="stop-color:#252629"/>
</linearGradient>
-<rect fill="url(#SVGID_7)" height="2" width="4" x="18" y="25"/>
-<polygon fill="#FFFFFF" fill-opacity="0.2" points="21,10.13,21,4,7,4,7,11.27"/>
-<path d="M21,30c-4.411,0-8-3.589-8-8s3.589-8,8-8,8,3.589,8,8-3.59,8-8,8z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="21" x2="21" y1="14.97" y2="29.16">
-<stop offset="0" stop-color="#4EDEFF"/>
-<stop offset="1" stop-color="#048CC6"/>
-</linearGradient>
-<circle cx="21" cy="22" fill="url(#SVGID_8)" r="7"/>
-<path d="M22,21v-2h-5v8h8v-6h-3zm-1,4h-3v-1h3v1zm0-2h-3v-1h3v1zm-3-2v-1h3v1h-3zm6,4h-2v-1h2v1zm0-2h-2v-1h2v1z" fill-opacity="0.2"/>
-<path d="M21,16c3.697,0,6.717,2.869,6.975,6.5,0.01-0.17,0.02-0.33,0.02-0.5,0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5,0.26-3.63,3.28-6.5,6.98-6.5z" fill="#FFFFFF" fill-opacity="0.4"/>
-<path d="M22,20v-2h-5v8h8v-6h-3zm-1,4h-3v-1h3v1zm0-2h-3v-1h3v1zm-3-2v-1h3v1h-3zm6,4h-2v-1h2v1zm0-2h-2v-1h2v1z" fill="#FFFFFF"/>
-<rect fill-opacity="0.3" height="6" width="1" x="22" y="20"/>
+<circle cx="22" cy="21.999" fill="url(#SVGID_8_)" r="7"/>
+<path d="M22,15.999c3.697,0,6.717,2.869,6.975,6.5 c0.012-0.166,0.025-0.331,0.025-0.5c0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5 C15.283,18.868,18.303,15.999,22,15.999z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<polygon fill="#FFFFFF" points="24,18.999 24,19.999 26,19.999 26,20.999 24,20.999 24,21.999 26,21.999 26,22.999 24,22.999 24,25.999 27,25.999 27,18.999 "/>
+<path d="M17,18.999v7h2v-2h2v2h2v-9L17,18.999z M19,22.999h-1v-1h1V22.999z M19,20.999h-1v-1h1V20.999z M22,22.999 h-1v-1h1V22.999z M22,20.999h-1v-1h1V20.999z" fill="#FFFFFF"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="2" x="17" y="25.999"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="6" x="21" y="25.999"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="2" x="19" y="23.999"/>
+</g>
+<rect fill="none" height="30" width="30"/>
+</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_doc.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_doc.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<rect height="27" width="21.6" x="4.201" y="1.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_pdf.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_pdf.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<rect height="27" width="21.6" x="4.201" y="1.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_ppt.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_ppt.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<rect height="27" width="21.6" x="4.2" y="1.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_rtf.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_rtf.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<rect height="27" width="21.6" x="4.2" y="1.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_xls.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_xls.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<rect height="27" width="21.6" x="4.199" y="1.5"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_chat.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_chat.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M6.924,27.143c-0.451,0-1.213-0.318-1.213-1.512v-3.766C2.71,19.804,1,16.859,1,13.726 C1,7.732,7.28,2.857,15,2.857s14,4.875,14,10.868s-6.28,10.869-14,10.869c-1.54,0-3.052-0.192-4.501-0.574L8.09,26.555 C7.725,26.939,7.321,27.143,6.924,27.143L6.924,27.143z" fill-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_email_event.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_email_event.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15,29C7.28,29,1,22.72,1,15S7.28,1,15,1s14,6.28,14,14S22.72,29,15,29L15,29z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_event.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_event.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<rect fill-opacity="0.6" height="9.111" transform="matrix(-0.2588 0.9659 -0.9659 -0.2588 20.7431 4.1604)" width="16.223" x="0.664" y="5.483"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_tip.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_tip.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M23.732,4.574C22.354,2.944,19.719,1,15,1c-4.721,0-7.355,1.944-8.734,3.576 C4.393,6.79,3.629,9.895,4.17,13.091c0.518,3.071,1.816,6.16,3.828,8.404v6.013L9.606,29h10.786L22,27.507v-6.005 c2.013-2.244,3.313-5.336,3.832-8.411C26.369,9.894,25.605,6.788,23.732,4.574z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_nfc_offline.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_nfc_offline.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M19.504,29c-1.203,0-2.192-0.547-2.674-1.015c-0.225-0.218-4.875-4.538-6.402-5.958l-0.627-0.583 C7.857,19.894,6.709,17.527,6.709,15c0-4.572,3.72-8.292,8.291-8.292c4.572,0,8.291,3.72,8.291,8.292 c0,3.096-1.771,5.946-4.492,7.357l1.079,0.985c0.216,0.206,0.865,0.699,1.468,0.699h1.211c0.818,0,1.486-0.667,1.486-1.487V7.444 c0-0.82-0.668-1.487-1.486-1.487H7.445c-0.82,0-1.487,0.667-1.487,1.487v11.803c0,0.593,0.331,0.995,0.527,1.183 c0.208,0.199,5.013,4.608,6.822,6.269L15.816,29H4.477C2.56,29,1,27.44,1,25.523V4.477C1,2.56,2.56,1,4.477,1h21.047 C27.44,1,29,2.56,29,4.477v21.047C29,27.44,27.44,29,25.523,29H19.504z M15,12.371c-1.449,0-2.628,1.18-2.628,2.629 s1.179,2.628,2.628,2.628s2.629-1.179,2.629-2.628S16.449,12.371,15,12.371L15,12.371z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_no_signal.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_no_signal.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill-opacity="0.6" height="12" width="8" x="1" y="15"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="3.9995" y2="25.9389">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_note.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_note.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<polygon fill-opacity="0.6" points="28,28 28,2 2,2 2,21.414 8.586,28 "/>
<polygon fill="url(#SVGID_1_)" points="27,3 27,27 9,27 3,21 3,3 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_offline.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_offline.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15,29.5C7.005,29.5,0.5,22.995,0.5,15S7.005,0.5,15,0.5S29.5,7.005,29.5,15S22.995,29.5,15,29.5 L15,29.5z" fill-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_online.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_online.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15,29.5C7.005,29.5,0.5,22.995,0.5,15S7.005,0.5,15,0.5S29.5,7.005,29.5,15S22.995,29.5,15,29.5 L15,29.5z" fill-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_operator.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_operator.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<polygon fill-opacity="0.6" points="3,29 3,1 19.414,1 27,8.586 27,29 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_outbox.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_outbox.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<polygon fill-opacity="0.6" points="11,19 11,12 7,12 15,1.333 23,12 19,12 19,19 " stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ovi.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ovi.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect fill="none" height="30" width="30"/>
<rect fill="none" height="30" width="30"/>
<rect fill="#44A51C" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pager.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pager.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M4,25c-1.654,0-3-1.346-3-3V8c0-1.654,1.346-3,3-3h22c1.654,0,3,1.346,3,3v14c0,1.654-1.346,3-3,3H4z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pair.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pair.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="10.3721" x2="10.3721" y1="1" y2="24.4868">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_person.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_person.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M1,29v-1c0-2.974,1.324-5.258,3.83-6.606c0.602-0.324,1.942-0.849,3.771-1.554 c0.68-0.262,1.493-0.576,1.889-0.743c0.147-0.423,0.11-1.146,0.001-1.362c0,0-1.105-2.003-1.146-2.088 c-0.909-0.094-1.778-0.873-2.203-1.998c-0.457-1.209-0.286-2.413,0.373-3.094c-0.589-2.53-0.458-4.477,0.393-5.793 C8.413,3.98,9.175,3.434,10.08,3.195C11.014,2.066,12.33,1,14.762,1c2.838,0.096,5.041,1.074,6.405,2.831 c1.341,1.728,1.776,4.13,1.23,6.78c0.621,0.697,0.759,1.895,0.283,3.083c-0.411,1.032-1.173,1.747-2.007,1.916 c-0.046,0.097-1.174,2.138-1.174,2.138c-0.121,0.24-0.136,1.033,0.023,1.416c0.333,0.133,0.99,0.381,1.586,0.605 c1.942,0.73,3.475,1.314,4.054,1.619C25.804,21.728,29,23.636,29,28v1H1z" fill-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phone_disabled.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phone_disabled.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M7.963,29.301C6.328,29.301,5,27.971,5,26.338V3.994C5,2.36,6.328,1.032,7.963,1.032h14.074 C23.672,1.032,25,2.36,25,3.994v22.344c0,1.633-1.328,2.963-2.963,2.963H7.963z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phonebook.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phonebook.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M4,1v5C2.896,6,2,6.897,2,8s0.896,2,2,2v1c-1.104,0-2,0.897-2,2s0.896,2,2,2v1c-1.104,0-2,0.897-2,2 s0.896,2,2,2v1c-1.104,0-2,0.897-2,2s0.896,2,2,2v4h24V1H4z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_play.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_play.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<path d="M5.294,26.47c-0.156,0-0.313-0.042-0.45-0.124-0.268-0.16-0.432-0.45-0.432-0.76v-21.18c0-0.312,0.164-0.6,0.432-0.759,0.138-0.082,0.294-0.123,0.45-0.123,0.146,0,0.291,0.036,0.423,0.107l19.41,10.59c0.283,0.154,0.46,0.452,0.46,0.775s-0.177,0.62-0.46,0.774l-19.41,10.59c-0.132,0.08-0.277,0.11-0.423,0.11z" fill-opacity="0.6" stroke-opacity="0.6" style="enable-background:new;"/>
<polygon fill="url(#SVGID_1_)" points="5.294,4.412,24.71,15,5.294,25.59"/>
<polygon fill="#753200" fill-opacity="0.1" points="5.294,24.71,5.294,25.59,24.71,15,23.9,14.56" stroke-opacity="0.1" style="enable-background:new;"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_playlist.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_playlist.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<polygon fill-opacity="0.6" points="27,28 27,2 3,2 3,21.414 9.586,28 "/>
<linearGradient gradientTransform="matrix(-1 0 0 1 236 0)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="221" x2="221" y1="3" y2="27.0005">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_presentation.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_presentation.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<polygon fill-opacity="0.6" points="29,8 29,2 1,2 1,8 2,8 2,24 1,24 1,28 29,28 29,24 28,24 28,8 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_high.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_high.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<polygon fill-opacity="0.6" points="11.117,18 8.867,1 21.133,1 18.883,18 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="27.0027">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_low.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_low.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<polygon fill-opacity="0.6" points="2.865,15 10,15 10,1 20,1 20,15 27.135,15 15,29.563 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" fill-opacity="0.5" height="30" stroke-opacity="0.5" width="30"/>
<path d="M15,30c-8.271,0-15-6.73-15-15s6.729-15,15-15,15,6.729,15,15-6.73,15-15,15z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected_highlight.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected_highlight.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<path d="M15,30c-8.271,0-15-6.73-15-15s6.729-15,15-15,15,6.729,15,15-6.73,15-15,15z" fill-opacity="0.6" stroke-opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.219" y2="29.44">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" fill-opacity="0.5" height="30" stroke-opacity="0.5" width="30"/>
<path d="M15,30c-8.271,0-15-6.73-15-15s6.729-15,15-15,15,6.729,15,15-6.73,15-15,15z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected_highlight.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected_highlight.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<path d="M15,30c-8.271,0-15-6.73-15-15s6.729-15,15-15,15,6.729,15,15-6.73,15-15,15z" fill-opacity="0.6" stroke-opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.219" y2="29.44">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reboot.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reboot.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_received.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_received.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<polygon fill-opacity="0.6" points="2.865,15 10,15 10,1 20,1 20,15 27.135,15 15,29.563 " stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_record.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_record.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15,29C7.28,29,1,22.72,1,15S7.28,1,15,1s14,6.28,14,14S22.72,29,15,29L15,29z" fill-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_refresh.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_refresh.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M27.799,26.385l-4.348-4.349C25.102,20.063,26,17.6,26,15c0-5.405-4.033-10.077-9.382-10.869l-1.033-0.153 l0.183-1.766L2.201,3.615l4.348,4.348C4.898,9.937,4,12.4,4,15c0,5.405,4.033,10.077,9.382,10.869l1.033,0.153l-0.183,1.766 L27.799,26.385z M14.004,20.909C11.104,20.421,9,17.936,9,15c0-1.251,0.395-2.45,1.125-3.462l4.239,4.241l0.708-6.845l0.925,0.156 C18.896,9.579,21,12.063,21,15c0,1.256-0.392,2.458-1.117,3.469l-4.247-4.247l-0.708,6.844L14.004,20.909z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reminder.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reminder.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M4.97,9.928c1.073-1.074,2.104-1.602,3.937-1.109l3.82-3.82c2.777-2.777,6.931-3.346,10.283-1.727 c1.171-0.836,2.809-0.737,3.858,0.313c1.051,1.051,1.149,2.688,0.313,3.859c1.619,3.353,1.05,7.506-1.728,10.283l-3.819,3.82 c0.493,1.833-0.035,2.863-1.109,3.937l-2.143,2.143l-4.456-4.456c-1.745,0.771-3.913,0.33-5.443-1.201 c-1.53-1.529-1.972-3.697-1.2-5.442L2.827,12.07L4.97,9.928z" fill-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15.05,28.784c-3.378,0-6.554-1.315-8.942-3.704c-4.692-4.693-4.918-12.188-0.68-17.151L0.505,3.006 L15.76,1.428l-1.578,15.255l-4.847-4.847c-0.931,1.231-1.434,2.727-1.434,4.302c0,1.913,0.743,3.709,2.092,5.058 c1.348,1.348,3.145,2.091,5.058,2.091s3.709-0.743,5.058-2.091c2.788-2.789,2.788-7.327,0-10.115l-0.707-0.707l3.884-3.887 l0.707,0.708c4.931,4.931,4.931,12.955,0,17.886C21.604,27.469,18.428,28.784,15.05,28.784L15.05,28.784z" fill-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat_exception.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat_exception.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15.05,28.784c-3.378,0-6.554-1.315-8.942-3.704c-4.692-4.693-4.918-12.188-0.68-17.151L0.505,3.006 L15.76,1.428l-1.578,15.255l-4.847-4.847c-0.931,1.231-1.434,2.727-1.434,4.302c0,1.913,0.743,3.709,2.092,5.058 c1.348,1.348,3.145,2.091,5.058,2.091s3.709-0.743,5.058-2.091c2.788-2.789,2.788-7.327,0-10.115l-0.707-0.707l3.884-3.887 l0.707,0.708c4.931,4.931,4.931,12.955,0,17.886C21.604,27.469,18.428,28.784,15.05,28.784L15.05,28.784z" fill-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<polygon fill-opacity="0.6" points="0.438,15 15,2.865 15,10 29,10 29,20 15,20 15,27.135 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply_all.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply_all.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_rgb.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_rgb.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15,15c-3.859,0-7-3.141-7-7s3.141-7,7-7c3.859,0,7,3.141,7,7S18.859,15,15,15L15,15z" fill-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_secure.svg Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
-<g>
-<rect fill="none" height="30" width="30"/>
-<path d="M25,13h-1v-3c0-4.963-4.037-9-9-9c-4.963,0-9,4.037-9,9v3H5c-1.654,0-3,1.346-3,3v10 c0,1.654,1.346,3,3,3h20c1.654,0,3-1.346,3-3V16C28,14.346,26.654,13,25,13z M12,10c0-1.654,1.346-3,3-3c1.654,0,3,1.346,3,3v3h-6 V10z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="7.0005" x2="23" y1="14" y2="14">
-<stop offset="0" style="stop-color:#B4B4B4"/>
-<stop offset="0.2083" style="stop-color:#F0F0F0"/>
-<stop offset="0.526" style="stop-color:#969696"/>
-<stop offset="0.8061" style="stop-color:#A1A1A1"/>
-<stop offset="1" style="stop-color:#BEBEBE"/>
-</linearGradient>
-<path d="M15,6c2.207,0,4,1.794,4,4v8c0,2.206-1.793,4-4,4c-2.206,0-4-1.794-4-4v-8C11,7.794,12.794,6,15,6 M15,2c-4.4,0-8,3.6-8,8v8c0,4.4,3.6,8,8,8c4.4,0,8-3.6,8-8v-8C23,5.6,19.4,2,15,2L15,2z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="7.0005" x2="23" y1="9" y2="9">
-<stop offset="0" style="stop-color:#8C8C8C"/>
-<stop offset="0.2083" style="stop-color:#BDBDBD"/>
-<stop offset="0.526" style="stop-color:#707070"/>
-<stop offset="1" style="stop-color:#8F8F8F"/>
-</linearGradient>
-<path d="M11,16v-6c0-2.206,1.794-4,4-4c2.207,0,4,1.794,4,4v6h4v-6c0-4.4-3.6-8-8-8c-4.4,0-8,3.6-8,8v6H11z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="8.0005" x2="22" y1="9.5" y2="9.5">
-<stop offset="0" style="stop-color:#B4B4B4"/>
-<stop offset="0.2083" style="stop-color:#F0F0F0"/>
-<stop offset="0.526" style="stop-color:#969696"/>
-<stop offset="0.8061" style="stop-color:#A1A1A1"/>
-<stop offset="1" style="stop-color:#BEBEBE"/>
-</linearGradient>
-<path d="M10,16v-6c0-2.757,2.243-5,5-5c2.757,0,5,2.243,5,5v6h2v-6c0-3.859-3.141-7-7-7c-3.859,0-7,3.141-7,7 v6H10z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="3.0005" x2="27" y1="21" y2="21">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.24" style="stop-color:#FFE692"/>
-<stop offset="0.75" style="stop-color:#ED8C0D"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
-</linearGradient>
-<path d="M27,26c0,1.1-0.9,2-2,2H5c-1.1,0-2-0.9-2-2V16c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V26z" fill="url(#SVGID_4_)"/>
-<path d="M25,27H5c-1.1,0-2-0.9-2-2v1c0,1.1,0.9,2,2,2h20c1.1,0,2-0.9,2-2v-1C27,26.1,26.1,27,25,27z" fill="#873900" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M25,14H5c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2v-1C27,14.9,26.1,14,25,14z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<rect fill-opacity="0.2" height="2" stroke-opacity="0.2" width="24" x="3" y="23"/>
-<rect fill-opacity="0.2" height="2" stroke-opacity="0.2" width="24" x="3" y="19"/>
-<rect fill="none" height="30" width="30" x="0"/>
-</g>
-</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" fill-opacity="0.5" height="30" stroke-opacity="0.5" width="30"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.219" y2="29.44">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_highlight.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_highlight.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill-opacity="0.6" height="30" stroke-opacity="0.6" width="30"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.219" y2="29.44">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_partial.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_partial.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.219" y2="29.44">
<stop offset="0" stop-color="#E0E1E2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sent.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sent.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<polygon fill-opacity="0.6" points="10,29 10,15 2.865,15 15,0.438 27.135,15 20,15 20,29 " stroke-opacity="0.6"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_shuffle.svg Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<g>
+<path d="M0,30V0h30v30H0z M23.599,26.25l-8.732-8.732L6.134,26.25H23.599z M26.25,23.599V6.134l-8.732,8.732 L26.25,23.599z M3.75,23.331l8.465-8.465L3.75,6.401V23.331z M14.866,12.215L23.33,3.75H6.402L14.866,12.215z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="0.9941" y2="29.1902">
+<stop offset="0" style="stop-color:#E6E6E6"/>
+<stop offset="0.6182" style="stop-color:#A8A8A8"/>
+<stop offset="1" style="stop-color:#CCCCCC"/>
+</linearGradient>
+<path d="M0.938,0.938v28.125h28.125V0.938H0.938z M13.541,14.866L2.813,25.595V4.138L13.541,14.866z M4.139,2.813h21.455L14.866,13.541L4.139,2.813z M14.866,16.192l10.995,10.995H3.871L14.866,16.192z M16.192,14.866L27.188,3.871 v21.99L16.192,14.866z" fill="url(#SVGID_1_)"/>
+<g>
+<polygon fill-opacity="0.6" points="8.547,25.313 7.61,17.813 5.625,17.813 5.625,12.199 24.375,12.199 24.375,17.813 22.391,17.813 21.453,25.313 " stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="12.103" y2="23.9943">
+<stop offset="0" style="stop-color:#A0F800"/>
+<stop offset="1" style="stop-color:#319E00"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2_)" points="6.563,13.137 6.563,16.875 8.438,16.875 9.375,24.375 20.625,24.375 21.563,16.875 23.438,16.875 23.438,13.137 "/>
+<path d="M13.125,14.063v-2.886c-0.348,0.048-0.692,0.073-1.03,0.073c-0.804,0-1.568-0.139-2.272-0.414 C5.866,9.294,5.955,6.329,5.96,6.204l0.019-0.408l0.312-0.265c0.103-0.088,1.06-0.855,2.881-0.855c0.958,0,1.99,0.212,3.066,0.632 c1.3,0.506,2.174,1.126,2.762,1.716c0.588-0.589,1.462-1.209,2.762-1.716c1.076-0.42,2.108-0.632,3.066-0.632 c1.82,0,2.777,0.767,2.881,0.855l0.313,0.265l0.019,0.408c0.005,0.125,0.094,3.091-3.862,4.632 c-0.704,0.275-1.469,0.414-2.272,0.414c-0.338,0-0.683-0.025-1.03-0.073v2.886H13.125z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M10.163,9.963c1.436,0.559,2.896,0.346,3.899,0.057v3.105h1.875V10.02 c1.003,0.289,2.464,0.502,3.899-0.057c3.375-1.316,3.267-3.717,3.267-3.717s-1.627-1.379-5.002-0.064 C16.242,6.907,15.392,7.849,15,8.551c-0.392-0.702-1.242-1.644-3.102-2.369C8.523,4.866,6.896,6.246,6.896,6.246 S6.788,8.647,10.163,9.963z" fill="url(#SVGID_3_)"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="4.9224" y2="12.8702">
+<stop offset="0" style="stop-color:#A0F800"/>
+<stop offset="1" style="stop-color:#319E00"/>
+</linearGradient>
+</defs>
+</g>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.9995" x2="14.9995" y1="12.5542" y2="17.3683">
+<stop offset="0" style="stop-color:#D07100"/>
+<stop offset="1" style="stop-color:#A23600"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" height="3.738" width="16.875" x="6.563" y="13.137"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9995" x2="14.9995" y1="16.8408" y2="24.5597">
+<stop offset="0" style="stop-color:#D07100"/>
+<stop offset="1" style="stop-color:#A23600"/>
+</linearGradient>
+<polygon fill="url(#SVGID_5_)" points="20.625,24.375 9.375,24.375 8.438,16.875 21.563,16.875 "/>
+<path d="M23.104,6.246c0,0-1.627-1.379-5.002-0.064C16.242,6.907,15.392,7.849,15,8.551 c-0.392-0.702-1.242-1.644-3.102-2.369C8.523,4.866,6.896,6.246,6.896,6.246s-0.109,2.401,3.267,3.717 c1.436,0.559,2.896,0.346,3.899,0.057v3.105h1.875V10.02c1.003,0.289,2.464,0.502,3.899-0.057 C23.212,8.647,23.104,6.246,23.104,6.246z" fill="url(#SVGID_3_)"/>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<path d="M14.063,9.082c-1.003,0.289-2.464,0.502-3.899-0.057C8.06,8.205,7.31,6.963,7.042,6.144 c-0.094,0.06-0.146,0.102-0.146,0.102s-0.109,2.401,3.267,3.717c1.436,0.559,2.896,0.346,3.899,0.057V9.082z"/>
+<path d="M22.958,6.144c-0.268,0.819-1.018,2.061-3.121,2.881c-1.436,0.559-2.896,0.346-3.899,0.057v0.938 c1.003,0.289,2.464,0.502,3.899-0.057c3.375-1.316,3.267-3.717,3.267-3.717S23.052,6.204,22.958,6.144z"/>
+<rect height="0.938" width="1.875" x="14.063" y="12.188"/>
+</g>
+<rect fill="#FFFFFF" fill-opacity="0.3" height="0.926" stroke-opacity="0.3" width="16.875" x="6.563" y="13.137"/>
+<polygon fill-opacity="0.2" points="21.445,17.813 21.563,16.875 8.438,16.875 8.555,17.813 " stroke-opacity="0.2"/>
+</g>
+</g>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_shuffle_off.svg Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<g>
+<path d="M0,30V0h30v30H0z M23.599,26.25l-8.732-8.732L6.134,26.25H23.599z M26.25,23.599V6.134l-8.732,8.732 L26.25,23.599z M3.75,23.331l8.465-8.465L3.75,6.401V23.331z M14.866,12.215L23.33,3.75H6.402L14.866,12.215z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="0.9941" y2="29.1902">
+<stop offset="0" style="stop-color:#E6E6E6"/>
+<stop offset="0.6182" style="stop-color:#A8A8A8"/>
+<stop offset="1" style="stop-color:#CCCCCC"/>
+</linearGradient>
+<path d="M0.938,0.938v28.125h28.125V0.938H0.938z M13.541,14.866L2.813,25.595V4.138L13.541,14.866z M4.139,2.813h21.455L14.866,13.541L4.139,2.813z M14.866,16.192l10.995,10.995H3.871L14.866,16.192z M16.192,14.866L27.188,3.871 v21.99L16.192,14.866z" fill="url(#SVGID_1_)"/>
+<g>
+<polygon fill-opacity="0.6" points="8.547,25.313 7.61,17.813 5.625,17.813 5.625,12.199 24.375,12.199 24.375,17.813 22.391,17.813 21.453,25.313 " stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="12.103" y2="23.9943">
+<stop offset="0" style="stop-color:#A0F800"/>
+<stop offset="1" style="stop-color:#319E00"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2_)" points="6.563,13.137 6.563,16.875 8.438,16.875 9.375,24.375 20.625,24.375 21.563,16.875 23.438,16.875 23.438,13.137 "/>
+<path d="M13.125,14.063v-2.886c-0.348,0.048-0.692,0.073-1.03,0.073c-0.804,0-1.568-0.139-2.272-0.414 C5.866,9.294,5.955,6.329,5.96,6.204l0.019-0.408l0.312-0.265c0.103-0.088,1.06-0.855,2.881-0.855c0.958,0,1.99,0.212,3.066,0.632 c1.3,0.506,2.174,1.126,2.762,1.716c0.588-0.589,1.462-1.209,2.762-1.716c1.076-0.42,2.108-0.632,3.066-0.632 c1.82,0,2.777,0.767,2.881,0.855l0.313,0.265l0.019,0.408c0.005,0.125,0.094,3.091-3.862,4.632 c-0.704,0.275-1.469,0.414-2.272,0.414c-0.338,0-0.683-0.025-1.03-0.073v2.886H13.125z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M10.163,9.963c1.436,0.559,2.896,0.346,3.899,0.057v3.105h1.875V10.02 c1.003,0.289,2.464,0.502,3.899-0.057c3.375-1.316,3.267-3.717,3.267-3.717s-1.627-1.379-5.002-0.064 C16.242,6.907,15.392,7.849,15,8.551c-0.392-0.702-1.242-1.644-3.102-2.369C8.523,4.866,6.896,6.246,6.896,6.246 S6.788,8.647,10.163,9.963z" fill="url(#SVGID_3_)"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="4.9224" y2="12.8702">
+<stop offset="0" style="stop-color:#A0F800"/>
+<stop offset="1" style="stop-color:#319E00"/>
+</linearGradient>
+</defs>
+</g>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.9995" x2="14.9995" y1="12.5542" y2="17.3683">
+<stop offset="0" style="stop-color:#D07100"/>
+<stop offset="1" style="stop-color:#A23600"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" height="3.738" width="16.875" x="6.563" y="13.137"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9995" x2="14.9995" y1="16.8408" y2="24.5597">
+<stop offset="0" style="stop-color:#D07100"/>
+<stop offset="1" style="stop-color:#A23600"/>
+</linearGradient>
+<polygon fill="url(#SVGID_5_)" points="20.625,24.375 9.375,24.375 8.438,16.875 21.563,16.875 "/>
+<path d="M23.104,6.246c0,0-1.627-1.379-5.002-0.064C16.242,6.907,15.392,7.849,15,8.551 c-0.392-0.702-1.242-1.644-3.102-2.369C8.523,4.866,6.896,6.246,6.896,6.246s-0.109,2.401,3.267,3.717 c1.436,0.559,2.896,0.346,3.899,0.057v3.105h1.875V10.02c1.003,0.289,2.464,0.502,3.899-0.057 C23.212,8.647,23.104,6.246,23.104,6.246z" fill="url(#SVGID_3_)"/>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<path d="M14.063,9.082c-1.003,0.289-2.464,0.502-3.899-0.057C8.06,8.205,7.31,6.963,7.042,6.144 c-0.094,0.06-0.146,0.102-0.146,0.102s-0.109,2.401,3.267,3.717c1.436,0.559,2.896,0.346,3.899,0.057V9.082z"/>
+<path d="M22.958,6.144c-0.268,0.819-1.018,2.061-3.121,2.881c-1.436,0.559-2.896,0.346-3.899,0.057v0.938 c1.003,0.289,2.464,0.502,3.899-0.057c3.375-1.316,3.267-3.717,3.267-3.717S23.052,6.204,22.958,6.144z"/>
+<rect height="0.938" width="1.875" x="14.063" y="12.188"/>
+</g>
+<rect fill="#FFFFFF" fill-opacity="0.3" height="0.926" stroke-opacity="0.3" width="16.875" x="6.563" y="13.137"/>
+<polygon fill-opacity="0.2" points="21.445,17.813 21.563,16.875 8.438,16.875 8.555,17.813 " stroke-opacity="0.2"/>
+</g>
+</g>
+<g>
+<rect fill-opacity="0.6" height="34.27" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(0.7073 -0.707 0.707 0.7073 -6.2126 14.9968)" width="3.169" x="13.42" y="-2.134"/>
+<polygon fill="url(#SVGID_1__)" points="26,26.99,3.015,4.005,4.006,3.014,26.99,26"/>
+<rect fill="none" height="30" width="30"/>
+<defs>
+<linearGradient gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="339.8" x2="339.8" y1="-397.3" y2="-425.3">
+<stop offset="0" stop-color="#DE8029"/>
+<stop offset="0.2606" stop-color="#DE4E29"/>
+<stop offset="1" stop-color="#D82E09"/>
+</linearGradient>
+</defs>
+</g>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_good.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_good.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<rect fill-opacity="0.6" height="12" width="8" x="1" y="15"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_low.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_low.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<rect fill-opacity="0.6" height="12" width="8" x="1" y="15"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_medium.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_medium.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<rect fill-opacity="0.6" height="12" width="8" x="1" y="15"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sisx.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sisx.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15.781,24v-3.441l0.494-0.29C17.316,19.659,18,19.209,18,18.548C18,17.137,16.358,16,15,16 c-1.359,0-3,1.137-3,2.548c0,0.666,0.684,1.114,1.728,1.722l0.497,0.289V24H11c-1.654,0-3-1.346-3-3H7.937 c-0.597,0.972-1.407,2-2.832,2C2.686,23,1,20.629,1,18.5S2.686,14,5.104,14c1.438,0,2.249,1.052,2.83,2H8v-4c0-1.654,1.346-3,3-3h1 V8.937c-0.971-0.597-2-1.406-2-2.832C10,3.686,12.371,2,14.5,2S19,3.686,19,6.104c0,1.438-1.051,2.249-2,2.83V9h7 c1.654,0,3,1.346,3,3v9c0,1.654-1.346,3-3,3H15.781z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_angry.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_angry.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_bigsmile.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_bigsmile.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_cry.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_cry.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_evil.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_evil.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_eyebrows.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_eyebrows.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_heart.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_heart.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_irritated.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_irritated.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_kissing.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_kissing.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_nerd.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_nerd.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_neutral.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_neutral.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic_mad.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic_mad.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_smile.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_smile.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_surprised.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_surprised.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_tongue.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_tongue.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_unhappy.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_unhappy.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_very_cool.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_very_cool.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink_grin.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink_grin.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wondering.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wondering.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<rect fill="none" height="30" width="30"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sound.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sound.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,19 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
-<path d="M21.09,27.19c-2.842,0-5.156-1.893-5.156-4.219s2.314-4.219,5.156-4.219c0.48,0,0.953,0.053,1.406,0.158v-8.596h-8.438v9.844c0,2.326-2.314,4.219-5.156,4.219s-5.154-1.89-5.154-4.21,2.314-4.219,5.156-4.219c0.48,0,0.953,0.053,1.406,0.158v-13.29h15.94v20.16c0,2.33-2.31,4.22-5.16,4.22z" fill-opacity="0.6" stroke-opacity="0.6" style="enable-background:new;"/>
-<path d="M11.25,3.75v13.68c-0.67-0.35-1.476-0.555-2.344-0.555-2.33,0-4.219,1.469-4.219,3.281s1.889,3.281,4.219,3.281,4.219-1.469,4.219-3.281v-10.78h10.31v10.87c-0.67-0.35-1.476-0.555-2.344-0.555-2.33,0-4.219,1.469-4.219,3.281s1.889,3.281,4.219,3.281,4.219-1.469,4.219-3.281v-19.21h-14.06z" fill="url(#SVGID_1_)"/>
-<path d="M8.906,22.5c-2.125,0-3.863-1.225-4.159-2.813-0.028,0.154-0.06,0.308-0.06,0.469,0,1.813,1.889,3.281,4.219,3.281s4.219-1.469,4.219-3.281v-0.938c0,1.81-1.88,3.28-4.214,3.28z"/>
-<path d="M21.09,25.31c-2.125,0-3.863-1.225-4.158-2.813-0.029,0.154-0.061,0.308-0.061,0.469,0,1.813,1.889,3.281,4.219,3.281s4.219-1.469,4.219-3.281v-0.938c0,1.81-1.89,3.28-4.22,3.28z"/>
-<rect height="0.938" width="10.31" x="13.12" y="8.438"/>
-<path d="M8.906,17.81c0.868,0,1.673,0.205,2.344,0.555v-0.93c-0.67-0.35-1.476-0.555-2.344-0.555-2.33,0-4.219,1.469-4.219,3.281,0,0.161,0.032,0.314,0.06,0.469,0.296-1.59,2.035-2.82,4.159-2.82z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4" style="enable-background:new;"/>
-<path d="M21.09,20.62c0.868,0,1.674,0.205,2.344,0.555v-0.938c-0.67-0.35-1.476-0.555-2.344-0.555-2.33,0-4.219,1.469-4.219,3.281,0,0.161,0.031,0.314,0.061,0.469,0.3-1.58,2.04-2.81,4.16-2.81z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4" style="enable-background:new;"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="0.938" stroke-opacity="0.4" style="enable-background:new;" width="14.06" x="11.25" y="3.75"/>
+<path d="M9.861,29.5c-3.192,0-5.794-1.643-6.474-4.088c-0.358-1.289-0.16-2.642,0.573-3.911 c1.012-1.754,2.905-3.099,5.194-3.69c0.799-0.205,1.61-0.311,2.413-0.311c0.938,0,1.831,0.14,2.648,0.409V5.002l10.359-4.831 l2.536,5.438l-8.896,4.148l-0.001,13.079c0.007,2.791-2.487,5.462-5.938,6.354C11.479,29.396,10.666,29.5,9.861,29.5L9.861,29.5z" fill-opacity="0.6"/>
+<path d="M17.217,22.836V9.12l8.566-3.995L24.093,1.5l-8.876,4.139v13.833 c-1.491-0.938-3.635-1.255-5.812-0.692c-3.517,0.908-5.778,3.758-5.054,6.365s4.161,3.984,7.677,3.076 c3.083-0.797,5.201-3.086,5.188-5.395C17.216,22.829,17.217,22.832,17.217,22.836z" fill="url(#SVGID_1_)"/>
+<polygon fill="#FFFFFF" fill-opacity="0.5" points="25.209,5.394 25.783,5.125 24.093,1.5 15.217,5.639 15.217,7.139 24.093,3 " stroke-opacity="0.5"/>
+<path d="M9.405,20.279c2.177-0.563,4.32-0.246,5.812,0.692v-1.5c-1.491-0.938-3.635-1.255-5.812-0.692 c-3.404,0.879-5.624,3.578-5.105,6.114C4.703,22.866,6.671,20.985,9.405,20.279z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<rect fill="none" height="30" width="30"/>
<defs>
-<linearGradient gradientTransform="matrix(0.9375 0 0 -0.9375 -280.6875 -343.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="315.4" x2="315.4" y1="-370.7" y2="-394.3">
-<stop offset="0" stop-color="#DE6929"/>
-<stop offset="1" stop-color="#D9340F"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="5.2617" y2="27.0999">
+<stop offset="0" style="stop-color:#A0F800"/>
+<stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
</defs>
</g>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_speaker.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_speaker.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<polygon fill-opacity="0.6" points="7.764,21 1,21 1,9 7.764,9 19,3.382 19,26.618 " stroke-opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="9.9995" x2="9.9995" y1="5.0522" y2="24.9497">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_star_offline.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_star_offline.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<polygon fill-opacity="0.6" points="15,0.734 19.635,10.126 30,11.632 22.5,18.943 24.27,29.266 15,24.393 5.73,29.266 7.5,18.943 0,11.632 10.365,10.126 " stroke-opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="2.9937" y2="27.438">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_swype.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_swype.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g>
<path d="M0,30V0h30v30H0z M23.599,26.25l-8.732-8.732L6.134,26.25H23.599z M26.25,23.599V6.134l-8.732,8.732 L26.25,23.599z M3.75,23.331l8.465-8.465L3.75,6.401V23.331z M14.866,12.215L23.33,3.75H6.402L14.866,12.215z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sync.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sync.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M19,26.5l-1,1c-5.58,0-13-1.141-13-11v-3H0.131L8,1.697L15.869,13.5H11v3c0,6.655,5.764,9,7,9L19,26.5z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_telephony_offline.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_telephony_offline.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M1,22.653c0-0.762,0.097-1.988,0.553-3.504c0.707-2.346,3.97-7.439,7.274-10.745 c3.348-3.345,7.787-6.116,9.228-6.665c2.32-0.878,4.919-0.822,5.796-0.596c0.122,0.036,0.678,0.226,1.427,0.645l0.269,0.155 c0.457,0.277,0.864,0.562,1.24,0.875c0.144,0.12,0.25,0.199,0.342,0.268c0.207,0.151,0.402,0.294,0.691,0.625 c0.65,0.74,0.876,1.075,0.915,1.134C28.908,5.112,29,5.422,29,5.741c0,0.584-0.294,1.132-0.789,1.469l-7.078,4.819 c-0.4,0.271-0.894,0.374-1.353,0.282c-0.435-0.088-0.803-0.339-1.042-0.708l-1.274-1.993c-1.575,1.008-3.029,2.209-4.648,3.831 c-1.037,1.037-2.093,2.485-2.829,3.622L9.4,17.799L10.156,18l0.813,0.484c0.488,0.286,0.785,0.814,0.785,1.413 c0,0.242-0.049,0.481-0.143,0.707l-0.021,0.054l-1.453,2.543l-2.851,4.91c-0.233,0.408-0.625,0.711-1.071,0.832 c-0.422,0.113-0.86,0.058-1.23-0.158c-0.077-0.049-0.36-0.24-0.998-0.754l-0.056-0.01l-0.173-0.168 c-0.331-0.271-0.432-0.377-0.681-0.652l-0.153-0.168c-1.228-1.344-1.721-2.822-1.742-2.885C1.025,23.706,1,23.02,1,22.653L1,22.653z " fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_text.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_text.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<polygon fill-opacity="0.6" points="27,28 27,2 3,2 3,21.414 9.586,28 "/>
<polygon fill="url(#SVGID_1_)" points="26,3 26,27 10,27 4,21 4,3 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tick.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tick.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30.002" width="30.002"/>
<polygon fill-opacity="0.6" points="0.587,15.429 5.713,10.303 11.597,16.187 24.289,3.491 29.416,8.617 11.605,26.427 " stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tip.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tip.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M23.732,4.574C22.354,2.944,19.719,1,15,1c-4.721,0-7.355,1.944-8.734,3.576 C4.393,6.79,3.629,9.895,4.17,13.091c0.518,3.071,1.816,6.16,3.828,8.404v6.013L9.606,29h10.786L22,27.507v-6.005 c2.013-2.244,3.313-5.336,3.832-8.411C26.369,9.894,25.605,6.788,23.732,4.574z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<polygon fill-opacity="0.6" points="9,3 9,1 21,1 21,3 26,3 26,29 10.586,29 4,22.414 4,3 " stroke-opacity="0.6"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1412 0)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1427" x2="-1427" y1="2.1206" y2="28.8787">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo_done.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo_done.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<polygon fill-opacity="0.6" points="9,3 9,1 21,1 21,3 26,3 26,29 10.586,29 4,22.414 4,3 " stroke-opacity="0.6"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1412 0)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1427" x2="-1427" y1="2.1206" y2="28.8787">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unknown.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unknown.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M13.5,28c-1.93,0-3.5-1.57-3.5-3.5s1.57-3.5,3.5-3.5s3.5,1.57,3.5,3.5S15.43,28,13.5,28L13.5,28z" fill-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="url(#SVGID_1_)" height="28" width="28" x="1" y="1"/>
<path d="M1,1v28h2v-24c0-0.55,0.45-1,1-1h22c0.55,0,1,0.45,1,1v24h2v-28h-28z" fill-opacity="0.05" stroke-opacity="0.05"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected_highlight.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected_highlight.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill-opacity="0.6" height="30" stroke-opacity="0.6" width="30"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.219" y2="29.44">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_untrusted.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_untrusted.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<path d="M4,29c-1.654,0-3-1.346-3-3V16c0-1.654,1.346-3,3-3h7v-3c0-4.962,4.038-9,9-9c5.299,0,9,3.29,9,8 c0,0.552-0.447,1-1,1h-4c-0.553,0-1-0.448-1-1c0-0.495,0-2-3-2c-1.654,0-3,1.346-3,3v3h4c1.654,0,3,1.346,3,3v10 c0,1.654-1.346,3-3,3H4z" fill-opacity="0.6" stroke-opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="12" x2="28" y1="9" y2="9">
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<polygon fill-opacity="0.6" points="28,29 28,1 2,1 2,22.414 8.586,29 " stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address_home.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address_home.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<polygon fill-opacity="0.6" points="28,29 28,1 2,1 2,22.414 8.586,29 " stroke-opacity="0.6"/>
@@ -40,17 +40,17 @@
<path d="M17.455,5.997c-0.136,0.051-0.229,0.087-0.229,0.087l-2.058-0.395l-1.01,0.632l0.531,0.821 l-0.928,0.286l-0.5-0.286l0.176-0.499l-0.652,0.452l-0.117,0.786h-1.239l0.458,0.78l-1.742,1.421L9.816,11.5l0.646,1.252L10.852,13 l1.365-0.279l0.498,0.429l0.453,0.045l0.492,1.929l-0.328,0.853l0.725,1.603l0.205,0.665h1.263l0.714-0.386l0.539-0.625v-0.757 l1.023-0.522v-1.12l0.404-0.771l0.903-0.813l0.216-0.942l-1.182,0.264l-0.311-0.378l0.222-0.354l-0.839-0.506l-0.357-1.286 l0.619-0.404l0.57,0.833l0.215,0.549l0.428,0.429l0.5,0.261l0.557-0.089l0.617-0.594l-0.435-0.792l-0.547,0.143l-0.495-0.59 l0.471-0.328l1.475,0.179v0.524l1.284,2.646l0.291-0.233C22.234,9.529,20.219,6.969,17.455,5.997z M16.785,9.571L16.111,9.75h-0.896 V9.286h-0.857l-0.679,0.178l-1.036-0.285l-0.285-0.536l1.428-0.321h1.43L15,7.75h0.715l0.396,0.893l0.674,0.237V9.571z M18.321,8.393l-1.214-0.214V7.75l0.607-0.143l0.178-0.215l0.429,0.357V8.393z" fill="url(#SVGID_5_)"/>
</g>
<g>
-<rect fill="none" height="30" width="30"/>
-<path d="M21,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S25.411,30,21,30L21,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -66 -46)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="87" x2="87" y1="-60.9688" y2="-75.1651">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S26.411,30,22,30L22,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="22" x2="22" y1="14.9683" y2="29.1646">
+<stop offset="0" style="stop-color:#FFC144"/>
+<stop offset="1" style="stop-color:#EF6902"/>
</linearGradient>
-<circle cx="21" cy="22" fill="url(#SVGID_1__)" r="7"/>
-<polygon fill-opacity="0.2" points="25.34,24 20.999,19.4 16.66,24 16,23.3 20.999,18 26,23.3 " stroke-opacity="0.2"/>
-<polygon fill-opacity="0.2" points="20.999,20.857 17,25.098 17,27 20,27 20,24 22,24 22,27 25,27 25,25.098 " stroke-opacity="0.2"/>
-<path d="M21,16c3.697,0,6.717,2.869,6.975,6.5 C27.986,22.334,28,22.169,28,22c0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C14.283,18.869,17.303,16,21,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<polygon fill="#FFFFFF" points="25.34,23 20.999,18.4 16.66,23 16,22.3 20.999,17 26,22.3 "/>
-<polygon fill="#FFFFFF" points="20.999,19.857 17,24.098 17,26 20,26 20,23 22,23 22,26 25,26 25,24.098 "/>
+<circle cx="22" cy="22" fill="url(#SVGID_1__)" r="7"/>
+<polygon fill-opacity="0.2" points="26.34,24 21.999,19.4 17.66,24 17,23.3 21.999,18 27,23.3 26.34,24 " stroke-opacity="0.2"/>
+<polygon fill-opacity="0.2" points="21.999,20.857 18,25.098 18,27 21,27 21,24 23,24 23,27 26,27 26,25.097 " stroke-opacity="0.2"/>
+<path d="M22,16c3.697,0,6.717,2.869,6.975,6.5C28.986,22.334,29,22.169,29,22c0-3.865-3.134-7-7-7 s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C15.283,18.869,18.303,16,22,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<polygon fill="#FFFFFF" points="26.34,23 21.999,18.4 17.66,23 17,22.3 21.999,17 27,22.3 26.34,23 "/>
+<polygon fill="#FFFFFF" points="21.999,19.857 18,24.098 18,26 21,26 21,23 23,23 23,26 26,26 26,24.097 "/>
+<rect fill="none" height="30" width="30"/>
</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address_work.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address_work.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<polygon fill-opacity="0.6" points="28,29 28,1 2,1 2,22.414 8.586,29 " stroke-opacity="0.6"/>
@@ -40,18 +40,20 @@
<path d="M17.455,5.997c-0.136,0.051-0.229,0.087-0.229,0.087l-2.058-0.395l-1.01,0.632l0.531,0.821 l-0.928,0.286l-0.5-0.286l0.176-0.499l-0.652,0.452l-0.117,0.786h-1.239l0.458,0.78l-1.742,1.421L9.816,11.5l0.646,1.252L10.852,13 l1.365-0.279l0.498,0.429l0.453,0.045l0.492,1.929l-0.328,0.853l0.725,1.603l0.205,0.665h1.263l0.714-0.386l0.539-0.625v-0.757 l1.023-0.522v-1.12l0.404-0.771l0.903-0.813l0.216-0.942l-1.182,0.264l-0.311-0.378l0.222-0.354l-0.839-0.506l-0.357-1.286 l0.619-0.404l0.57,0.833l0.215,0.549l0.428,0.429l0.5,0.261l0.557-0.089l0.617-0.594l-0.435-0.792l-0.547,0.143l-0.495-0.59 l0.471-0.328l1.475,0.179v0.524l1.284,2.646l0.291-0.233C22.234,9.529,20.219,6.969,17.455,5.997z M16.785,9.571L16.111,9.75h-0.896 V9.286h-0.857l-0.679,0.178l-1.036-0.285l-0.285-0.536l1.428-0.321h1.43L15,7.75h0.715l0.396,0.893l0.674,0.237V9.571z M18.321,8.393l-1.214-0.214V7.75l0.607-0.143l0.178-0.215l0.429,0.357V8.393z" fill="url(#SVGID_5_)"/>
</g>
<g>
+<rect fill="none" height="30" width="30"/>
<g>
-<rect fill="none" height="30" width="30"/>
+<path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S26.411,30,22,30L22,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -549.9609 -796.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="571.9609" x2="571.9609" y1="811.0391" y2="825.0391">
+<stop offset="0" style="stop-color:#A0A7A8"/>
+<stop offset="1" style="stop-color:#252629"/>
+</linearGradient>
+<circle cx="22" cy="22" fill="url(#SVGID_1__)" r="7"/>
+<path d="M22,16c3.697,0,6.717,2.869,6.975,6.5 C28.986,22.334,29,22.169,29,22c0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C15.283,18.869,18.303,16,22,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<polygon fill="#FFFFFF" points="24,19 24,20 26,20 26,21 24,21 24,22 26,22 26,23 24,23 24,26 27,26 27,19 "/>
+<path d="M17,19v7h2v-2h2v2h2v-9L17,19z M19,23h-1v-1h1V23z M19,21h-1v-1h1V21z M22,23h-1v-1h1V23z M22,21h-1v-1h1 V21z" fill="#FFFFFF"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="2" x="17" y="26"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="6" x="21" y="26"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="2" x="19" y="24"/>
</g>
-<path d="M21,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S25.411,30,21,30L21,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="21" x2="21" y1="14.9683" y2="29.1646">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
-</linearGradient>
-<circle cx="21" cy="22" fill="url(#SVGID_1__)" r="7"/>
-<path d="M22,21v-2h-5v8h4h1h3v-6H22z M21,25h-3v-1h3V25z M21,23h-3v-1h3V23z M18,21v-1h3v1H18z M24,25h-2v-1h2V25z M24,23h-2v-1h2V23z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M21,16c3.697,0,6.717,2.869,6.975,6.5C27.986,22.334,28,22.169,28,22c0-3.865-3.134-7-7-7 s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C14.283,18.869,17.303,16,21,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M22,20v-2h-5v8h4h1h3v-6H22z M21,24h-3v-1h3V24z M21,22h-3v-1h3V22z M18,20v-1h3v1H18z M24,24h-2v-1h2V24z M24,22h-2v-1h2V22z" fill="#FFFFFF"/>
-<rect fill-opacity="0.3" height="6" stroke-opacity="0.3" width="1" x="22" y="20"/>
</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_video.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_video.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<rect fill-opacity="0.6" height="26" width="28" x="1" y="2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M16,0C8.28,0,2,6.279,2,14c0,7.719,6.28,14,14,14s14-6.281,14-14C30,6.279,23.72,0,16,0z" fill-opacity="0.6" stroke-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip_home.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip_home.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M16,0C8.28,0,2,6.279,2,14c0,7.719,6.28,14,14,14s14-6.281,14-14C30,6.279,23.72,0,16,0z" fill-opacity="0.6" stroke-opacity="0.6"/>
@@ -58,17 +58,17 @@
<path d="M3.29,9.229c0.581-0.375,0.813-0.48,0.813-0.48c0.268-0.123,0.598,0.014,0.738,0.303 l2.66,5.506c0.141,0.293,0.043,0.629-0.226,0.75l-0.853,0.381L3.29,9.229z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
</g>
<g>
-<rect fill="none" height="30" width="30"/>
-<path d="M21,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S25.411,30,21,30L21,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -66 -46)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="87" x2="87" y1="-60.9688" y2="-75.1651">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S26.411,30,22,30L22,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="22" x2="22" y1="14.9683" y2="29.1646">
+<stop offset="0" style="stop-color:#FFC144"/>
+<stop offset="1" style="stop-color:#EF6902"/>
</linearGradient>
-<circle cx="21" cy="22" fill="url(#SVGID_1__)" r="7"/>
-<polygon fill-opacity="0.2" points="25.34,24 20.999,19.4 16.66,24 16,23.3 20.999,18 26,23.3 " stroke-opacity="0.2"/>
-<polygon fill-opacity="0.2" points="20.999,20.857 17,25.098 17,27 20,27 20,24 22,24 22,27 25,27 25,25.098 " stroke-opacity="0.2"/>
-<path d="M21,16c3.697,0,6.717,2.869,6.975,6.5 C27.986,22.334,28,22.169,28,22c0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C14.283,18.869,17.303,16,21,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<polygon fill="#FFFFFF" points="25.34,23 20.999,18.4 16.66,23 16,22.3 20.999,17 26,22.3 "/>
-<polygon fill="#FFFFFF" points="20.999,19.857 17,24.098 17,26 20,26 20,23 22,23 22,26 25,26 25,24.098 "/>
+<circle cx="22" cy="22" fill="url(#SVGID_1__)" r="7"/>
+<polygon fill-opacity="0.2" points="26.34,24 21.999,19.4 17.66,24 17,23.3 21.999,18 27,23.3 26.34,24 " stroke-opacity="0.2"/>
+<polygon fill-opacity="0.2" points="21.999,20.857 18,25.098 18,27 21,27 21,24 23,24 23,27 26,27 26,25.097 " stroke-opacity="0.2"/>
+<path d="M22,16c3.697,0,6.717,2.869,6.975,6.5C28.986,22.334,29,22.169,29,22c0-3.865-3.134-7-7-7 s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C15.283,18.869,18.303,16,22,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<polygon fill="#FFFFFF" points="26.34,23 21.999,18.4 17.66,23 17,22.3 21.999,17 27,22.3 26.34,23 "/>
+<polygon fill="#FFFFFF" points="21.999,19.857 18,24.098 18,26 21,26 21,23 23,23 23,26 26,26 26,24.097 "/>
+<rect fill="none" height="30" width="30"/>
</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip_work.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip_work.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M16,0C8.28,0,2,6.279,2,14c0,7.719,6.28,14,14,14s14-6.281,14-14C30,6.279,23.72,0,16,0z" fill-opacity="0.6" stroke-opacity="0.6"/>
@@ -58,18 +58,20 @@
<path d="M3.29,9.229c0.581-0.375,0.813-0.48,0.813-0.48c0.268-0.123,0.598,0.014,0.738,0.303 l2.66,5.506c0.141,0.293,0.043,0.629-0.226,0.75l-0.853,0.381L3.29,9.229z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
</g>
<g>
+<rect fill="none" height="30" width="30"/>
<g>
-<rect fill="none" height="30" width="30"/>
+<path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S26.411,30,22,30L22,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -549.9609 -796.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="571.9609" x2="571.9609" y1="811.0391" y2="825.0391">
+<stop offset="0" style="stop-color:#A0A7A8"/>
+<stop offset="1" style="stop-color:#252629"/>
+</linearGradient>
+<circle cx="22" cy="22" fill="url(#SVGID_1__)" r="7"/>
+<path d="M22,16c3.697,0,6.717,2.869,6.975,6.5 C28.986,22.334,29,22.169,29,22c0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C15.283,18.869,18.303,16,22,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<polygon fill="#FFFFFF" points="24,19 24,20 26,20 26,21 24,21 24,22 26,22 26,23 24,23 24,26 27,26 27,19 "/>
+<path d="M17,19v7h2v-2h2v2h2v-9L17,19z M19,23h-1v-1h1V23z M19,21h-1v-1h1V21z M22,23h-1v-1h1V23z M22,21h-1v-1h1 V21z" fill="#FFFFFF"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="2" x="17" y="26"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="6" x="21" y="26"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="2" x="19" y="24"/>
</g>
-<path d="M21,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S25.411,30,21,30L21,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="21" x2="21" y1="14.9683" y2="29.1646">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
-</linearGradient>
-<circle cx="21" cy="22" fill="url(#SVGID_1__)" r="7"/>
-<path d="M22,21v-2h-5v8h4h1h3v-6H22z M21,25h-3v-1h3V25z M21,23h-3v-1h3V23z M18,21v-1h3v1H18z M24,25h-2v-1h2V25z M24,23h-2v-1h2V23z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M21,16c3.697,0,6.717,2.869,6.975,6.5C27.986,22.334,28,22.169,28,22c0-3.865-3.134-7-7-7 s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C14.283,18.869,17.303,16,21,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M22,20v-2h-5v8h4h1h3v-6H22z M21,24h-3v-1h3V24z M21,22h-3v-1h3V22z M18,20v-1h3v1H18z M24,24h-2v-1h2V24z M24,22h-2v-1h2V22z" fill="#FFFFFF"/>
-<rect fill-opacity="0.3" height="6" stroke-opacity="0.3" width="1" x="22" y="20"/>
</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_vpn.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_vpn.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15,29C7.28,29,1,22.72,1,15S7.28,1,15,1s14,6.28,14,14S22.72,29,15,29L15,29z" fill-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wifi.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wifi.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15,29C7.279,29,1,22.719,1,15C1,7.279,7.279,1,15,1c7.719,0,14,6.279,14,14C29,22.719,22.719,29,15,29 L15,29z" fill-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15.491,29c-7.721,0-14-6.281-14-14c0-7.721,6.279-14,14-14c7.719,0,14,6.279,14,14 C29.491,22.719,23.21,29,15.491,29L15.491,29z" fill-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_offline.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_offline.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15.491,29c-7.721,0-14-6.281-14-14c0-7.721,6.279-14,14-14c7.719,0,14,6.279,14,14 C29.491,22.719,23.21,29,15.491,29L15.491,29z" fill-opacity="0.6"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_secure.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_secure.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="30" width="30"/>
<path d="M15.491,29c-7.721,0-14-6.281-14-14c0-7.721,6.279-14,14-14c7.719,0,14,6.279,14,14 C29.491,22.719,23.21,29,15.491,29L15.491,29z" fill-opacity="0.6"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_work.svg Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<g>
+<path d="M0,30V0h30v30H0z M23.599,26.25l-8.732-8.732L6.134,26.25H23.599z M26.25,23.599V6.134l-8.732,8.732 L26.25,23.599z M3.75,23.331l8.465-8.465L3.75,6.401V23.331z M14.866,12.215L23.33,3.75H6.402L14.866,12.215z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="0.9941" y2="29.1902">
+<stop offset="0" style="stop-color:#E6E6E6"/>
+<stop offset="0.6182" style="stop-color:#A8A8A8"/>
+<stop offset="1" style="stop-color:#CCCCCC"/>
+</linearGradient>
+<path d="M0.938,0.938v28.125h28.125V0.938H0.938z M13.541,14.866L2.813,25.595V4.138L13.541,14.866z M4.139,2.813h21.455L14.866,13.541L4.139,2.813z M14.866,16.192l10.995,10.995H3.871L14.866,16.192z M16.192,14.866L27.188,3.871 v21.99L16.192,14.866z" fill="url(#SVGID_1_)"/>
+<g>
+<polygon fill-opacity="0.6" points="8.547,25.313 7.61,17.813 5.625,17.813 5.625,12.199 24.375,12.199 24.375,17.813 22.391,17.813 21.453,25.313 " stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="12.103" y2="23.9943">
+<stop offset="0" style="stop-color:#A0F800"/>
+<stop offset="1" style="stop-color:#319E00"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2_)" points="6.563,13.137 6.563,16.875 8.438,16.875 9.375,24.375 20.625,24.375 21.563,16.875 23.438,16.875 23.438,13.137 "/>
+<path d="M13.125,14.063v-2.886c-0.348,0.048-0.692,0.073-1.03,0.073c-0.804,0-1.568-0.139-2.272-0.414 C5.866,9.294,5.955,6.329,5.96,6.204l0.019-0.408l0.312-0.265c0.103-0.088,1.06-0.855,2.881-0.855c0.958,0,1.99,0.212,3.066,0.632 c1.3,0.506,2.174,1.126,2.762,1.716c0.588-0.589,1.462-1.209,2.762-1.716c1.076-0.42,2.108-0.632,3.066-0.632 c1.82,0,2.777,0.767,2.881,0.855l0.313,0.265l0.019,0.408c0.005,0.125,0.094,3.091-3.862,4.632 c-0.704,0.275-1.469,0.414-2.272,0.414c-0.338,0-0.683-0.025-1.03-0.073v2.886H13.125z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M10.163,9.963c1.436,0.559,2.896,0.346,3.899,0.057v3.105h1.875V10.02 c1.003,0.289,2.464,0.502,3.899-0.057c3.375-1.316,3.267-3.717,3.267-3.717s-1.627-1.379-5.002-0.064 C16.242,6.907,15.392,7.849,15,8.551c-0.392-0.702-1.242-1.644-3.102-2.369C8.523,4.866,6.896,6.246,6.896,6.246 S6.788,8.647,10.163,9.963z" fill="url(#SVGID_3_)"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="4.9224" y2="12.8702">
+<stop offset="0" style="stop-color:#A0F800"/>
+<stop offset="1" style="stop-color:#319E00"/>
+</linearGradient>
+</defs>
+</g>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.9995" x2="14.9995" y1="12.5542" y2="17.3683">
+<stop offset="0" style="stop-color:#D07100"/>
+<stop offset="1" style="stop-color:#A23600"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" height="3.738" width="16.875" x="6.563" y="13.137"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9995" x2="14.9995" y1="16.8408" y2="24.5597">
+<stop offset="0" style="stop-color:#D07100"/>
+<stop offset="1" style="stop-color:#A23600"/>
+</linearGradient>
+<polygon fill="url(#SVGID_5_)" points="20.625,24.375 9.375,24.375 8.438,16.875 21.563,16.875 "/>
+<path d="M23.104,6.246c0,0-1.627-1.379-5.002-0.064C16.242,6.907,15.392,7.849,15,8.551 c-0.392-0.702-1.242-1.644-3.102-2.369C8.523,4.866,6.896,6.246,6.896,6.246s-0.109,2.401,3.267,3.717 c1.436,0.559,2.896,0.346,3.899,0.057v3.105h1.875V10.02c1.003,0.289,2.464,0.502,3.899-0.057 C23.212,8.647,23.104,6.246,23.104,6.246z" fill="url(#SVGID_3_)"/>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<path d="M14.063,9.082c-1.003,0.289-2.464,0.502-3.899-0.057C8.06,8.205,7.31,6.963,7.042,6.144 c-0.094,0.06-0.146,0.102-0.146,0.102s-0.109,2.401,3.267,3.717c1.436,0.559,2.896,0.346,3.899,0.057V9.082z"/>
+<path d="M22.958,6.144c-0.268,0.819-1.018,2.061-3.121,2.881c-1.436,0.559-2.896,0.346-3.899,0.057v0.938 c1.003,0.289,2.464,0.502,3.899-0.057c3.375-1.316,3.267-3.717,3.267-3.717S23.052,6.204,22.958,6.144z"/>
+<rect height="0.938" width="1.875" x="14.063" y="12.188"/>
+</g>
+<rect fill="#FFFFFF" fill-opacity="0.3" height="0.926" stroke-opacity="0.3" width="16.875" x="6.563" y="13.137"/>
+<polygon fill-opacity="0.2" points="21.445,17.813 21.563,16.875 8.438,16.875 8.555,17.813 " stroke-opacity="0.2"/>
+</g>
+</g>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_battery.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_battery.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
+<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="16" width="16"/>
<path d="M3,3.5v11.5h10v-11.5h-10zm8,9.5h-6v-7.5h6v7.5z"/>
<rect height="2" width="5" x="5.5" y="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
+<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="16" width="16"/>
<path d="M11.88,5.274l-4.774-4.774v5.454l-2.047-2.046-0.936,0.939s2.117,2.118,2.984,2.982v0.342c-0.867,0.862-2.984,2.982-2.984,2.982l0.937,0.936,2.047-2.042v5.45l4.771-4.773s-2.075-2.076-2.727-2.726c0.649-0.66,2.727-2.73,2.727-2.73zm-1.88,5.456c-0.339,0.338-0.955,0.956-1.538,1.538v-3.078c0.587,0.583,1.226,1.218,1.538,1.538zm-1.53-3.923v-3.069c0.579,0.583,1.195,1.199,1.534,1.538-0.312,0.309-0.951,0.951-1.53,1.531z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_egprs.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_egprs.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
+<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="16" width="16"/>
<path d="M12.5,9.081h-7.925v3.323h10.01v2.6h-13.16v-14h13.16v2.597h-10v2.907h7.922v2.577z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_gps.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_gps.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
+<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="16" width="16"/>
<path d="M8.777,4.889l0.687,0.687-0.472,0.471c-0.625-0.317-1.36-0.316-1.985,0l-1.249-1.249-0.96,0.959,1.249,1.25c-0.315,0.624-0.316,1.359,0,1.983l-0.471,0.474-0.687-0.687-3.889,3.893,2.334,2.33,3.889-3.889-0.687-0.688,0.472-0.471c0.625,0.316,1.36,0.315,1.984-0.001l1.25,1.25,0.96-0.96-1.25-1.25c0.316-0.623,0.317-1.36,0.001-1.983l0.471-0.473,0.688,0.686,3.89-3.887-2.33-2.333-3.893,3.889z"/>
<rect height="0.831" transform="matrix(0.7069 -0.7073 0.7073 0.7069 -1.7029 4.1127)" width="3.299" x="2.461" y="3.696"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_hsdpa.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_hsdpa.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
+<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="16" width="16"/>
<path d="M1.363,7.515c0.315,0.176,1.042,0.469,1.768,0.469,0.924,0,1.393-0.445,1.393-1.007,0-0.76-0.749-1.1-1.521-1.1h-0.727v-1.276h0.69c0.597,0,1.346-0.234,1.346-0.878,0-0.457-0.363-0.795-1.124-0.795-0.621,0-1.276,0.269-1.58,0.457l-0.362-1.289c0.457-0.292,1.358-0.574,2.353-0.574,1.615,0,2.517,0.854,2.517,1.896,0,0.808-0.456,1.452-1.393,1.768v0.023c0.913,0.164,1.65,0.854,1.65,1.861,0,1.334-1.182,2.318-3.113,2.318-0.983,0-1.815-0.257-2.26-0.527l0.363-1.346z"/>
<path d="M8,9.389c-0.598,0-1.03-0.457-1.03-1.078,0-0.644,0.433-1.088,1.053-1.088,0.61,0,1.031,0.434,1.042,1.088,0,0.621-0.421,1.078-1.052,1.078h-0.013z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_missed_call.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_missed_call.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
+<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="16" width="16"/>
<path d="M12.31,9.615c0,1.484-1.208,2.692-2.692,2.692s-2.695-1.21-2.695-2.695v-2.154h3.77l-4.844-6.461-4.846,6.461h3.231v2.154c0,2.965,2.423,5.385,5.384,5.385,2.965,0,5.385-2.42,5.385-5.385h-2.692z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_email.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_email.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
+<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="16" width="16"/>
<path d="M12.31,9.615c0,1.484-1.208,2.692-2.692,2.692s-2.695-1.21-2.695-2.695v-2.154h3.77l-4.844-6.461-4.846,6.461h3.231v2.154c0,2.965,2.423,5.385,5.384,5.385,2.965,0,5.385-2.42,5.385-5.385h-2.692z" display="none"/>
<path d="M15,7.988c0,1.123-0.225,2.095-0.676,2.915-0.547,1.01-1.339,1.519-2.376,1.519-1.005,0-1.731-0.509-2.186-1.519-0.54,0.59-1.244,0.89-2.108,0.89-1.016,0-1.828-0.39-2.442-1.164-0.568-0.72-0.853-1.592-0.853-2.627,0-1.042,0.284-1.912,0.853-2.612,0.606-0.755,1.421-1.13,2.442-1.13,0.76,0,1.358,0.206,1.796,0.62v-0.461h1.476v5.097c0,0.988,0.344,1.482,1.032,1.482,0.561,0,0.994-0.388,1.297-1.162,0.223-0.577,0.335-1.191,0.335-1.85,0-1.522-0.55-2.822-1.644-3.903-1.1-1.085-2.41-1.623-3.94-1.623-1.539,0-2.846,0.536-3.921,1.61-1.076,1.076-1.616,2.379-1.616,3.916,0,1.536,0.539,2.846,1.622,3.925,1.079,1.088,2.385,1.626,3.916,1.626v1.46c-1.93,0-3.58-0.687-4.947-2.057-1.368-1.376-2.053-3.027-2.053-4.954,0-1.918,0.686-3.564,2.058-4.935,1.371-1.365,3.016-2.051,4.941-2.051,1.93,0,3.579,0.682,4.948,2.05,1.36,1.364,2.05,3.01,2.05,4.938zm-5.647-0.056c0-1.49-0.568-2.236-1.707-2.236-0.57,0-1.013,0.254-1.32,0.762-0.269,0.43-0.399,0.941-0.399,1.541,0,1.567,0.572,2.349,1.718,2.349,1.139,0,1.708-0.808,1.708-2.418z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_im.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_im.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
+<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="16" width="16"/>
<path d="M8.001,2.001c-3.86,0-7,2.384-7,5.313,0,1.571,0.909,3.051,2.495,4.066l0.157,2.62,2.277-1.632c0.672,0.158,1.362,0.26,2.071,0.26,3.859,0,7-2.384,7-5.314s-3.14-5.315-6.999-5.315zm0,9.429c-0.557,0-1.145-0.074-1.796-0.228l-0.531-0.125-0.953,0.68-0.063-1.061-0.515-0.33c-1.234-0.789-1.941-1.903-1.941-3.055,0-2.229,2.656-4.113,5.799-4.113s5.8,1.884,5.8,4.113c0,2.23-2.66,4.115-5.799,4.115z"/>
<rect height="1.359" width="7.281" x="4.359" y="5.32"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_message.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_message.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
+<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="16" width="16"/>
<path d="M1,3.059v9.883h14v-9.881h-14zm1.235,2.226l2.822,2.47-2.822,2.999v-5.465zm0.118-0.991h11.29l-5.64,4.941-5.647-4.941zm11.41,7.416h-11.52v-0.052l3.286-3.492,2.479,2.162,2.479-2.168,3.286,3.492v0.056zm-2.82-3.955l2.822-2.473v5.472l-2.82-2.995z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_offline.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_offline.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
+<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="16" width="16"/>
<path d="M1,1v2.545c0,0,3.234,3.232,5.084,5.088V15h2.549V8.634c1.857-1.856,5.094-5.088,5.094-5.088V1H1.006H1z M2.2,3.048V2.2 h3.908v4.761C4.797,5.648,2.784,3.632,2.2,3.048z M12.52,3.048L8.605,6.961V2.2h3.916v0.848H12.52z"/>
<polygon points="15,10.051 13.949,9 12.003,10.953 10.057,9 9,10.051 10.953,12.002 9,13.949 10.057,15 12.003,13.053 13.949,15 15,13.949 13.053,12.002 "/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_profile_silent.svg Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="16" width="16"/>
+<path d="M7.667,11.472l-0.713-0.236c-0.393-0.131-0.809-0.195-1.238-0.195c-1.685,0-3.055,1.02-3.055,2.272s1.371,2.273,3.055,2.273 c1.764,0,3.369-1.084,3.369-2.273v-2.396L7.667,9.501V11.472z M7.667,0.586v5.248l1.418,1.415V4.15l3.754,1.219V2.138L7.667,0.586z"/>
+<rect height="17.357" transform="matrix(0.7057 -0.7085 0.7085 0.7057 -3.3132 8.0219)" width="1.053" x="7.473" y="-0.679"/>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress_1.svg Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
-<path d="M6.974,13.21c-2.406-0.49-4.224-2.63-4.224-5.21,0-2.574,1.82-4.723,4.224-5.209v-1.791c-3.378,0.504-5.974,3.441-5.974,7s2.596,6.497,5.974,7v-1.791z"/>
-<path d="M9.025,1v1.792c2.405,0.485,4.225,2.634,4.225,5.208s-1.818,4.725-4.225,5.209v1.79c3.375-0.5,5.975-3.44,5.975-7,0-3.559-2.6-6.496-5.975-7z"/>
-<rect fill="none" height="16" width="16"/>
-</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress_2.svg Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
-<path d="M4.111,11.62c-1.664-1.811-1.875-4.621-0.364-6.708,1.511-2.085,4.247-2.755,6.479-1.735l1.052-1.451c-3.036-1.579-6.863-0.726-8.952,2.157s-1.711,6.789,0.73,9.183l1.053-1.45z"/>
-<path d="M12.94,2.933l-1.051,1.452c1.664,1.808,1.875,4.617,0.363,6.703-1.512,2.084-4.247,2.756-6.479,1.734l-1.052,1.451c3.031,1.578,6.861,0.725,8.949-2.158,2.09-2.877,1.71-6.782-0.73-9.177z"/>
-<rect fill="none" height="16" width="16"/>
-</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress_3.svg Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
-<rect fill="none" height="16" width="16"/>
-<path d="M2.729,8.637c-0.285-2.44,1.195-4.838,3.644-5.636s5.056,0.269,6.264,2.407l1.703-0.556c-1.527-3.059-5.125-4.62-8.509-3.517-3.385,1.103-5.374,4.486-4.806,7.856l1.704-0.554z"/>
-<path d="M14.98,6.807l-1.705,0.555c0.285,2.44-1.195,4.838-3.643,5.637-2.448,0.798-5.057-0.267-6.264-2.408l-1.703,0.556c1.525,3.06,5.125,4.621,8.51,3.518,3.38-1.11,5.36-4.49,4.8-7.863z"/>
-</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress_4.svg Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
-<rect fill="none" height="16" width="16"/>
-<path d="M3.363,5.413c1.206-2.139,3.811-3.208,6.259-2.412,2.448,0.795,3.931,3.192,3.649,5.63l1.703,0.554c0.564-3.372-1.426-6.75-4.811-7.85-3.381-1.099-6.977,0.465-8.499,3.525l1.702,0.553z"/>
-<path d="M14.34,11.14l-1.705-0.553c-1.203,2.141-3.81,3.208-6.257,2.412s-3.936-3.193-3.654-5.634l-1.703-0.553c-0.565,3.371,1.427,6.752,4.811,7.85,3.386,1.1,6.983-0.46,8.503-3.52z"/>
-</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress_5.svg Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
-<rect fill="none" height="16" width="16"/>
-<path d="M5.772,3.183c2.23-1.021,4.964-0.353,6.476,1.73,1.512,2.082,1.301,4.891-0.36,6.699l1.052,1.447c2.437-2.393,2.813-6.296,0.724-9.174-2.089-2.879-5.914-3.73-8.942-2.15l1.054,1.447z"/>
-<path d="M11.28,14.27l-1.053-1.449c-2.23,1.022-4.963,0.354-6.475-1.729-1.515-2.084-1.305-4.893,0.357-6.7l-1.052-1.449c-2.438,2.393-2.813,6.297-0.725,9.176,2.09,2.88,5.915,3.72,8.945,2.15z"/>
-</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_signal.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_signal.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
+<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="16" width="16"/>
<path d="M1.637,1v2.545s3.234,3.232,5.084,5.088v6.367h2.549v-6.366c1.858-1.856,5.093-5.088,5.093-5.088v-2.546h-12.72zm1.2,2.048v-0.848h3.908v4.761c-1.311-1.313-3.324-3.329-3.908-3.913zm10.32,0l-3.915,3.913v-4.761h3.917v0.848z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wcdma.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wcdma.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
+<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="16" width="16"/>
<path d="M1.402,10.28c0.349,0.195,1.153,0.52,1.956,0.52,1.022,0,1.541-0.492,1.541-1.115,0-0.841-0.829-1.217-1.684-1.217h-0.802v-1.412h0.763c0.661,0,1.49-0.26,1.49-0.972,0-0.506-0.401-0.881-1.244-0.881-0.687,0-1.412,0.298-1.748,0.506l-0.401-1.426c0.505-0.323,1.502-0.635,2.603-0.635,1.787,0,2.784,0.945,2.784,2.099,0,0.894-0.505,1.605-1.541,1.955v0.026c1.01,0.182,1.826,0.946,1.826,2.061,0,1.475-1.308,2.563-3.444,2.563-1.088,0-2.008-0.283-2.5-0.582l0.401-1.49z"/>
<path d="M15,11.87c-0.598,0.199-1.736,0.48-2.868,0.48-1.564,0-2.696-0.396-3.487-1.14-0.776-0.745-1.207-1.859-1.207-3.109,0.01-2.836,2.086-4.454,4.898-4.454,1.104,0,1.957,0.214,2.383,0.405l-0.408,1.556c-0.473-0.215-1.047-0.365-1.988-0.365-1.614,0-2.851,0.909-2.851,2.754,0,1.772,1.122,2.796,2.712,2.796,0.432,0,0.788-0.052,0.942-0.114v-1.796h-1.31v-1.503h3.2v4.49z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wlan.svg Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wlan.svg Fri Jun 11 13:58:22 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
+<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
<rect fill="none" height="16" width="16"/>
<path d="M10.29,13.12l-1.668-6.652c0.732-0.26,1.258-0.938,1.258-1.756,0-1.041-0.842-1.883-1.881-1.883-1.04,0-1.883,0.841-1.883,1.883,0,0.817,0.525,1.494,1.254,1.756l-1.661,6.651h-2.42v1.88h9.41v-1.881h-2.413z"/>
<path d="M1.621,4.713c0,2.103,1.152,3.656,1.188,3.708,0.189-0.128,0.511-0.35,0.702-0.478-0.038-0.049-1.046-1.478-1.046-3.23,0-1.896,1.008-3.179,1.046-3.233-0.192-0.13-0.511-0.352-0.698-0.48-0.038,0.053-1.192,1.672-1.192,3.713z"/>
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbinputdialogcontentwidget/hbinputdialogcontentwidget.css Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbinputdialogcontentwidget/hbinputdialogcontentwidget.css Fri Jun 11 13:58:22 2010 +0300
@@ -19,7 +19,8 @@
HbInputDialogContentWidget::label-1:portrait {
top:-var(hb-param-margin-gene-popup);
- text-line-count-max: 1;
+ text-line-count-min:1;
+ text-line-count-max:2;
font-variant:secondary;
text-height:var(hb-param-text-height-secondary);
text-align:left;
@@ -38,7 +39,8 @@
HbInputDialogContentWidget::label-2:portrait
{
- text-line-count-max: 1;
+ text-line-count-min:1;
+ text-line-count-max:2;
font-variant:secondary;
text-height:var(hb-param-text-height-secondary);
@@ -59,7 +61,8 @@
min-width: expr((((var(hb-param-screen-short-edge)-(2*var(hb-param-margin-gene-screen)))-(2*var(hb-param-margin-gene-popup)))/2));
size-policy-horizontal: preferred;
- text-line-count-max: 1;
+ text-line-count-min:1;
+ text-line-count-max:2;
font-variant:secondary;
text-height:var(hb-param-text-height-secondary);
@@ -81,7 +84,8 @@
HbInputDialogContentWidget::label-2:landscape {
size-policy-horizontal: expanding;
- text-line-count-max: 1;
+ text-line-count-min:1;
+ text-line-count-max:2;
min-width: expr((((var(hb-param-screen-short-edge)-(2*var(hb-param-margin-gene-screen)))-(2*var(hb-param-margin-gene-popup)))/2));
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblabel/hblabel.css Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblabel/hblabel.css Fri Jun 11 13:58:22 2010 +0300
@@ -24,6 +24,5 @@
bottom:var(hb-param-margin-gene-popup);
text-height:var(hb-param-text-height-primary);
text-align:left;
- text-line-count-max: 1;
font-variant:primary;
}
\ No newline at end of file
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbmenu/hbmenu.css Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbmenu/hbmenu.css Fri Jun 11 13:58:22 2010 +0300
@@ -3,6 +3,7 @@
layout:default;
submenu-right-offset: 2.25un;
submenu-bottom-margin: var(hb-param-margin-gene-screen);
+ number-of-columns: 1;
}
HbMenu::content
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbmenuitem/hbmenuitem.css Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbmenuitem/hbmenuitem.css Fri Jun 11 13:58:22 2010 +0300
@@ -20,7 +20,8 @@
bottom: var(hb-param-margin-gene-bottom);
font-variant: primary;
text-height: var(hb-param-text-height-primary);
- text-line-count-max: 1;
+ text-line-count-min:1;
+ text-line-count-max:1;
}
HbMenuItem[separator_exists]::text
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbmessageboxcontentwidget/hbmessageboxcontentwidget.css Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbmessageboxcontentwidget/hbmessageboxcontentwidget.css Fri Jun 11 13:58:22 2010 +0300
@@ -22,11 +22,11 @@
HbMessageBoxContentWidget::text[hasIcon="true"]
{
- fixed-width: expr(var(hb-param-screen-short-edge)-4*var(hb-param-margin-gene-screen)-var(hb-param-graphic-size-primary-large))
+ min-width: expr(var(hb-param-screen-short-edge)-4*var(hb-param-margin-gene-screen)-var(hb-param-graphic-size-primary-large))
}
HbMessageBoxContentWidget::text[hasIcon="false"]
{
- fixed-width: expr(var(hb-param-screen-short-edge)-2*var(hb-param-margin-gene-screen))
+ min-width: expr(var(hb-param-screen-short-edge)-2*var(hb-param-margin-gene-screen))
}
HbMessageBoxContentWidget::icon
{
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectioncontrol/hbselectioncontrol.css Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectioncontrol/hbselectioncontrol.css Fri Jun 11 13:58:22 2010 +0300
@@ -1,13 +1,13 @@
HbSelectionControl::handle-icon
{
- fixed-width:2.4un;
- fixed-height:2.4un;
+ fixed-width:var(hb-param-graphic-size-secondary);
+ fixed-height:var(hb-param-graphic-size-secondary);
}
HbSelectionControl::handle-toucharea
{
- fixed-height:9.0un;
- fixed-width:9.0un;
+ fixed-height:var(hb-param-touch-area-gene-primary-large);
+ fixed-width:var(hb-param-touch-area-gene-primary-large);
}
--- a/src/hbcore/resources/themes/style/hbdefault/variables/color/hbcolorgroup.css Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/variables/color/hbcolorgroup.css Fri Jun 11 13:58:22 2010 +0300
@@ -51,6 +51,9 @@
qtc_multimedia_trans:#FFFFFF; /* Modified 19.02.2010 */
qtc_multimedia_trans_pressed:#FFFFFF; /* Added 19.02.2010 */
qtc_multimedia_trans_disabled:#787878; /* Added 09.03.2010 */
+
+/* Application specific - Messaging */
+qtc_messaging_char_count:#FFFFFF; /* Added 19.04.2010 */
}
/* Widget color groups */
--- a/src/hbcore/style/hbstyle.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/style/hbstyle.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -23,6 +23,7 @@
**
****************************************************************************/
+#include "hbstyle_p.h"
#include "hbstyleoptionslider_p.h"
#include "hbstyleoptionsliderelement_p.h"
#include "hbstyleoptionpushbutton_p.h"
@@ -49,7 +50,6 @@
#include "hbstyleoptionindicatorbutton_p.h"
#include "hbstyleoptionsignalindicator_p.h"
#include "hbstyleoptionbatteryindicator_p.h"
-#include "hbstyle_p.h"
#include "hbstyleloader.h"
#include "hbwidgetloader_p.h"
#include "hbwidget_p.h"
@@ -132,7 +132,7 @@
call the updatePrimitive method.
Generally primitives should be updated only when a state change occurs. When a widget uses primitives to construct
- itself it does not need a paint() method at all since primitives (widget's childs) are doing the drawing.
+ itself it does not need a paint() method at all since primitives (widget's children) are doing the drawing.
Painting for the primitives occurs from the graphics scene.
*/
@@ -3384,7 +3384,7 @@
if (const HbStyleOptionRatingSlider *opt = qstyleoption_cast<const HbStyleOptionRatingSlider *>(option)) {
HbRepeatItem *repeatItem = static_cast<HbRepeatItem*>(item);
repeatItem->setRepeatingNumber(opt->noOfStars);
- if(opt->unRatedGraphicsName != QString()){
+ if (!opt->unRatedGraphicsName.isEmpty()) {
repeatItem->setName(opt->unRatedGraphicsName);
}
else {
@@ -3403,7 +3403,7 @@
repeatItem->setMaximum(opt->noOfIntervals);
repeatItem->setInverted(opt->inverted);
repeatItem->setRepeatingNumber(opt->noOfStars);
- if(opt->ratedGraphicsName != QString()){
+ if (!opt->ratedGraphicsName.isEmpty()) {
repeatItem->setName(opt->ratedGraphicsName);
}
else {
@@ -3762,38 +3762,37 @@
}
#endif
+ QGraphicsLayoutItem* lItem = (item && item->isWidget()) ? (QGraphicsLayoutItem*)static_cast<QGraphicsWidget*>(item) : 0;
+ if ( !lItem ) {
+ lItem = widget->layoutPrimitive(name);
+ if ( lItem && !lItem->graphicsItem() ) {
+ // assume it is spacer
+ static_cast<HbMeshLayout*>(widget->layout())->setItemId( lItem, name );
+ }
+ }
+
HbDeviceProfile profile(HbDeviceProfile::profile(widget));
const HbVector<HbCss::Declaration> decl = declarations(styleRules, name, widget, profile);
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Number of maching CSS declarations: " << decl.count();
+ qDebug() << "HbStyle::polishItem : -- Number of matching CSS declarations: " << decl.count();
#endif
HbCss::ValueExtractor extractor(decl, layoutParameters, profile);
- HbCss::GeometryValues geomValues;
- HbCss::PositionValues posValues;
-
- bool extracted = extractor.extractGeometry(geomValues);
-#ifndef HBSTYLE_DEBUG
- Q_UNUSED(extracted);
-#endif
+ HbCss::KnownProperties prop;
+
+ if ( !extractor.extractKnownProperties(prop) ) {
#ifdef HBSTYLE_DEBUG
- if ( !extracted ) {
- qDebug() << "HbStyle::polishItem : -- No geometry overrides found";
- }
+ qDebug() << "HbStyle::polishItem : -- No polish overrides found";
#endif
- extracted = extractor.extractPosition(posValues);
-#ifdef HBSTYLE_DEBUG
- if ( !extracted ) {
- qDebug() << "HbStyle::polishItem : -- No position overrides found";
+ return;
}
-#endif
if ( item ) {
- if (posValues.mFlags & HbCss::ExtractedZValue) {
+ if (prop.mFlags & HbCss::ExtractedZValue) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting zvalue: " << posValues.mZ;
+ qDebug() << "HbStyle::polishItem : -- Setting zvalue: " << prop.mZ;
#endif
- item->setZValue(posValues.mZ);
+ item->setZValue(prop.mZ);
}
}
@@ -3801,13 +3800,13 @@
? static_cast<QGraphicsWidget*>(item)
: 0;
if ( gWidget ) {
- if (posValues.mFlags & HbCss::ExtractedLayoutDirection) {
+ if (prop.mFlags & HbCss::ExtractedLayoutDir) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting layout direction: " << posValues.mLayoutDirection;
+ qDebug() << "HbStyle::polishItem : -- Setting layout direction: " << prop.mLayoutDir;
#endif
- if (posValues.mLayoutDirection == HbCss::LayoutDirection_LeftToRight) {
+ if (prop.mLayoutDir == HbCss::LayoutDirection_LeftToRight) {
gWidget->setLayoutDirection(Qt::LeftToRight);
- } else if (posValues.mLayoutDirection == HbCss::LayoutDirection_RightToLeft) {
+ } else if (prop.mLayoutDir == HbCss::LayoutDirection_RightToLeft) {
gWidget->setLayoutDirection(Qt::RightToLeft);
} else {
gWidget->unsetLayoutDirection();
@@ -3818,227 +3817,181 @@
HbWidgetBase *hbWidget = qobject_cast<HbWidgetBase*>(gWidget);
if ( hbWidget ) {
HbWidgetBasePrivate* hbWidget_p = HbWidgetBasePrivate::d_ptr(hbWidget);
- QFont font;
- HbFontSpec fontSpec;
- int dummy;
- if (extractor.extractFont(&font, &fontSpec, &dummy)) {
- if ( !fontSpec.isNull() ) {
- if ( font == QFont() ) {
+ if ( prop.mFlags & HbCss::ExtractedFontSpec ) {
+ if ( !(prop.mFlags & HbCss::ExtractedFont) ) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting fontspec: " << fontSpec.role();
+ qDebug() << "HbStyle::polishItem : -- Setting fontspec: " << prop.mFontSpec.role() << prop.mFontSpec.textHeight();
#endif
- hbWidget->setFontSpec(fontSpec);
- } else {
-#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting fontspec with overrides: "
- << fontSpec.role() << font;
-#endif
- hbWidget->setFont(fontSpec.font().resolve(font));
- }
+ hbWidget->setFontSpec(prop.mFontSpec);
} else {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting explicit font: " << font;
+ qDebug() << "HbStyle::polishItem : -- Setting fontspec with overrides: "
+ << prop.mFontSpec.role() << prop.mFontSpec.textHeight() << prop.mFont;
#endif
- hbWidget->setFont(font);
+ hbWidget->setFont(prop.mFontSpec.font().resolve(prop.mFont));
}
+ } else if ( prop.mFlags & HbCss::ExtractedFont ) {
+#ifdef HBSTYLE_DEBUG
+ qDebug() << "HbStyle::polishItem : -- Setting explicit font: " << prop.mFont;
+#endif
+ hbWidget->setFont(prop.mFont);
}
HbIconItem* icon = qobject_cast<HbIconItem*>(hbWidget);
if (icon) {
- Qt::AspectRatioMode mode;
- if (extractor.extractAspectRatioMode(&mode)
+ if (prop.mFlags & HbCss::ExtractedAspectRatioMode
&& !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_IconAspectRatioMode)) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting aspect ratio mode: " << mode;
+ qDebug() << "HbStyle::polishItem : -- Setting aspect ratio mode: " << prop.mAspectRatioMode;
#endif
- icon->setAspectRatioMode(mode);
+ icon->setAspectRatioMode(prop.mAspectRatioMode);
hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_IconAspectRatioMode, false);
}
- if(!hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_IconBrush)){
- QBrush brush;
- QString uri;
- HbCss::Repeat repeat = HbCss::Repeat_XY;
- Qt::Alignment alignment = Qt::AlignTop | Qt::AlignLeft;
- HbCss::Attachment attachment = HbCss::Attachment_Scroll;
- HbCss::Origin origin = HbCss::Origin_Padding;
- HbCss::Origin clip = HbCss::Origin_Border;
- if (extractor.extractBackground(&brush, &uri, &repeat, &alignment, &origin, &attachment, &clip)) {
-#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting icon background: " << brush;
-#endif
- icon->setBrush( brush );
- } else {
-#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Resetting icon background";
-#endif
- icon->setBrush( QBrush() );
- }
- hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_IconBrush, false);
- }
}
HbTextItem* text = qobject_cast<HbTextItem*>(hbWidget);
if (text) {
- HbCss::TextValues textValues;
- if ( extractor.extractTextValues( textValues ) ) {
- if ( textValues.mFlags & HbCss::ExtractedLineCountMin
- && !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMin)) {
+ if ( prop.mFlags & HbCss::ExtractedMinLines
+ && !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMin)) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting text min lines: " << textValues.mLineCountMin;
+ qDebug() << "HbStyle::polishItem : -- Setting text min lines: " << prop.mMinLines;
#endif
- text->setMinimumLines( textValues.mLineCountMin );
- hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMin, false);
- }
- if ( textValues.mFlags & HbCss::ExtractedLineCountMax
- && !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMax)) {
+ text->setMinimumLines( prop.mMinLines );
+ hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMin, false);
+ }
+ if ( prop.mFlags & HbCss::ExtractedMaxLines
+ && !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMax)) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting text max lines: " << textValues.mLineCountMax;
+ qDebug() << "HbStyle::polishItem : -- Setting text max lines: " << prop.mMaxLines;
#endif
- text->setMaximumLines( textValues.mLineCountMax );
- hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMax, false);
- }
+ text->setMaximumLines( prop.mMaxLines );
+ hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMax, false);
}
- if ( posValues.mFlags & HbCss::ExtractedTextAlign
+ if ( prop.mFlags & HbCss::ExtractedTextAlign
&& !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextAlign)) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting text alignment: " << posValues.mTextAlignment;
+ qDebug() << "HbStyle::polishItem : -- Setting text alignment: " << prop.mTextAlignment;
#endif
- text->setAlignment( posValues.mTextAlignment );
+ text->setAlignment( prop.mTextAlignment );
hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextAlign, false);
}
- if ( posValues.mFlags & HbCss::ExtractedWrapMode
+ if ( prop.mFlags & HbCss::ExtractedWrapMode
&& !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextWrapMode)) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting wrap mode : " << posValues.mTextWrapMode;
+ qDebug() << "HbStyle::polishItem : -- Setting wrap mode : " << prop.mTextWrapMode;
#endif
- text->setTextWrapping( posValues.mTextWrapMode );
+ text->setTextWrapping( prop.mTextWrapMode );
hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextWrapMode, false);
}
}
HbRichTextItem* richtext = qobject_cast<HbRichTextItem*>(hbWidget);
if (richtext) {
- if ( posValues.mFlags & HbCss::ExtractedTextAlign
+ if ( prop.mFlags & HbCss::ExtractedTextAlign
&& !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextAlign)) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting text alignment: " << posValues.mTextAlignment;
+ qDebug() << "HbStyle::polishItem : -- Setting text alignment: " << prop.mTextAlignment;
#endif
- richtext->setAlignment( posValues.mTextAlignment );
+ richtext->setAlignment( prop.mTextAlignment );
hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextAlign, false);
}
- if ( posValues.mFlags & HbCss::ExtractedWrapMode
+ if ( prop.mFlags & HbCss::ExtractedWrapMode
&& !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextWrapMode)) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting wrap mode : " << posValues.mTextWrapMode;
+ qDebug() << "HbStyle::polishItem : -- Setting wrap mode : " << prop.mTextWrapMode;
#endif
- richtext->setTextWrapping( posValues.mTextWrapMode );
+ richtext->setTextWrapping( prop.mTextWrapMode );
hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextWrapMode, false);
}
}
HbFrameItem *frame = qobject_cast<HbFrameItem*>(hbWidget);
if (frame && !frame->frameDrawer().d->testBorderApiProtectionFlag()) {
- qreal borderWidths[HbCss::NumEdges] = { 0.0,0.0,0.0,0.0 };
- QBrush borderColors[HbCss::NumEdges];
- HbCss::BorderStyle borderStyles[HbCss::NumEdges];
- QSize borderRadii[4];
-
- if (extractor.extractBorder(borderWidths,borderColors,borderStyles,borderRadii)) {
+ if (prop.mFlags & HbCss::ExtractedBorderWidths) {
#ifdef HBSTYLE_DEBUG
qDebug() << "HbStyle::polishItem : -- Setting border widths (l,t,r,b):"
- << borderWidths[HbCss::LeftEdge]
- << borderWidths[HbCss::TopEdge]
- << borderWidths[HbCss::RightEdge]
- << borderWidths[HbCss::BottomEdge];
+ << prop.mBorderWidths[HbCss::LeftEdge]
+ << prop.mBorderWidths[HbCss::TopEdge]
+ << prop.mBorderWidths[HbCss::RightEdge]
+ << prop.mBorderWidths[HbCss::BottomEdge];
#endif
frame->frameDrawer().setBorderWidths(
- borderWidths[HbCss::LeftEdge],
- borderWidths[HbCss::TopEdge],
- borderWidths[HbCss::RightEdge],
- borderWidths[HbCss::BottomEdge]);
+ prop.mBorderWidths[HbCss::LeftEdge],
+ prop.mBorderWidths[HbCss::TopEdge],
+ prop.mBorderWidths[HbCss::RightEdge],
+ prop.mBorderWidths[HbCss::BottomEdge]);
frame->frameDrawer().d->setBorderApiProtectionFlag(false);
}
}
if ( hbWidget->inherits( "HbLineEdit" ) ) {
- HbCss::TextValues textValues;
- if ( extractor.extractTextValues( textValues ) ) {
- if ( textValues.mFlags & HbCss::ExtractedLineCountMin
- && !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMin)) {
+ if ( prop.mFlags & HbCss::ExtractedMinLines
+ && !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMin)) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting text min lines: " << textValues.mLineCountMin;
+ qDebug() << "HbStyle::polishItem : -- Setting text min lines: " << prop.mMinLines;
#endif
- hbWidget->setProperty( "minRows", textValues.mLineCountMin );
- hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMin, false);
- }
- if ( textValues.mFlags & HbCss::ExtractedLineCountMax
- && !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMin)) {
+ hbWidget->setProperty( "minRows", prop.mMinLines );
+ hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMin, false);
+ }
+ if ( prop.mFlags & HbCss::ExtractedMaxLines
+ && !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMin)) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting text max lines: " << textValues.mLineCountMax;
+ qDebug() << "HbStyle::polishItem : -- Setting text max lines: " << prop.mMaxLines;
#endif
- hbWidget->setProperty( "maxRows", textValues.mLineCountMax );
- hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMax, false);
- }
+ hbWidget->setProperty( "maxRows", prop.mMaxLines );
+ hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMax, false);
}
}
}
- QGraphicsLayoutItem* lItem = (item && item->isWidget()) ? (QGraphicsLayoutItem*)static_cast<QGraphicsWidget*>(item) : 0;
- if ( !lItem ) {
- lItem = widget->layoutPrimitive(name);
- if ( lItem && !lItem->graphicsItem() ) {
- // assume it is spacer
- static_cast<HbMeshLayout*>(widget->layout())->setItemId( lItem, name );
+ if ( lItem ) {
+ if ( prop.mFlags & HbCss::ExtractedMinW ) {
+#ifdef HBSTYLE_DEBUG
+ qDebug() << "HbStyle::polishItem : -- Setting minimum width: " << prop.mMinW;
+#endif
+ lItem->setMinimumWidth( prop.mMinW );
}
- }
- if ( lItem ) {
- if ( geomValues.mFlags & HbCss::ExtractedMinW ) {
+ if ( prop.mFlags & HbCss::ExtractedMinH ) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting minimum width: " << geomValues.mMinW;
+ qDebug() << "HbStyle::polishItem : -- Setting minimum height: " << prop.mMinH;
#endif
- lItem->setMinimumWidth( geomValues.mMinW );
- }
- if ( geomValues.mFlags & HbCss::ExtractedMinH ) {
-#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting minimum height: " << geomValues.mMinH;
-#endif
- lItem->setMinimumHeight( geomValues.mMinH );
+ lItem->setMinimumHeight( prop.mMinH );
}
- if ( geomValues.mFlags & HbCss::ExtractedPrefW ) {
+ if ( prop.mFlags & HbCss::ExtractedPrefW ) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting preferred width: " << geomValues.mPrefW;
+ qDebug() << "HbStyle::polishItem : -- Setting preferred width: " << prop.mPrefW;
#endif
- lItem->setPreferredWidth( geomValues.mPrefW );
+ lItem->setPreferredWidth( prop.mPrefW );
}
- if ( geomValues.mFlags & HbCss::ExtractedPrefH ) {
+ if ( prop.mFlags & HbCss::ExtractedPrefH ) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting preferred height: " << geomValues.mPrefH;
+ qDebug() << "HbStyle::polishItem : -- Setting preferred height: " << prop.mPrefH;
#endif
- lItem->setPreferredHeight( geomValues.mPrefH );
+ lItem->setPreferredHeight( prop.mPrefH );
}
- if ( geomValues.mFlags & HbCss::ExtractedMaxW ) {
+ if ( prop.mFlags & HbCss::ExtractedMaxW ) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting maximum width: " << geomValues.mMaxW;
+ qDebug() << "HbStyle::polishItem : -- Setting maximum width: " << prop.mMaxW;
#endif
- lItem->setMaximumWidth( geomValues.mMaxW );
+ lItem->setMaximumWidth( prop.mMaxW );
}
- if ( geomValues.mFlags & HbCss::ExtractedMaxH ) {
+ if ( prop.mFlags & HbCss::ExtractedMaxH ) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting maximum height: " << geomValues.mMaxH;
+ qDebug() << "HbStyle::polishItem : -- Setting maximum height: " << prop.mMaxH;
#endif
- lItem->setMaximumHeight( geomValues.mMaxH );
+ lItem->setMaximumHeight( prop.mMaxH );
}
QSizePolicy itemPol = lItem->sizePolicy();
- if ( geomValues.mFlags & HbCss::ExtractedPolHor ) {
+ if ( prop.mFlags & HbCss::ExtractedPolHor ) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting horizontal size policy: " << geomValues.mSizePolicy.horizontalPolicy();
+ qDebug() << "HbStyle::polishItem : -- Setting horizontal size policy: " << prop.mSizePolicy.horizontalPolicy();
#endif
- itemPol.setHorizontalPolicy(geomValues.mSizePolicy.horizontalPolicy());
+ itemPol.setHorizontalPolicy(prop.mSizePolicy.horizontalPolicy());
}
- if ( geomValues.mFlags & HbCss::ExtractedPolVer ) {
+ if ( prop.mFlags & HbCss::ExtractedPolVer ) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting vertical size policy: " << geomValues.mSizePolicy.verticalPolicy();
+ qDebug() << "HbStyle::polishItem : -- Setting vertical size policy: " << prop.mSizePolicy.verticalPolicy();
#endif
- itemPol.setVerticalPolicy(geomValues.mSizePolicy.verticalPolicy());
+ itemPol.setVerticalPolicy(prop.mSizePolicy.verticalPolicy());
}
lItem->setSizePolicy(itemPol);
}
@@ -4046,41 +3999,41 @@
if (layoutDefined) {
HbMeshLayout *layout = static_cast<HbMeshLayout*>(widget->layout());
if ( layout ) {
- if (posValues.mFlags & HbCss::ExtractedLeft) {
+ if (prop.mFlags & HbCss::ExtractedLeft) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting left override: " << posValues.mLeft;
+ qDebug() << "HbStyle::polishItem : -- Setting left override: " << prop.mLeft;
#endif
- layout->overrideSpacing(name, Hb::LeftEdge, posValues.mLeft);
+ layout->overrideSpacing(name, Hb::LeftEdge, prop.mLeft);
}
- if (posValues.mFlags & HbCss::ExtractedRight) {
+ if (prop.mFlags & HbCss::ExtractedRight) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting right override: " << posValues.mRight;
+ qDebug() << "HbStyle::polishItem : -- Setting right override: " << prop.mRight;
#endif
- layout->overrideSpacing(name, Hb::RightEdge, posValues.mRight);
+ layout->overrideSpacing(name, Hb::RightEdge, prop.mRight);
}
- if (posValues.mFlags & HbCss::ExtractedTop) {
+ if (prop.mFlags & HbCss::ExtractedTop) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting top override: " << posValues.mTop;
+ qDebug() << "HbStyle::polishItem : -- Setting top override: " << prop.mTop;
#endif
- layout->overrideSpacing(name, Hb::TopEdge, posValues.mTop);
+ layout->overrideSpacing(name, Hb::TopEdge, prop.mTop);
}
- if (posValues.mFlags & HbCss::ExtractedBottom) {
+ if (prop.mFlags & HbCss::ExtractedBottom) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting bottom override: " << posValues.mBottom;
+ qDebug() << "HbStyle::polishItem : -- Setting bottom override: " << prop.mBottom;
#endif
- layout->overrideSpacing(name, Hb::BottomEdge, posValues.mBottom);
+ layout->overrideSpacing(name, Hb::BottomEdge, prop.mBottom);
}
- if (posValues.mFlags & HbCss::ExtractedCenterH) {
+ if (prop.mFlags & HbCss::ExtractedCenterH) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting centerh override: " << posValues.mCenterH;
+ qDebug() << "HbStyle::polishItem : -- Setting centerh override: " << prop.mCenterH;
#endif
- layout->overrideSpacing(name, Hb::CenterHEdge, posValues.mCenterH);
+ layout->overrideSpacing(name, Hb::CenterHEdge, prop.mCenterH);
}
- if (posValues.mFlags & HbCss::ExtractedCenterV) {
+ if (prop.mFlags & HbCss::ExtractedCenterV) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polishItem : -- Setting centerv override: " << posValues.mCenterV;
+ qDebug() << "HbStyle::polishItem : -- Setting centerv override: " << prop.mCenterV;
#endif
- layout->overrideSpacing(name, Hb::CenterVEdge, posValues.mCenterV);
+ layout->overrideSpacing(name, Hb::CenterVEdge, prop.mCenterV);
}
}
}
@@ -4151,7 +4104,7 @@
}
const HbVector<HbCss::Declaration> decl = declarations(styleRules, "", widget, profile);
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polish : Number of maching CSS declarations: " << decl.count();
+ qDebug() << "HbStyle::polish : Number of matching CSS declarations: " << decl.count();
#endif
d->ensureLayoutParameters(profile);
@@ -4161,12 +4114,12 @@
if ( params.count() ) {
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polish : Extracting parameters.";
+ qDebug() << "HbStyle::polish : Extracting custom properties.";
#endif
- extractor.extractParameters( params.params(), params.values() );
+ extractor.extractCustomProperties( params.keys(), params.values() );
}
- bool layoutDefined = extractor.extractLayout(&layoutName, §ionName);
+ bool layoutDefined = extractor.extractLayout(layoutName, sectionName);
#ifdef HBSTYLE_DEBUG
if (!layoutDefined) {
qDebug() << "HbStyle::polish : Couldn't find layout name for the widget.";
@@ -4268,13 +4221,13 @@
const HbVector<HbCss::Declaration> decl = declarations(styleRules, name, 0, profile);
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::updateThemedItems : -- Number of maching CSS declarations: " << decl.count();
+ qDebug() << "HbStyle::updateThemedItems : -- Number of matching CSS declarations: " << decl.count();
#endif
ensureColorParameters();
HbCss::ValueExtractor extractor(decl, colorParameters, profile);
QColor col;
- bool extracted = extractor.extractColor( &col );
+ bool extracted = extractor.extractColor( col );
if (!extracted || !col.isValid()) {
// Setting non black or white default color to make it visisble in black or white theme
col.setRgb(255,0,255);
@@ -4444,23 +4397,23 @@
HbCss::ValueExtractor valueExtractor(d->layoutParameters, true, effectiveProfile);
// todo: parsing variable/expression is done here so that there is no need to change API
// also parameters method not changed (this change is done for docml/widgetml parsing)
- if (param.startsWith("var(") && param.endsWith(")")) {
- return valueExtractor.extractValue(param.mid(4,param.length()-5), value);
- } else if (param.startsWith("-var(") && param.endsWith(")")) {
- bool retVal = valueExtractor.extractValue(param.mid(5,param.length()-6), value);
+ if (param.startsWith(QLatin1String("var(")) && param.endsWith(QLatin1String(")"))) {
+ return valueExtractor.extractVariableValue(param.mid(4,param.length()-5), value);
+ } else if (param.startsWith(QLatin1String("-var(")) && param.endsWith(QLatin1String(")"))) {
+ bool retVal = valueExtractor.extractVariableValue(param.mid(5,param.length()-6), value);
value = -value;
return retVal;
- } else if (param.startsWith("expr(") && param.endsWith(")")) {
+ } else if (param.startsWith(QLatin1String("expr(")) && param.endsWith(QLatin1String(")"))) {
QString expressionString = param.mid(5,param.length()-6);
return valueExtractor.extractExpressionValue(expressionString, value);
- } else if (param.startsWith("-expr(") && param.endsWith(")")) {
+ } else if (param.startsWith(QLatin1String("-expr(")) && param.endsWith(QLatin1String(")"))) {
QString expressionString = param.mid(6,param.length()-7);
bool retVal = valueExtractor.extractExpressionValue(expressionString, value);
value = -value;
return retVal;
}
- return valueExtractor.extractValue(param, value);
+ return valueExtractor.extractVariableValue(param, value);
}
/*!
@@ -4489,7 +4442,7 @@
qreal value = 0;
QHash<QString, HbCss::Declaration>::const_iterator i = d->layoutParameters.constBegin();
while (i != d->layoutParameters.constEnd()) {
- if (valueExtractor.extractValue(i.key(), value)) {
+ if (valueExtractor.extractVariableValue(i.key(), value)) {
params.addParameter(i.key(), value);
}
++i;
@@ -4538,12 +4491,12 @@
}
const HbVector<HbCss::Declaration> decl = declarations(styleRules, "", widget, profile);
#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::widgetParameters : Number of maching CSS declarations: " << decl.count();
+ qDebug() << "HbStyle::widgetParameters : Number of matching CSS declarations: " << decl.count();
#endif
d->ensureLayoutParameters(profile);
HbCss::ValueExtractor extractor(decl, d->layoutParameters, profile);
- extractor.extractParameters( params.params(), params.values() );
+ extractor.extractCustomProperties( params.keys(), params.values() );
}
@@ -4677,7 +4630,7 @@
if (firstParse) {
HbCss::Parser parser;
parser.init(GLOBAL_PARAMETERS_LOCATION, true);
- HbCss::StyleSheet *styleSheet = new(HbCss::StyleSheet);
+ HbCss::StyleSheet *styleSheet = HbMemoryUtils::create<HbCss::StyleSheet>(HbMemoryManager::HeapMemory);
parser.parse(styleSheet);
HbStyleSelector selector;
@@ -4694,7 +4647,7 @@
{
HbCss::Declaration decl;
decl.property = "hb-param-screen-width";
- decl.propertyId = HbCss::UnknownProperty;
+ decl.propertyId = HbCss::Property_Unknown;
HbCss::Value val;
val.type = HbCss::Value::Number;
val.variant = HbVariant((double)pSize.width(),HbMemoryManager::HeapMemory);
@@ -4704,7 +4657,7 @@
{
HbCss::Declaration decl;
decl.property = "hb-param-screen-height";
- decl.propertyId = HbCss::UnknownProperty;
+ decl.propertyId = HbCss::Property_Unknown;
HbCss::Value val;
val.type = HbCss::Value::Number;
val.variant = HbVariant((double)pSize.height(),HbMemoryManager::HeapMemory);
@@ -4714,7 +4667,7 @@
{
HbCss::Declaration decl;
decl.property = "hb-param-screen-short-edge";
- decl.propertyId = HbCss::UnknownProperty;
+ decl.propertyId = HbCss::Property_Unknown;
HbCss::Value val;
val.type = HbCss::Value::Number;
val.variant = HbVariant((double)qMin(pSize.height(),pSize.width()),HbMemoryManager::HeapMemory);
@@ -4724,7 +4677,7 @@
{
HbCss::Declaration decl;
decl.property = "hb-param-screen-long-edge";
- decl.propertyId = HbCss::UnknownProperty;
+ decl.propertyId = HbCss::Property_Unknown;
HbCss::Value val;
val.type = HbCss::Value::Number;
val.variant = HbVariant((double)qMax(pSize.height(),pSize.width()),HbMemoryManager::HeapMemory);
--- a/src/hbcore/style/hbstyleparameters.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/style/hbstyleparameters.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -31,7 +31,7 @@
public:
HbStyleParametersPrivate();
- QList<QString> params;
+ QList<QString> keys;
QList<QVariant> values;
};
HbStyleParametersPrivate::HbStyleParametersPrivate()
@@ -72,7 +72,7 @@
*/
int HbStyleParameters::count()
{
- return d_ptr->params.count();
+ return d_ptr->keys.count();
}
/*!
@@ -80,23 +80,31 @@
Returns the index of the parameter with given name.
- \param param name of the parameter
+ \param key name of the parameter
\return index of given parameter
*/
-int HbStyleParameters::indexOf( const QString& param )
+int HbStyleParameters::indexOf( const QString& key )
{
- return d_ptr->params.indexOf(param);
+ return d_ptr->keys.indexOf(key);
}
/*!
Returns the name of the parameter at given index.
\param index position of the parameter
- \return name of the parameter
+ \return key name of the parameter
+*/
+QString HbStyleParameters::key( int index )
+{
+ return d_ptr->keys.at(index);
+}
+
+/*!
+ Equals to key(index).
*/
QString HbStyleParameters::parameter( int index )
{
- return d_ptr->params.at(index);
+ return key(index);
}
/*!
@@ -113,14 +121,14 @@
/*!
Returns the value of the parameter with given name.
- This is a convenience method. Equals to calling value(indexOf(param)).
+ This is a convenience method. Equals to calling value(indexOf(key)).
- \param param name of the parameter
+ \param key name of the parameter
\return value of the parameter
*/
-QVariant HbStyleParameters::value( const QString ¶m )
+QVariant HbStyleParameters::value( const QString &key )
{
- int index = indexOf(param);
+ int index = indexOf(key);
if ( index >= 0 && index < d_ptr->values.count() )
return value(index);
@@ -154,12 +162,12 @@
/*!
Add a new parameter.
- \param param name of the parameter to be added
+ \param key name of the parameter to be added
\param value default value
*/
-void HbStyleParameters::addParameter( const QString ¶m, const QVariant &value )
+void HbStyleParameters::addParameter( const QString &key, const QVariant &value )
{
- d_ptr->params.append(param);
+ d_ptr->keys.append(key);
d_ptr->values.append(value);
}
@@ -170,16 +178,16 @@
*/
void HbStyleParameters::removeAt( int index )
{
- d_ptr->params.removeAt(index);
+ d_ptr->keys.removeAt(index);
d_ptr->values.removeAt(index);
}
/*!
\internal
*/
-QList<QString> &HbStyleParameters::params()
+QList<QString> &HbStyleParameters::keys()
{
- return d_ptr->params;
+ return d_ptr->keys;
}
/*!
--- a/src/hbcore/style/hbstyleparameters.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/style/hbstyleparameters.h Fri Jun 11 13:58:22 2010 +0300
@@ -38,21 +38,22 @@
virtual ~HbStyleParameters();
int count();
- int indexOf( const QString& param );
+ int indexOf( const QString& key );
+ QString key( int index );
QString parameter( int index );
QVariant value( int index );
- QVariant value( const QString ¶m );
+ QVariant value( const QString &key );
void setValue( int index, const QVariant &value );
- void setValue( const QString ¶m, const QVariant &value );
+ void setValue( const QString &key, const QVariant &value );
- void addParameter( const QString ¶m, const QVariant &value = QVariant() );
+ void addParameter( const QString &key, const QVariant &value = QVariant() );
void removeAt( int index );
private:
friend class HbStyle;
- QList<QString> ¶ms();
+ QList<QString> &keys();
QList<QVariant> &values();
private:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/svgext/hbnvgdecoder/hbdereferencer_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,142 @@
+/****************************************************************************
+**
+** 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 HB_DEREFERENCER_P_H
+#define HB_DEREFERENCER_P_H
+
+#include <QByteArray>
+#include <QtGlobal>
+
+#include "hbnvg_p.h"
+#include "hbnvgexception_p.h"
+
+class HbDereferencer
+{
+#define DEREF_PTR(TOTYPE, Offset, Size) do {\
+ checkOutOfBound(Offset + Size); \
+ return * (TOTYPE *)&mReadStream[mTotalRead + Offset];\
+ } while (0)
+public:
+
+ HbDereferencer(quint8* buf, qint32 length)
+ : mTotalRead(0),
+ mDataLength(length),
+ mReadStream((unsigned char*)buf)
+ {
+ }
+
+ HbDereferencer(const QByteArray& buffer)
+ : mTotalRead(0),
+ mDataLength(buffer.length()),
+ mReadStream((unsigned char*)buffer.data())
+ {
+ }
+
+ void skip(qint32 length)
+ {
+ checkOutOfBound(length);
+ mTotalRead += length;
+ }
+
+ qint16 derefInt16(qint16 at = 0)
+ {
+ DEREF_PTR(qint16, at, sizeof(qint16));
+ }
+ operator qint16()
+ {
+ return derefInt16();
+ }
+
+ qint32 derefInt32(qint32 at = 0)
+ {
+ DEREF_PTR(qint32, at, sizeof(qint32));
+ }
+
+ operator qint32()
+ {
+ return derefInt32();
+ }
+
+ qint8 derefInt8(qint32 at = 0)
+ {
+ DEREF_PTR(qint8, at, sizeof(qint8));
+ }
+
+ operator qint8()
+ {
+ return derefInt8();
+ }
+
+ quint8* derefInt8Array(qint32 length, qint32 at = 0)
+ {
+ checkOutOfBound(at + length);
+ return (quint8 *)&mReadStream[mTotalRead + at];
+ }
+
+ float derefReal32(qint32 at = 0)
+ {
+ DEREF_PTR(float, at, sizeof(float));
+ }
+ operator float()
+ {
+ return derefReal32();
+ }
+
+ void assertBound(qint32 length, qint32 at = 0)
+ {
+ checkOutOfBound(at + length);
+ }
+
+ quint8* getPtr() const
+ {
+ return mReadStream;
+ }
+
+ qint32 getLength() const
+ {
+ return mDataLength;
+ }
+
+ qint32 getReadingPos() const
+ {
+ return mTotalRead;
+ }
+
+private:
+ void checkOutOfBound(qint32 length)
+ {
+ if (mTotalRead + length > mDataLength ||
+ mTotalRead + length < 0){
+ throw HbNvgException(HbNvgEngine::NvgErrEof);
+ }
+ }
+
+ qint32 mTotalRead;
+ qint32 mDataLength;
+ quint8* mReadStream;
+};
+
+#endif
+
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvg.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvg.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -28,8 +28,8 @@
#include "hbnvgutil_p.h"
#include "hbnvgcsicon_p.h"
#include "hbnvgiconfactory_p.h"
-#include "hbnvgicondata_p.h"
#include "hbnvgexception_p.h"
+#include "hbdereferencer_p.h"
#include <QByteArray>
@@ -42,29 +42,6 @@
const qint32 NVG_VIEWBOX_HEIGHT_OFS = 48;
const qint32 NvgOffsetReserved1 = 6;
-void HbNvgIconList::addNvgIcon(HbNvgIconFactory::HbNvgIconType type, HbNvgIcon * nvgIcon)
-{
- if (type <= HbNvgIconFactory::NvgCs) {
- if (icons[type]) {
- delete icons[type];
- }
- icons[type] = nvgIcon;
- }
-}
-
-HbNvgIcon * HbNvgIconList::getIcon(HbNvgIconFactory::HbNvgIconType type)
-{
- if (type <= HbNvgIconFactory::NvgCs) {
- return icons[type];
- }
- return 0;
-}
-
-HbNvgIconList::~HbNvgIconList()
-{
- delete icons[HbNvgIconFactory::NvgCs];
-}
-
HbNvgEnginePrivate::HbNvgEnginePrivate():
mCurrentBufferSize(1, 1),
mRotateAngle(0.0),
@@ -72,8 +49,6 @@
mCentreY(0.0),
mPreserveAspectSetting(HbNvgEngine::NvgPreserveAspectRatioXmidYmid),
mSmilFitSetting(HbNvgEngine::NvgMeet),
- mVgImageBinder(0),
- mCreatingNvgIcon(false),
mCurrentNvgIcon(0),
mLastError(HbNvgEngine::NvgErrNone),
mMirrored(false)
@@ -84,9 +59,7 @@
HbNvgEnginePrivate::~HbNvgEnginePrivate()
{
-#ifdef OPENVG_OBJECT_CACHING
- delete mCurrentNvgIcon;
-#endif
+ delete mCurrentNvgIcon;
}
void HbNvgEnginePrivate::rotate(float angle, float centreX, float centreY)
@@ -117,9 +90,7 @@
if (viewboxWidth > 0 && viewboxHeight > 0) {
ret = QSize(viewboxWidth, viewboxHeight);
- } else {
- ret = QSize(0, 0);
- }
+ }
}
return ret;
}
@@ -151,7 +122,6 @@
try {
doDrawNvg(buffer, size);
-
} catch (const std::bad_alloc & e) {
mLastError = HbNvgEngine::NvgErrNoMemory;
} catch (const HbNvgException & e) {
@@ -163,32 +133,6 @@
return mLastError;
}
-HbNvgIcon * HbNvgEnginePrivate::createNvgIcon(const QByteArray &buffer, const QSize& size)
-{
- NVG_DEBUGP1("Creating NvgCsIcon");
-
- mCurrentNvgIcon = 0;
-
-#ifdef OPENVG_OBJECT_CACHING
- mCreatingNvgIcon = true;
-
- mLastError = drawNvg(buffer, size);
- if (mLastError != NvgErrNone) {
- delete mCurrentNvgIcon;
- mCurrentNvgIcon = 0;
- NVG_DEBUGP2("Creating NvgCsIcon failed %d\n", mLastError);
- }
-
- mCreatingNvgIcon = false;
-#else
- QByteArray tempArray = buffer;
- QSize tempSize = size;
- Q_UNUSED(tempArray);
- Q_UNUSED(tempSize);
-#endif
- return mCurrentNvgIcon;
-}
-
void HbNvgEnginePrivate::doDrawNvg(const QByteArray & buffer, const QSize &size)
{
// if size is null then return without doing anything
@@ -211,63 +155,14 @@
quint16 reserved1 = nvgIconData.derefInt16(NvgOffsetReserved1) & 0x03;
HbNvgIconFactory::HbNvgIconType iconType = (HbNvgIconFactory::HbNvgIconType)(reserved1 & 0x03);
-#ifdef OPENVG_OBJECT_CACHING
- mCurrentNvgIcon = HbNvgIconFactory::create(iconType);
- QScopedPointer <HbNvgIcon> nvgIcon(mCurrentNvgIcon);
-#else
- HbNvgIcon * nvGIcon = mIconList.getIcon(iconType);
- if (!nvGIcon) {
- mCurrentNvgIcon = HbNvgIconFactory::create(iconType);
- mIconList.addNvgIcon(iconType, mCurrentNvgIcon);
- } else {
- mCurrentNvgIcon = nvGIcon;
- }
-#endif
-
+ if (!mCurrentNvgIcon) {
+ mCurrentNvgIcon = HbNvgIconFactory::create(iconType);
+ }
+
mCurrentNvgIcon->setPreserveAspectRatio(mPreserveAspectSetting, mSmilFitSetting);
mCurrentNvgIcon->rotate(mRotateAngle, mCentreX, mCentreY);
- mCurrentNvgIcon->setVgImageBinder(mVgImageBinder);
mCurrentNvgIcon->enableMirroring(mMirrored);
-
-#ifdef OPENVG_OBJECT_CACHING
- if (mCreatingNvgIcon) {
- mCurrentNvgIcon->create(buffer, size);
- nvgIcon.take();
- } else {
- mCurrentNvgIcon->directDraw(buffer, size);
- }
-#else
mCurrentNvgIcon->directDraw(buffer, size);
-#endif
-}
-
-void HbNvgEnginePrivate::setBackgroundColor(const QColor &rgba8888Color)
-{
- mBackgroundColor = rgba8888Color;
-}
-
-void HbNvgEnginePrivate::clearBackground()
-{
- quint32 rgba = (mBackgroundColor.rgba() << 8) | (mBackgroundColor.rgba() >> 24);
- qint32 r, g, b, a;
- r = (qint32)((rgba & 0xFF000000) >> 24);
- g = (qint32)((rgba & 0x00FF0000) >> 16);
- b = (qint32)((rgba & 0x0000FF00) >> 8);
- a = (qint32)(rgba & 0x000000FF);
-
- r += r >> 7; g += g >> 7; b += b >> 7; a += a >> 7;
-
- const VGfloat Inverse255 = 1.0f / 256.0f;
- const VGfloat clearColor[4] = {(Inverse255 * VGfloat(r)),
- (Inverse255 * VGfloat(g)),
- (Inverse255 * VGfloat(b)),
- (Inverse255 * VGfloat(a))
- };
-
- vgSeti(VG_SCISSORING, VG_FALSE);
- vgSetfv(VG_CLEAR_COLOR, 4, clearColor);
- vgClear(0, 0, mCurrentBufferSize.width(), mCurrentBufferSize.height());
- vgSeti(VG_SCISSORING, VG_TRUE);
}
/*!
@@ -314,15 +209,6 @@
}
/*!
- Creates the nvgicon with the content \a buffer of size \a size and
- return pointer to the HbNvgIcon.
- */
-HbNvgIcon * HbNvgEngine::createNvgIcon(const QByteArray &buffer, const QSize &size)
-{
- return d_ptr->createNvgIcon(buffer, size);
-}
-
-/*!
Draw the nvg graphic with the content \a buffer of size \a size.
*/
HbNvgEngine::HbNvgErrorType HbNvgEngine::drawNvg(const QByteArray &buffer, const QSize &size)
@@ -331,14 +217,6 @@
}
/*!
- Set the HbVgImageBinder \a imageBinder to the HbNvgEngine
- */
-void HbNvgEngine::setVgImageBinder(HbVgImageBinder *imageBinder)
-{
- d_ptr->setVgImageBinder(imageBinder);
-}
-
-/*!
Returns HbNvgEngine::HbNvgErrorType as draw status of the HbNvgEngine.
*/
HbNvgEngine::HbNvgErrorType HbNvgEngine::error()const
@@ -346,27 +224,38 @@
return d_ptr->error();
}
-/*!
- Sets the \a rgba8888Color as background color of the nvg graphics.
- */
-void HbNvgEngine::setBackgroundColor(const QColor &rgba8888Color)
-{
- d_ptr->setBackgroundColor(rgba8888Color);
-}
-
void HbNvgEngine::enableMirroring(bool mirroringMode)
{
d_ptr->enableMirroring(mirroringMode);
}
-/*!
- Clears the background color of the nvg graphic.
- */
+
+HbNvgIcon * HbNvgEngine::createNvgIcon(const QByteArray &buffer, const QSize &size)
+{
+ // TODO @ Deprecated
+ Q_UNUSED(buffer);
+ Q_UNUSED(size);
+ return 0;
+}
+
+void HbNvgEngine::setVgImageBinder(HbVgImageBinder *imageBinder)
+{
+ // TODO @ Deprecated
+ Q_UNUSED(imageBinder);
+}
+
+void HbNvgEngine::setBackgroundColor(const QColor &rgba8888Color)
+{
+ // TODO @ Deprecated
+ Q_UNUSED(rgba8888Color);
+}
+
void HbNvgEngine::clearBackground()
{
- d_ptr->clearBackground();
+ // TODO @ Deprecated
}
+
HbNvgEngine::HbNvgErrorType openVgErrorToHbNvgError(qint32 error)
{
HbNvgEngine::HbNvgErrorType symError = HbNvgEngine::NvgErrNone;
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvg_p_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvg_p_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -34,24 +34,6 @@
class HbNvgIcon;
class HbVgImageBinder;
-class HbNvgIconList
-{
-public:
- HbNvgIconList()
- {
- icons[HbNvgIconFactory::NvgCs] = 0;
- }
-
- void addNvgIcon(HbNvgIconFactory::HbNvgIconType type, HbNvgIcon * nvgIcon);
-
- HbNvgIcon * getIcon(HbNvgIconFactory::HbNvgIconType type);
-
- ~HbNvgIconList();
-
-private:
- HbNvgIcon * icons[HbNvgIconFactory::NvgCs + 1];
-};
-
class HbNvgEnginePrivate
{
public :
@@ -68,12 +50,6 @@
HbNvgEngine::HbNvgErrorType drawNvg(const QByteArray &buffer, const QSize &size);
- HbNvgIcon * createNvgIcon(const QByteArray &buffer, const QSize &size);
-
- void setVgImageBinder(HbVgImageBinder *imageBinder) {
- mVgImageBinder = imageBinder;
- }
-
HbNvgEngine::HbNvgErrorType error()const {
return mLastError;
}
@@ -82,10 +58,6 @@
mMirrored = mirroringMode;
}
- void setBackgroundColor(const QColor &rgba8888Color);
-
- void clearBackground();
-
private :
void doDrawNvg(const QByteArray &buffer, const QSize &size);
@@ -98,7 +70,7 @@
private :
QSize mCurrentBufferSize;
-
+
VGfloat mRotateAngle;
float mCentreX;
float mCentreY;
@@ -106,19 +78,13 @@
HbNvgEngine::HbNvgAlignType mPreserveAspectSetting;
HbNvgEngine::HbNvgMeetType mSmilFitSetting;
- QColor mBackgroundColor;
- HbVgImageBinder * mVgImageBinder;
-
- bool mCreatingNvgIcon;
HbNvgIcon * mCurrentNvgIcon;
-
HbNvgEngine::HbNvgErrorType mLastError;
bool mMirrored;
VGint mMatrixMode;
VGfloat mImageMatrix[9];
VGfloat mPathMatrix[9];
- HbNvgIconList mIconList;
};
#endif
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgcsicon.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgcsicon.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -24,10 +24,10 @@
****************************************************************************/
#include "hbnvgcsicon_p.h"
-#include "hbnvgicondata_p.h"
#include "hbnvgfittoviewbox_p.h"
#include "hbnvgutil_p.h"
#include "hbnvgexception_p.h"
+#include "hbdereferencer_p.h"
#include <QScopedPointer>
#include <QScopedArrayPointer>
@@ -118,33 +118,18 @@
*/
HbNvgCsIcon::HbNvgCsIcon()
- : mPaintFill(VG_INVALID_HANDLE),
+ :mPaintFill(VG_INVALID_HANDLE),
mPaintStroke(VG_INVALID_HANDLE),
mVgPath(VG_INVALID_HANDLE),
mLastPathDataType(0),
mDoFill(VG_FALSE),
mDoStroke(VG_FALSE),
- mCreatingNvgIcon(0),
mPreserveAspectSetting(HbNvgEngine::NvgPreserveAspectRatioXmidYmid),
mSmilFitSetting(HbNvgEngine::NvgMeet),
- mNvgIconData(0),
- mLastFillPaintType(0),
- mLastStrokePaintType(0),
- mLastFillPaintColor(0),
- mLastStrkePaintColor(0),
- mResetFillPaint(0),
- mResetStrokePaint(0),
mMirrored(false)
{
}
-void HbNvgCsIcon::setIconData(const QByteArray &buffer)
-{
- mNvgIconData = new HbNvgIconData(buffer.size());
- Q_CHECK_PTR(mNvgIconData);
- Q_CHECK_PTR(mNvgIconData);
-}
-
HbNvgCsIcon::~HbNvgCsIcon()
{
if (mPaintFill) {
@@ -159,17 +144,6 @@
vgSetPaint(VG_INVALID_HANDLE, VG_FILL_PATH);
vgSetPaint(VG_INVALID_HANDLE, VG_STROKE_PATH);
-
- delete mNvgIconData;
-}
-
-
-void HbNvgCsIcon::setViewBox(float x, float y, float w, float h)
-{
- mViewBoxX = x;
- mViewBoxY = y;
- mViewBoxW = w;
- mViewBoxH = h;
}
/*!
@@ -205,23 +179,11 @@
*/
void HbNvgCsIcon ::directDraw(const QByteArray &buffer, const QSize &targetSize)
{
- drawCommandSection(buffer, targetSize, 0);
+ drawCommandSection(buffer, targetSize);
}
-/*!
- Create the nvg graphic data \a buffer of size \a targetSize
- and return the status of the draw.
-*/
-void HbNvgCsIcon::create(const QByteArray &buffer, const QSize& targetSize)
-{
- drawCommandSection(buffer, targetSize, 1);
-}
-
-void HbNvgCsIcon::drawCommandSection(const QByteArray &buffer, const QSize & targetSize,
- qint32 objectCaching)
-{
- mCreatingNvgIcon = objectCaching;
-
+void HbNvgCsIcon::drawCommandSection(const QByteArray &buffer, const QSize & targetSize)
+{
HbDereferencer iconData(buffer);
qint16 headerSize = iconData.derefInt16(NVG_HEADERSIZE_OFS);
quint8 nvgVersion = iconData.derefInt8(NVG_VERSION_OFS);
@@ -254,8 +216,6 @@
// Everything gets restored to the original values before we return.
vgLoadMatrix(currentPathMatrix);
-// applyScissoring(currentPathMatrix, targetSize);
-
/*
* set the rotation angle if available
*/
@@ -391,9 +351,7 @@
strokeWidth = commandSection->derefReal32();
}
- COND_COM_OC(mCreatingNvgIcon,
- addSetStrokeWidthCommand(strokeWidth),
- vgSetf(VG_STROKE_LINE_WIDTH, strokeWidth));
+ vgSetf(VG_STROKE_LINE_WIDTH, strokeWidth);
}
break;
case CMD_SET_STROKE_MITER_LIMIT: {
@@ -413,9 +371,7 @@
miterLimit = commandSection->derefReal32();
}
- COND_COM_OC(mCreatingNvgIcon,
- addSetStrokeMiterLimitCommand(miterLimit),
- vgSetf(VG_STROKE_MITER_LIMIT, miterLimit));
+ vgSetf(VG_STROKE_MITER_LIMIT, miterLimit);
}
break;
case CMD_SET_STROKE_LINE_JOIN_CAP: {
@@ -450,10 +406,8 @@
break;
}
- COND_COM_OC(mCreatingNvgIcon,
- addStrokeLineJoinCapCommand(capStyle, lineJoinStyle),
- vgSeti(VG_STROKE_CAP_STYLE, capStyle);
- vgSeti(VG_STROKE_JOIN_STYLE, lineJoinStyle););
+ vgSeti(VG_STROKE_CAP_STYLE, capStyle);
+ vgSeti(VG_STROKE_JOIN_STYLE, lineJoinStyle);
}
break;
default: {
@@ -505,74 +459,19 @@
Q_CHECK_PTR(viewBoxTx);
QScopedPointer<HbNvgFitToViewBoxImpl> viewboxTrnsfr(viewBoxTx);
- /*
- * this is bit unreadable,
- * need to find a better design to separate the object caching solution from normal rendering,
- */
-
- COND_COM_OC_NOC( {
- if (mCreatingNvgIcon) {
- setViewBox(viewboxX, viewboxY, viewboxW, viewboxH);
- } else {
- viewboxTrnsfr->setAllignment(mPreserveAspectSetting);
- viewboxTrnsfr->setScaling(mSmilFitSetting);
-
- if (viewboxW > 0 && viewboxH > 0) {
- viewboxTrnsfr->setViewBox(viewboxX, viewboxY, viewboxW, viewboxH);
- }
-
- qint32 width = aTargetSize.width();
- qint32 height = aTargetSize.height();
-
- viewboxTrnsfr->setWindowViewportTrans(QRect(0, 0, width, height), QSize(0, 0));
- }
- }, {
- viewboxTrnsfr->setAllignment(mPreserveAspectSetting);
- viewboxTrnsfr->setScaling(mSmilFitSetting);
-
- if (viewboxW > 0 && viewboxH > 0) {
- viewboxTrnsfr->setViewBox(viewboxX, viewboxY, viewboxW, viewboxH);
- }
-
- qint32 width = targetSize.width();
- qint32 height = targetSize.height();
+ viewboxTrnsfr->setAllignment(mPreserveAspectSetting);
+ viewboxTrnsfr->setScaling(mSmilFitSetting);
- viewboxTrnsfr->setWindowViewportTrans(QRect(0, 0, width, height), QSize(0, 0));
- });
-}
-
-void HbNvgCsIcon::applyScissoring(VGfloat *aMatrix, const QSize& targetSize)
-{
- /*
- * calculate the rectangle with respect to the transformation applied
- * and set the scissoring rect
- */
- QPoint leftBottom = getTranslatedPoint(aMatrix, QPoint(0, 0));
- QPoint leftTop = getTranslatedPoint(aMatrix, QPoint(0, targetSize.height()));
- QPoint rightBottom = getTranslatedPoint(aMatrix, QPoint(targetSize.width(), 0));
- QPoint rightTop = getTranslatedPoint(aMatrix, QPoint(targetSize.width(), targetSize.height()));
+ if (viewboxW > 0 && viewboxH > 0) {
+ viewboxTrnsfr->setViewBox(viewboxX, viewboxY, viewboxW, viewboxH);
+ }
- VGfloat minX = leftBottom.x();
- VGfloat minY = leftBottom.y();
- VGfloat maxX = leftBottom.x();
- VGfloat maxY = leftBottom.y();
-
- minX = minVal4(leftBottom.x(), leftTop.x(), rightBottom.x(), rightTop.x());
- minY = minVal4(leftBottom.y(), leftTop.y(), rightBottom.y(), rightTop.y());
+ qint32 width = targetSize.width();
+ qint32 height = targetSize.height();
- maxX = maxVal4(leftBottom.x(), leftTop.x(), rightBottom.x(), rightTop.x());
- maxY = maxVal4(leftBottom.y(), leftTop.y(), rightBottom.y(), rightTop.y());
-
- VGfloat newW = maxX - minX;
- VGfloat newH = maxY - minY;
-
- VGint clipRect[] = {minX, minY, newW, newH};
-
- vgSeti(VG_SCISSORING, VG_TRUE);
- vgSetiv(VG_SCISSOR_RECTS, 4, clipRect);
+ viewboxTrnsfr->setWindowViewportTrans(QRect(0, 0, width, height), QSize(0, 0));
}
-
HbNvgEngine::HbNvgErrorType HbNvgCsIcon::initializeGc()
{
if (mPaintFill == VG_INVALID_HANDLE) {
@@ -687,8 +586,6 @@
void HbNvgCsIcon::setFillPaint(HbDereferencer *iconData)
{
- COND_COM_OC_OOC(register qint32 drawingMode = mCreatingNvgIcon);
-
quint32 commonData = iconData->derefInt32();
quint32 paintType = commonData & 0x07;
quint16 specifcData = (commonData >> 16) & 0xff;
@@ -696,15 +593,7 @@
switch (paintType) {
case PAINT_LGRAD: {
mGradPaintFill = mPaintFill;
- COND_COM_OC_OOC(
- if (mCreatingNvgIcon) {
- // CNVGCSIcon will destroy the paint handle
- mGradPaintFill = vgCreatePaint();
- if (mGradPaintFill == VG_INVALID_HANDLE) {
- throw HbNvgException(openVgErrorToHbNvgError(vgGetError()));
- }
- });
-
+
// gradient data, the data will be word aligned
float* gradData = (float*)iconData->derefInt8Array(4 * sizeof(VGfloat), sizeof(float));
@@ -721,31 +610,17 @@
gradMatrix1[2], gradMatrix1[5], 1.0f
};
- COND_COM_OC(drawingMode,
- addLinearGradientCommand(4, gradData, gradMatrix, mGradPaintFill),
- vgLoadMatrix(gradMatrix););
+ vgLoadMatrix(gradMatrix);
Q_UNUSED(identityMatrix);
} else {
- COND_COM_OC(drawingMode,
- addLinearGradientCommand(4, gradData, (VGfloat*)identityMatrix, mGradPaintFill),
- vgLoadIdentity());
+ vgLoadIdentity();
}
-
- COND_COM_OC(drawingMode, ; ,
- vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE));
+ vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE);
}
break;
case PAINT_RGRAD: {
mGradPaintFill = mPaintFill;
-
- COND_COM_OC_OOC(
- if (mCreatingNvgIcon) {
- mGradPaintFill = vgCreatePaint();
- if (mGradPaintFill == VG_INVALID_HANDLE) {
- throw HbNvgException(openVgErrorToHbNvgError(vgGetError()));
- }
- });
-
+
// gradient data, the data will be word aligned
float* gradData = (float*)iconData->derefInt8Array(4 * sizeof(VGfloat), sizeof(quint32));
@@ -762,18 +637,12 @@
gradMatrix1[2], gradMatrix1[5], 1.0f
};
- COND_COM_OC(drawingMode,
- addRadialGradientCommand(5, gradData, gradMatrix, mGradPaintFill),
- vgLoadMatrix(gradMatrix));
+ vgLoadMatrix(gradMatrix);
Q_UNUSED(identityMatrix);
} else {
- COND_COM_OC(drawingMode,
- addRadialGradientCommand(5, gradData, (VGfloat*)identityMatrix, mGradPaintFill),
- vgLoadIdentity());
+ vgLoadIdentity();
}
-
- COND_COM_OC(drawingMode, ; ,
- vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE));
+ vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE);
}
break;
case PAINT_FLAT: {
@@ -781,10 +650,8 @@
rgba = (rgba & 0xffffff00) | mFillAlpha;
- COND_COM_OC(drawingMode,
- addSetColorCommand(rgba),
- vgSetParameteri(mPaintFill, VG_PAINT_TYPE, VG_PAINT_TYPE_COLOR);
- vgSetColor(mPaintFill, rgba));
+ vgSetParameteri(mPaintFill, VG_PAINT_TYPE, VG_PAINT_TYPE_COLOR);
+ vgSetColor(mPaintFill, rgba);
}
break;
default: {
@@ -894,28 +761,18 @@
paintMode = VG_FILL_PATH;
}
- COND_COM_OC(mCreatingNvgIcon, {
- VGPath path = createPath();
+ vgClearPath(mVgPath, VG_PATH_CAPABILITY_APPEND_TO);
- if (path != VG_INVALID_HANDLE) {
- vgAppendPathData(path, numSegments, pathSegments, pathData);
- } else {
- addPathData(numSegments, pathSegments, pathData);
- }
- addDrawPathCommand(path, paintMode);
- }, {
- vgClearPath(mVgPath, VG_PATH_CAPABILITY_APPEND_TO);
+ vgAppendPathData(mVgPath, numSegments, pathSegments, pathData);
+ vgDrawPath(mVgPath, paintMode);
- vgAppendPathData(mVgPath, numSegments, pathSegments, pathData);
- vgDrawPath(mVgPath, paintMode);
- });
mDoStroke = VG_FALSE;
mDoFill = VG_FALSE;
}
void HbNvgCsIcon::setTransform(HbDereferencer * iconData, quint32 & counter, const VGfloat* currentMatrix)
{
- COND_COM_OC(mCreatingNvgIcon, ; , vgLoadMatrix(currentMatrix));
+ vgLoadMatrix(currentMatrix);
quint32 commonData = iconData->derefInt32();
quint32 transformType = (commonData & 0x00ff0000) >> 16 ;
@@ -966,19 +823,12 @@
}
}
- COND_COM_OC(mCreatingNvgIcon,
- addSetTransformCommand(matrixTemp, 1),
- vgMultMatrix(matrixTemp));
- } else {
- COND_COM_OC(mCreatingNvgIcon,
- addSetTransformCommand(matrixTemp, 0), ;);
- }
+ vgMultMatrix(matrixTemp);
+ }
}
void HbNvgCsIcon::setStrokePaint(HbDereferencer * iconData)
{
- COND_COM_OC_OOC(register qint32 drawingMode = mCreatingNvgIcon;);
-
quint32 commonData = iconData->derefInt32();
quint32 strokeType = commonData & 0x07;
quint16 specifcData = (commonData >> 16) & 0xff;
@@ -987,21 +837,12 @@
case STROKE_LGRAD: {
mGradPaintStroke = mPaintStroke;
- COND_COM_OC_OOC(
- if (mCreatingNvgIcon) {
- mGradPaintStroke = vgCreatePaint();
- if (mGradPaintStroke == VG_INVALID_HANDLE) {
- throw HbNvgException(HbNvgEngine::NvgErrBadHandle);
- }
- });
-
// gradient data, the data will be word aligned
float* gradData = (float*)iconData->derefInt8Array(4 * sizeof(VGfloat), sizeof(float));
- COND_COM_OC(drawingMode, ; ,
- vgSetParameteri(mGradPaintStroke, VG_PAINT_TYPE, VG_PAINT_TYPE_LINEAR_GRADIENT);
- vgSetParameterfv(mGradPaintStroke, VG_PAINT_LINEAR_GRADIENT, 4, gradData);
- vgSeti(VG_MATRIX_MODE, VG_MATRIX_STROKE_PAINT_TO_USER));
+ vgSetParameteri(mGradPaintStroke, VG_PAINT_TYPE, VG_PAINT_TYPE_LINEAR_GRADIENT);
+ vgSetParameterfv(mGradPaintStroke, VG_PAINT_LINEAR_GRADIENT, 4, gradData);
+ vgSeti(VG_MATRIX_MODE, VG_MATRIX_STROKE_PAINT_TO_USER);
if (specifcData & 0x1) {
float* gradMatrix1 = (float*)iconData->derefInt8Array(6 * sizeof(VGfloat),
@@ -1012,14 +853,10 @@
gradMatrix1[2], gradMatrix1[5], 1.0f
};
- COND_COM_OC(drawingMode,
- addStrokeLinearGradientCommand(4, gradData, gradMatrix, mGradPaintStroke),
- vgLoadMatrix(gradMatrix));
+ vgLoadMatrix(gradMatrix);
Q_UNUSED(identityMatrix);
} else {
- COND_COM_OC(drawingMode,
- addStrokeLinearGradientCommand(4, gradData, (VGfloat*)identityMatrix, mGradPaintStroke),
- vgLoadIdentity());
+ vgLoadIdentity();
}
vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE);
}
@@ -1027,20 +864,12 @@
case STROKE_RGRAD: {
mGradPaintStroke = mPaintStroke;
- COND_COM_OC_OOC(
- if (mCreatingNvgIcon) {
- mGradPaintStroke = vgCreatePaint();
- if (mGradPaintStroke == VG_INVALID_HANDLE) {
- throw HbNvgException(HbNvgEngine::NvgErrBadHandle);
- }
- });
// gradient data, the data will be word aligned
float* gradData = (float*)iconData->derefInt8Array(5 * sizeof(VGfloat), sizeof(quint32));
- COND_COM_OC(drawingMode, ; ,
- vgSetParameteri(mGradPaintStroke, VG_PAINT_TYPE, VG_PAINT_TYPE_RADIAL_GRADIENT);
- vgSetParameterfv(mGradPaintStroke, VG_PAINT_RADIAL_GRADIENT, 5, gradData);
- vgSeti(VG_MATRIX_MODE, VG_MATRIX_STROKE_PAINT_TO_USER));
+ vgSetParameteri(mGradPaintStroke, VG_PAINT_TYPE, VG_PAINT_TYPE_RADIAL_GRADIENT);
+ vgSetParameterfv(mGradPaintStroke, VG_PAINT_RADIAL_GRADIENT, 5, gradData);
+ vgSeti(VG_MATRIX_MODE, VG_MATRIX_STROKE_PAINT_TO_USER);
if (specifcData & 0x1) {
float* gradMatrix1 = (float*)iconData->derefInt8Array(6 * sizeof(VGfloat),
@@ -1050,14 +879,10 @@
gradMatrix1[2], gradMatrix1[5], 1.0f
};
- COND_COM_OC(drawingMode,
- addStrokeRadialGradientCommand(4, gradData, gradMatrix, mGradPaintStroke),
- vgLoadMatrix(gradMatrix));
+ vgLoadMatrix(gradMatrix);
Q_UNUSED(identityMatrix);
} else {
- COND_COM_OC(drawingMode,
- addStrokeRadialGradientCommand(4, gradData, (VGfloat*)identityMatrix, mGradPaintStroke),
- vgLoadIdentity());
+ vgLoadIdentity();
}
vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE);
}
@@ -1093,425 +918,13 @@
quint32 rgba = iconData->derefInt32(NVG_RGBA_OFS);
rgba = (rgba & 0xffffff00) | mStrokeAlpha; // replace alpha
- COND_COM_OC(drawingMode,
- addStrokeSetColorCommand(rgba),
- vgSetParameteri(mPaintStroke, VG_PAINT_TYPE, VG_PAINT_TYPE_COLOR);
- vgSetColor(mPaintStroke, rgba));
+ vgSetParameteri(mPaintStroke, VG_PAINT_TYPE, VG_PAINT_TYPE_COLOR);
+ vgSetColor(mPaintStroke, rgba);
}
break;
}
}
-#ifdef OPENVG_OBJECT_CACHING
-VGPath HbNvgCsIcon::createPath()
-{
- VGPath path = VG_INVALID_HANDLE;
- switch (mLastPathDataType) {
- case NvgEightBitEncoding: {
- path = vgCreatePath(VG_PATH_FORMAT_STANDARD,
- VG_PATH_DATATYPE_S_16, 1.0f / 2.0f, 0.0f, 0, 0,
- VG_PATH_CAPABILITY_APPEND_TO);
- }
- break;
-
- case NvgSixteenBitEncoding: {
- path = vgCreatePath(VG_PATH_FORMAT_STANDARD,
- VG_PATH_DATATYPE_S_16, 1.0f / 16.0f, 0.0f, 0, 0,
- VG_PATH_CAPABILITY_APPEND_TO);
- }
- break;
-
- case NvgThirtyTwoBitEncoding: {
- path = vgCreatePath(VG_PATH_FORMAT_STANDARD,
- VG_PATH_DATATYPE_S_32, 1.0f / 65536.0f, 0.0f, 0, 0,
- VG_PATH_CAPABILITY_APPEND_TO);
- }
- break;
- default:
- break;
- }
- return path;
-}
-#endif
-
-void HbNvgCsIcon::addPathData(VGint numSegments, const VGubyte * pathSegments, const void * pathData)
-{
- mNvgIconData->encodeUint32(NvgPathData);
- mNvgIconData->encodeUint32(numSegments);
- mNvgIconData->encodeData(pathSegments, numSegments);
-
- qint32 coordinateCount = 0;
- for (qint32 i = 0; i < numSegments; ++i) {
- switch (pathSegments[i]) {
- case VG_HLINE_TO:
- case VG_VLINE_TO:
- coordinateCount += 1;
- break;
- case VG_MOVE_TO:
- case VG_LINE_TO:
- case VG_SQUAD_TO:
- coordinateCount += 2;
- break;
- case VG_QUAD_TO:
- case VG_SCUBIC_TO:
- coordinateCount += 4;
- break;
- case VG_SCCWARC_TO:
- case VG_SCWARC_TO:
- case VG_LCCWARC_TO:
- case VG_LCWARC_TO:
- coordinateCount += 5;
- break;
- case VG_CUBIC_TO:
- coordinateCount += 6;
- break;
- default:
- break;
- }
- }
- mNvgIconData->encodeUint16(coordinateCount);
- mNvgIconData->encodeData(pathData, coordinateCount * 4);
-}
-
-void HbNvgCsIcon::addDrawPathCommand(VGPath path, VGbitfield paintMode)
-{
- mNvgIconData->encodeUint32(NvgPath);
- mNvgIconData->encodeUint32(path);
- mNvgIconData->encodeUint32(paintMode);
-}
-
-void HbNvgCsIcon::addLinearGradientCommand(VGint count, VGfloat* gradientData, VGfloat* gradientMatrix, VGPaint paint)
-{
- mNvgIconData->encodeUint32(NvgPaint);
- addLinearGradientCommandData(paint, count, gradientData, gradientMatrix);
-}
-
-void HbNvgCsIcon::addRadialGradientCommand(VGint count, VGfloat* gradientData, VGfloat* gradientMatrix, VGPaint paint)
-{
- mNvgIconData->encodeUint32(NvgPaint);
- addRadialGradientCommandData(paint, count, gradientData, gradientMatrix);
-}
-
-void HbNvgCsIcon::addSetColorCommand(VGuint rgba)
-{
- mNvgIconData->encodeUint32(NvgPaint);
- mNvgIconData->encodeUint32(VG_PAINT_TYPE_COLOR);
- mNvgIconData->encodeUint32(rgba);
-}
-
-void HbNvgCsIcon::addColorRampCommand(VGPaint paint)
-{
- mNvgIconData->encodeUint32(NvgColorRamp);
- mNvgIconData->encodeUint32(paint);
-}
-
-void HbNvgCsIcon::addSetTransformCommand(const VGfloat* transformMatrix, int aFlag)
-{
- mNvgIconData->encodeUint32(NvgTransform);
- mNvgIconData->encodeData(transformMatrix, 9 * sizeof(VGfloat));
- mNvgIconData->encodeUint32(aFlag);
-}
-
-void HbNvgCsIcon::addSetStrokeWidthCommand(VGfloat strokeWidth)
-{
- mNvgIconData->encodeUint32(NvgStrokeWidth);
- mNvgIconData->encodeReal32(strokeWidth);
-}
-
-void HbNvgCsIcon::addSetStrokeMiterLimitCommand(VGfloat miterLimit)
-{
- mNvgIconData->encodeUint32(NvgStrokeMiterLimit);
- mNvgIconData->encodeReal32(miterLimit);
-}
-
-void HbNvgCsIcon::addStrokeLineJoinCapCommand(VGint capStyle, VGint joinStyle)
-{
- mNvgIconData->encodeUint32(NvgStrokeLineJoinCap);
- mNvgIconData->encodeUint32(capStyle);
- mNvgIconData->encodeUint32(joinStyle);
-}
-
-void HbNvgCsIcon::addStrokeLinearGradientCommand(VGint count, VGfloat* gradientData, VGfloat* gradientMatrix, VGPaint paint)
-{
- mNvgIconData->encodeUint32(NvgStrokePaint);
- addLinearGradientCommandData(paint, count, gradientData, gradientMatrix);
-}
-
-void HbNvgCsIcon::addStrokeRadialGradientCommand(VGint count, VGfloat* gradientData, VGfloat* gradientMatrix, VGPaint paint)
-{
- mNvgIconData->encodeUint32(NvgStrokePaint);
- addRadialGradientCommandData(paint, count, gradientData, gradientMatrix);
-}
-
-void HbNvgCsIcon::addStrokeSetColorCommand(VGuint rgba)
-{
- mNvgIconData->encodeUint32(NvgStrokePaint);
- addSetColorCommandData(rgba);
-}
-
-void HbNvgCsIcon::addStrokeColorRampCommand(VGPaint paint)
-{
- mNvgIconData->encodeUint32(NvgStrokeColorRamp);
- mNvgIconData->encodeUint32(paint);
-}
-
-void HbNvgCsIcon::addLinearGradientCommandData(VGPaint paint, VGint count, VGfloat* gradientData, VGfloat* gradientMatrix)
-{
- mNvgIconData->encodeUint32(VG_PAINT_TYPE_LINEAR_GRADIENT);
- mNvgIconData->encodeUint32(paint);
- mNvgIconData->encodeUint32(count);
- mNvgIconData->encodeData(gradientData, count * sizeof(VGfloat));
- mNvgIconData->encodeData(gradientMatrix, 9 * sizeof(VGfloat));
-}
-
-void HbNvgCsIcon::addRadialGradientCommandData(VGPaint paint, VGint count, VGfloat* gradientData, VGfloat* gradientMatrix)
-{
- mNvgIconData->encodeUint32(VG_PAINT_TYPE_RADIAL_GRADIENT);
- mNvgIconData->encodeUint32(paint);
- mNvgIconData->encodeUint32(count);
- mNvgIconData->encodeData(gradientData, count * sizeof(VGfloat));
- mNvgIconData->encodeData(gradientMatrix, 9 * sizeof(VGfloat));
-}
-
-void HbNvgCsIcon::addSetColorCommandData(VGuint rgba)
-{
- mNvgIconData->encodeUint32(VG_PAINT_TYPE_COLOR);
- mNvgIconData->encodeUint32(rgba);
-}
-
-HbNvgEngine::HbNvgErrorType HbNvgCsIcon::draw(const QSize &size)
-{
- NVG_DEBUGP2("DRAWING NvgCsIcon %s, ", __FUNCTION__);
-
- HbNvgEngine::HbNvgErrorType error = HbNvgEngine::NvgErrNone;
-
- // Get Matrix modes and all caller matrices (must be restored afterwards)
- updateClientMatrices();
-
- //Exception handling has to happen
- error = doDraw(size);
-
- // restore everything as we may have changed matrix mode
- restoreClientMatrices();
-
- return error;
-}
-
-HbNvgEngine::HbNvgErrorType HbNvgCsIcon::doDraw(const QSize &size)
-{
- HbNvgEngine::HbNvgErrorType ret = HbNvgEngine::NvgErrNone;
-
- vgSetPaint(mPaintFill, VG_FILL_PATH);
- vgSetPaint(mPaintStroke, VG_STROKE_PATH);
- mLastFillPaintColor = 0;
- mLastStrkePaintColor = 0;
- mLastFillPaintType = 0;
- mLastStrokePaintType = 0;
-
- VGfloat currentPathMatrix[9];
- vgGetMatrix(currentPathMatrix);
-
- vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE);
- vgLoadMatrix(currentPathMatrix);
- setRotation();
-#ifdef __MIRROR_
- vgScale(1.0f, -1.0f);
- vgTranslate(0, (VGfloat)(-size.height()));
-#endif
-
- setViewBoxToViewTransformation(size);
-
- vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE);
-
- VGfloat currentMatrix[9];
-
- vgGetMatrix(currentMatrix);
-
- mNvgIconData->beginRead();
-
- while (!mNvgIconData->eof()) {
- switch (mNvgIconData->readInt32()) {
- case NvgPath: {
- VGPath path = (VGPath)mNvgIconData->readInt32();
- VGPaintMode paintMode = (VGPaintMode)mNvgIconData->readInt32();
-
- if (path == VG_INVALID_HANDLE) {
- vgDrawPath(mVgPath, paintMode);
- } else {
- vgDrawPath(path, paintMode);
- }
- break;
- }
- case NvgPathData: {
- if (mVgPath != VG_INVALID_HANDLE) {
-
- VGint numSegments = mNvgIconData->readInt32();
-
- VGubyte *pSegArry = new VGubyte[numSegments];
- Q_CHECK_PTR(pSegArry);
- QScopedArrayPointer<VGubyte> pathSegments(pSegArry);
- mNvgIconData->read(pathSegments.data(), numSegments);
-
- VGint coordinateCount = mNvgIconData->readInt32();
-
- VGubyte *pDataArry = new VGubyte[coordinateCount * 4];
- Q_CHECK_PTR(pDataArry);
- QScopedArrayPointer<VGubyte> pathData(pDataArry);
- mNvgIconData->read(pathData.data(), coordinateCount * 4);
-
- vgClearPath(mVgPath, VG_PATH_CAPABILITY_APPEND_TO);
- vgAppendPathData(mVgPath, numSegments, pathSegments.data(), pathData.data());
- }
- break;
- }
- case NvgPaint: {
- drawPaint(mPaintFill, VG_MATRIX_FILL_PAINT_TO_USER, mLastFillPaintType, mLastFillPaintColor, VG_FILL_PATH);
- break;
- }
- case NvgColorRamp: {
- mNvgIconData->readInt32();
- break;
- }
- case NvgTransform: {
- qint32 flag;
- VGfloat transformMatrix[9];
-
- mNvgIconData->read((quint8 *)transformMatrix, 9 * sizeof(VGfloat));
- flag = mNvgIconData->readInt32();
-
- vgLoadMatrix(currentMatrix);
- if (flag) {
- vgMultMatrix(transformMatrix);
- }
-
- break;
- }
- case NvgStrokeWidth: {
- VGfloat strokeWidth = mNvgIconData->readReal32();
- vgSetf(VG_STROKE_LINE_WIDTH, strokeWidth);
- break;
- }
-
- case NvgStrokeMiterLimit: {
- VGfloat miterLimit = mNvgIconData->readReal32();
- vgSetf(VG_STROKE_MITER_LIMIT, miterLimit);
- break;
- }
-
- case NvgStrokeLineJoinCap: {
- VGint lineJoin = mNvgIconData->readInt32();
- VGint cap = mNvgIconData->readInt32();
-
- vgSeti(VG_STROKE_JOIN_STYLE, (VGJoinStyle)lineJoin);
- vgSeti(VG_STROKE_CAP_STYLE, (VGCapStyle)cap);
- break;
- }
- case NvgStrokePaint: {
- drawPaint(mPaintStroke, VG_MATRIX_STROKE_PAINT_TO_USER, mLastStrokePaintType, mLastStrkePaintColor, VG_STROKE_PATH);
- break;
- }
- case NvgStrokeColorRamp: {
- mNvgIconData->readInt32();
- break;
- }
- default: {
- throw HbNvgException(HbNvgEngine::NvgErrCorrupt);
- }
- }
- }
-
- mNvgIconData->endRead();
-
- return ret;
-}
-
-void HbNvgCsIcon::drawColorRamp(VGPaint paint)
-{
- qint32 stopCount = mNvgIconData->readInt32();
-
- VGfloat *crs = new VGfloat[stopCount];
- Q_CHECK_PTR(crs);
- QScopedArrayPointer<VGfloat> colorRamps(crs);
-
- mNvgIconData->read((quint8 *)colorRamps.data(), stopCount * sizeof(VGfloat));
- vgSetParameteri(paint, VG_PAINT_COLOR_RAMP_SPREAD_MODE, VG_COLOR_RAMP_SPREAD_PAD);
- vgSetParameterfv(paint, VG_PAINT_COLOR_RAMP_STOPS, stopCount, colorRamps.data());
-}
-
-void HbNvgCsIcon::drawPaint(VGPaint paint, VGMatrixMode matrixMode, quint32 & lastPaintType, quint32 &lastPaintColor, VGPaintMode paintMode)
-{
- VGPaintType paintType = (VGPaintType)mNvgIconData->readInt32();
-
- if (paintType == VG_PAINT_TYPE_LINEAR_GRADIENT ||
- paintType == VG_PAINT_TYPE_RADIAL_GRADIENT) {
- VGPaintParamType paintPType = VG_PAINT_LINEAR_GRADIENT;
- if (paintType == VG_PAINT_TYPE_RADIAL_GRADIENT) {
- paintPType = VG_PAINT_RADIAL_GRADIENT;
- }
-
- VGPaint paintHandle = mNvgIconData->readInt32();
- qint32 count = mNvgIconData->readInt32();
- VGfloat gradientData[5];
- VGfloat gradientMatrix[9];
-
- mNvgIconData->read((quint8 *)gradientData, count * sizeof(VGfloat));
- mNvgIconData->read((quint8 *)gradientMatrix, 9 * sizeof(VGfloat));
-
- if (paintHandle) {
- vgSetPaint(paintHandle, paintMode);
- vgSeti(VG_MATRIX_MODE, matrixMode);
- vgLoadMatrix(gradientMatrix);
- if (paintMode == VG_FILL_PATH) {
- mResetFillPaint = 1;
- } else {
- mResetStrokePaint = 1;
- }
- } else {
- if (lastPaintType != (quint32)paintType) {
- vgSetParameteri(paint, VG_PAINT_TYPE, paintType);
- }
- vgSetParameterfv(paint, paintPType, count, gradientData);
-
- vgSeti(VG_MATRIX_MODE, matrixMode);
- vgLoadMatrix(gradientMatrix);
- }
- vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE);
- } else if (paintType == VG_PAINT_TYPE_COLOR) {
- if (paintMode == VG_FILL_PATH && mResetFillPaint) {
- mResetFillPaint = 0;
- vgSetPaint(paint, paintMode);
- } else if (paintMode == VG_STROKE_PATH && mResetStrokePaint) {
- mResetStrokePaint = 0;
- vgSetPaint(paint, paintMode);
- }
- quint32 color = static_cast<quint32>(mNvgIconData->readInt32());
- if (lastPaintType != (quint32)paintType) {
- vgSetParameteri(paint, VG_PAINT_TYPE, VG_PAINT_TYPE_COLOR);
- vgSetColor(paint, color);
- } else {
- if (lastPaintColor != color) {
- vgSetColor(paint, color);
- }
- }
- lastPaintColor = color;
- } else {
- throw HbNvgException(HbNvgEngine::NvgErrCorrupt);
- }
- lastPaintType = paintType;
-}
-
-void HbNvgCsIcon::setViewBoxToViewTransformation(const QSize &size)
-{
- HbNvgFitToViewBoxImpl *viewBoxTx = new HbNvgFitToViewBoxImpl();
- Q_CHECK_PTR(viewBoxTx);
- QScopedPointer<HbNvgFitToViewBoxImpl> fitToViewBoxImpl(viewBoxTx);
-
- fitToViewBoxImpl->setAllignment(mPreserveAspectSetting);
- fitToViewBoxImpl->setScaling(mSmilFitSetting);
- fitToViewBoxImpl->setViewBox(mViewBoxX, mViewBoxY, mViewBoxW, mViewBoxH);
- fitToViewBoxImpl->setWindowViewportTrans(QRect(0, 0, size.width(), size.height()), QSize(0, 0));
-}
-
void HbNvgCsIcon::setRotation()
{
if (mRotationAngle) {
@@ -1520,67 +933,3 @@
vgTranslate(-mRotationX, -mRotationY);
}
}
-
-void HbNvgCsIcon::updateClientMatrices()
-{
- mMatrixMode = vgGeti(VG_MATRIX_MODE);
- vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE);
- vgGetMatrix(mPathMatrix);
- vgSeti(VG_MATRIX_MODE, VG_MATRIX_IMAGE_USER_TO_SURFACE);
- vgGetMatrix(mImageMatrix);
- vgSeti(VG_MATRIX_MODE, mMatrixMode);
-}
-
-void HbNvgCsIcon::restoreClientMatrices()
-{
- vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE);
- vgLoadMatrix(mPathMatrix);
- vgSeti(VG_MATRIX_MODE, VG_MATRIX_IMAGE_USER_TO_SURFACE);
- vgLoadMatrix(mImageMatrix);
- vgSeti(VG_MATRIX_MODE, mMatrixMode);
-}
-
-QPoint HbNvgCsIcon::getTranslatedPoint(VGfloat *trMatrix, const QPoint &point)
-{
- QPoint trPoint;
-
- trPoint.setX(trMatrix[0] * point.x() + trMatrix[3] * point.y() + trMatrix[6]);
- trPoint.setY(trMatrix[1] * point.x() + trMatrix[4] * point.y() + trMatrix[7]);
-
- return trPoint;
-}
-
-VGfloat HbNvgCsIcon::minVal4(VGfloat x1, VGfloat x2, VGfloat x3, VGfloat x4)
-{
- VGfloat min = x1;
-
- if (min > x2) {
- min = x2;
- }
- if (min > x3) {
- min = x3;
- }
- if (min > x4) {
- min = x4;
- }
-
- return min;
-}
-
-VGfloat HbNvgCsIcon::maxVal4(VGfloat x1, VGfloat x2, VGfloat x3, VGfloat x4)
-{
- VGfloat max = x1;
-
- if (max < x2) {
- max = x2;
- }
- if (max < x3) {
- max = x3;
- }
- if (max < x4) {
- max = x4;
- }
-
- return max;
-}
-
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgcsicon_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgcsicon_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -47,7 +47,6 @@
};
class HbDereferencer;
-class HbNvgIconData;
class HbNvgEngine;
class HbOpenVgHandleStore;
class HbNvgFitToViewBoxImpl;
@@ -73,9 +72,20 @@
virtual ~HbNvgCsIcon();
- virtual HbNvgEngine::HbNvgErrorType draw(const QSize &size);
+ HbNvgEngine::HbNvgErrorType draw(const QSize &size)
+ {
+ // TODO @ Deprecated, remove from base class
+ Q_UNUSED(size);
+ return HbNvgEngine::NvgErrNone;
+ }
- void setViewBox(float x, float y, float w, float h) ;
+ void setViewBox(float x, float y, float w, float h)
+ {
+ mViewBoxX = x;
+ mViewBoxY = y;
+ mViewBoxW = w;
+ mViewBoxH = h;
+ }
void setPreserveAspectRatio(HbNvgEngine::HbNvgAlignType preserveAspectSetting,
HbNvgEngine::HbNvgMeetType smilFitSetting);
@@ -86,72 +96,25 @@
void directDraw(const QByteArray &buffer, const QSize &targetSize);
- void create(const QByteArray &buffer, const QSize& targetSize);
-
- void setIconData(const QByteArray &buffer);
+ void create(const QByteArray &buffer, const QSize& targetSize)
+ {
+ // TODO @ Deprecated, remove from base class
+ Q_UNUSED(buffer);
+ Q_UNUSED(targetSize);
+ }
private:
HbNvgEngine::HbNvgErrorType initializeGc();
- void drawCommandSection(const QByteArray &buffer, const QSize &targetSize, qint32 objectCaching);
+ void drawCommandSection(const QByteArray &buffer, const QSize &targetSize);
HbNvgEngine::HbNvgErrorType createPathHandle(qint16 pathDataType, float scale, float bias);
HbNvgEngine::HbNvgErrorType doDraw(const QSize &size);
- void addDrawPathCommand(VGPath path, VGbitfield paintMode);
-
- void addPathData(VGint numSegments, const VGubyte * pathSegments, const void * pathData);
-
- void addLinearGradientCommand(VGint count, VGfloat* gradientData, VGfloat* gradientMatrix, VGPaint paint);
-
- void addRadialGradientCommand(VGint count, VGfloat* gradientData, VGfloat* gradientMatrix, VGPaint paint);
-
- void addSetColorCommand(VGuint rgba);
-
- void addColorRampCommand(VGPaint paint);
-
- void addSetTransformCommand(const VGfloat* transformMatrix, qint32 flag);
-
- void addSetStrokeWidthCommand(VGfloat strokeWidth);
-
- void addSetStrokeMiterLimitCommand(VGfloat miterLimit);
-
- void addStrokeLineJoinCapCommand(VGint capStyle, VGint joinStyle);
-
- void addStrokeLinearGradientCommand(VGint count, VGfloat* gradientData, VGfloat* gradientMatrix, VGPaint paint);
-
- void addStrokeRadialGradientCommand(VGint count, VGfloat* gradientData, VGfloat* gradientMatrix, VGPaint paint);
-
- void addStrokeSetColorCommand(VGuint rgba);
-
- void addStrokeColorRampCommand(VGPaint paint);
-
- void addLinearGradientCommandData(VGPaint paint, VGint count, VGfloat* gradientData, VGfloat* gradientMatrix);
-
- void addRadialGradientCommandData(VGPaint paint, VGint count, VGfloat* gradientData, VGfloat* gradientMatrix);
-
- void addSetColorCommandData(VGuint rgba);
-
- void drawPaint(VGPaint paint, VGMatrixMode matrixMode, quint32 &lastPaintType, quint32 &lastPaintColor, VGPaintMode paintMode);
-
- void drawColorRamp(VGPaint paint);
-
- void setViewBoxToViewTransformation(const QSize &size);
-
void setRotation();
- void updateClientMatrices();
-
- void restoreClientMatrices();
-
- QPoint getTranslatedPoint(VGfloat *trMatrix, const QPoint &point);
-
- VGfloat maxVal4(VGfloat x1, VGfloat x2, VGfloat x3, VGfloat x4);
-
- VGfloat minVal4(VGfloat x1, VGfloat x2, VGfloat x3, VGfloat x4);
-
void setFillPaint(HbDereferencer *iconData);
void setColorRamp(HbDereferencer * iconData);
@@ -166,13 +129,10 @@
void setStrokeMiterLimit(const quint8* buffer);
- void clearBackground();
-
void resetNvgState();
void applyViewboxToViewPortTransformation(const QSize& targetSize, float viewboxX, float viewboxY, float viewboxW, float viewboxH);
- void applyScissoring(VGfloat *aMatrix, const QSize& targetSize);
void executeNvgCsCommandLoop(quint16 commandCount, HbDereferencer * iconData, HbDereferencer * offsetVector,
HbDereferencer * commandSection, quint8 nvgVersion);
@@ -189,10 +149,6 @@
return((T)((((quint32)value) + sizeof(quint16) - 1)&~(sizeof(quint16) - 1)));
}
-#ifdef OPENVG_OBJECT_CACHING
- VGPath createPath();
-#endif
-
private:
VGPaint mPaintFill;
@@ -205,7 +161,6 @@
qint32 mFillAlpha;
qint32 mStrokeAlpha;
VGPaint mGradPaintStroke;
- qint32 mCreatingNvgIcon;
float mViewBoxX;
float mViewBoxY;
float mViewBoxW;
@@ -214,17 +169,7 @@
float mRotationX;
float mRotationY;
HbNvgEngine::HbNvgAlignType mPreserveAspectSetting;
- HbNvgEngine::HbNvgMeetType mSmilFitSetting;
- HbNvgIconData * mNvgIconData;
- VGint mMatrixMode;
- VGfloat mImageMatrix[9];
- VGfloat mPathMatrix[9];
- quint32 mLastFillPaintType;
- quint32 mLastStrokePaintType;
- quint32 mLastFillPaintColor;
- quint32 mLastStrkePaintColor;
- quint32 mResetFillPaint;
- quint32 mResetStrokePaint;
+ HbNvgEngine::HbNvgMeetType mSmilFitSetting;
bool mMirrored;
};
#endif
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgdecoder.pri Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgdecoder.pri Fri Jun 11 13:58:22 2010 +0300
@@ -29,12 +29,8 @@
PRIVATE_HEADERS += $$PWD/hbnvg_p.h
PRIVATE_HEADERS += $$PWD/hbnvgicon_p.h
-
PRIVATE_HEADERS += $$PWD/hbnvgfittoviewbox_p.h
-PRIVATE_HEADERS += $$PWD/hbnvgimagebinder_p.h
-
-PRIVATE_HEADERS += $$PWD/hbnvgicondata_p.h
-
+PRIVATE_HEADERS += $$PWD/hbdereferencer_p.h
PRIVATE_HEADERS += $$PWD/hbnvgcsicon_p.h
PRIVATE_HEADERS += $$PWD/hbnvgiconfactory_p.h
PRIVATE_HEADERS += $$PWD/hbnvg_p_p.h
@@ -42,8 +38,6 @@
PRIVATE_HEADERS += $$PWD/hbnvgenginepool_p.h
SOURCES += $$PWD/hbnvgfittoviewbox.cpp
-SOURCES += $$PWD/hbnvgicondata.cpp
-
SOURCES += $$PWD/hbnvgcsicon.cpp
SOURCES += $$PWD/hbnvgiconfactory.cpp
SOURCES += $$PWD/hbnvg.cpp
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgenginepool.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgenginepool.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -27,7 +27,7 @@
HbPooledNVGEngine * HbNvgEnginePool::getNvgEngine()
{
- HbPooledNVGEngine* pNvgEngine;
+ HbPooledNVGEngine* pNvgEngine = 0;
if (!pooledEngine) {
pooledEngine = new HbNvgEngineInstance;
Q_CHECK_PTR(pooledEngine);
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgfittoviewbox.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgfittoviewbox.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -25,17 +25,8 @@
#include "hbnvgfittoviewbox_p.h"
-const qreal zero = 0.0f ;
-const qreal one = 1.0f ;
-
HbNvgFitToViewBoxImpl::HbNvgFitToViewBoxImpl()
- : mM00(one),
- mM01(zero),
- mM02(zero),
- mM10(zero),
- mM11(one),
- mM12(zero),
- mViewBoxDefined(false),
+ :mViewBoxDefined(false),
mAlign(HbNvgEngine::NvgPreserveAspectRatioXmidYmid),
mMeetSlice(HbNvgEngine::NvgMeet)
{
@@ -52,7 +43,6 @@
void HbNvgFitToViewBoxImpl::setWindowViewportTrans(const QRect &viewPort, const QSize &size)
{
-
//VIEWPORT NUMBERS
qreal viewPortX = viewPort.left();
qreal viewPortY = viewPort.top();
@@ -320,19 +310,3 @@
vgTranslate(xtrans, ytrans);
}
-void HbNvgFitToViewBoxImpl::concatenate(qreal m00, qreal m01, qreal m02, qreal m10, qreal m11, qreal m12)
-{
- qreal m0;
- qreal m1;
- m0 = mM00;
- m1 = mM01;
- mM00 = m00 * m0 + m10 * m1;
- mM01 = m01 * m0 + m11 * m1;
- mM02 += m02 * m0 + m12 * m1;
- m0 = mM10;
- m1 = mM11;
- mM11 = m01 * m0 + m11 * m1;
- mM10 = m00 * m0 + m10 * m1;
- mM12 += m02 * m0 + m12 * m1;
-}
-
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgfittoviewbox_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgfittoviewbox_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -49,7 +49,6 @@
mViewBoxDefined = true;
}
-
void setAllignment(HbNvgEngine::HbNvgAlignType alignStatus)
{
mAlign = alignStatus;
@@ -60,46 +59,11 @@
mMeetSlice = meetSlice;
}
- void setTransform(qreal m00, qreal m01, qreal m02, qreal m10, qreal m11, qreal m12)
- {
- mM00 = m00;
- mM01 = m01;
- mM02 = m02;
- mM10 = m10;
- mM11 = m11;
- mM12 = m12;
- }
-
- void translate(qreal tx, qreal ty)
- {
- qreal lTranslateMatrix[6] = { 1, 0, tx, 0, 1, ty};
- concatenate(lTranslateMatrix);
- }
-
- void scale(qreal sx, qreal sy)
- {
- qreal lScaleMatrix[6] = { sx, 0, 0, 0, sy, 0};
- concatenate(lScaleMatrix);
- }
-
- void concatenate(qreal *matrix)
- {
- concatenate(matrix[0], matrix[1], matrix[2], matrix[3], matrix[4], matrix[5]);
- }
void setWindowViewportTrans(const QRect &viewPort, const QSize &size);
- void concatenate(qreal m00, qreal m01, qreal m02, qreal m10, qreal m11, qreal m12);
-
private:
- qreal mM00;
- qreal mM01;
- qreal mM02;
- qreal mM10;
- qreal mM11;
- qreal mM12;
-
qreal mVbX;
qreal mVbY;
qreal mVbW;
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgicondata.cpp Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#include "hbnvgicondata_p.h"
-
-HbNvgIconData::HbNvgIconData(quint32 length)
- : mNvgData(0),
- totalRead(0),
- readStream(0)
-{
- mNvgData = new QByteArray(0, length);
- Q_CHECK_PTR(mNvgData);
-}
-
-HbNvgIconData::HbNvgIconData(const QByteArray &buffer)
- : mNvgData(0),
- totalRead(0),
- readStream(0)
-{
- mNvgData = new QByteArray(buffer);
- Q_CHECK_PTR(mNvgData);
- dataSize = mNvgData->length();
-
- //set the reading pointers
- beginRead();
-}
-
-HbNvgIconData::~HbNvgIconData()
-{
- delete mNvgData;
-}
-
-qint32 HbNvgIconData::encodeData(const void *data, quint32 length)
-{
- mNvgData->append((const char*)data , length);
- return (qint32)HbNvgEngine::NvgErrNone; //in error case, exception will be thrown
-}
-
-void HbNvgIconData::beginRead()
-{
- dataSize = mNvgData->length();
- totalRead = 0;
- readStream = (quint8 *)mNvgData->data();
-}
-
-void HbNvgIconData::endRead()
-{
-}
-
-#define STR_TO_OTHER_DIR(TOTYPE) do {\
- TOTYPE data = *(TOTYPE *)&readStream[totalRead];\
- totalRead += sizeof(TOTYPE);\
- return data;\
- } while (0)
-
-
-#define STR_TO_OTHER_IDIR(TOTYPE) do {\
- TOTYPE data;\
- quint8 * dataPtr = (quint8 *)&data;\
- for (qint32 i = 0; i < sizeof(TOTYPE); ++i)\
- {\
- dataPtr[i] = readStream[totalRead+i];\
- }\
- totalRead += sizeof(TOTYPE);\
- return data;\
- } while (0)
-
-#define STR_TO_OTHER(TOTYPE) do {\
- checkOutOfBound(sizeof(TOTYPE));\
- if (reinterpret_cast<qint32>(&readStream[totalRead]) & (sizeof(TOTYPE) - 1))\
- {\
- STR_TO_OTHER_IDIR(TOTYPE);\
- }\
- else\
- {\
- STR_TO_OTHER_DIR(TOTYPE);\
- }\
- } while (0)
-
-qint16 HbNvgIconData::readInt16()
-{
- STR_TO_OTHER(qint16);
-}
-
-qint32 HbNvgIconData::readInt32()
-{
- STR_TO_OTHER(qint32);
-}
-
-qint8 HbNvgIconData::readInt8()
-{
- STR_TO_OTHER_DIR(qint8);
-}
-
-float HbNvgIconData::readReal32()
-{
- STR_TO_OTHER(float);
-}
-
-qreal HbNvgIconData::readReal64()
-{
- checkOutOfBound(sizeof(qreal));
- STR_TO_OTHER(qreal);
-}
-
-void HbNvgIconData::read(quint8 *ptr, qint32 length)
-{
- checkOutOfBound(length);
- memcpy(ptr, &readStream[totalRead], length);
- totalRead += length;
-}
-
-void HbNvgIconData::skip(qint32 length)
-{
- checkOutOfBound(length);
- totalRead += length;
-}
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgicondata_p.h Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,230 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HB_NVGICONDATA_P_H
-#define HB_NVGICONDATA_P_H
-
-#include <QByteArray>
-#include <QtGlobal>
-
-#include "hbnvg_p.h"
-#include "hbnvgexception_p.h"
-
-class HbNvgIconData
-{
-public:
- HbNvgIconData(quint32 length = 0);
-
- HbNvgIconData(const QByteArray &buffer);
-
- ~HbNvgIconData();
-
- qint32 encodeUint8(quint8 aVal)
- {
- return encodeData(&aVal, sizeof(aVal));
- }
-
- qint32 encodeUint16(quint16 aVal)
- {
- return encodeData(&aVal, sizeof(aVal));
- }
-
- qint32 encodeUint32(quint32 aVal)
- {
- return encodeData(&aVal, sizeof(aVal));
- }
-
- int encodeReal32(float aVal)
- {
- return encodeData(&aVal, sizeof(aVal));
- }
- qint32 encodeReal64(double aVal)
- {
- return encodeData(&aVal, sizeof(aVal));
- }
-
- qint32 encodeData(const void *data, quint32 length);
-
- void beginRead();
-
- void endRead();
-
- qint16 readInt16();
-
- qint32 readInt32();
-
- qint8 readInt8();
-
- void read(quint8 *ptr, qint32 length);
-
- float readReal32();
-
- qreal readReal64();
-
- qint32 readPos() const
- {
- return totalRead;
- }
-
- void skip(qint32 length);
-
- const char* buffer() {
- return mNvgData->data() ;
- }
-
- bool eof() const
- {
- return (totalRead >= dataSize);
- }
-
- qint32 dataLength() const
- {
- return dataSize;
- }
-
-private:
-
- void checkOutOfBound(qint32 length)
- {
- if (totalRead + length > dataSize ||
- totalRead + length < 0){
- throw HbNvgException(HbNvgEngine::NvgErrEof);
- }
- }
-
- QByteArray* mNvgData;
- qint32 totalRead;
- qint32 dataSize;
- quint8 * readStream;
-};
-
-class HbDereferencer
-{
-#define DEREF_PTR(TOTYPE, Offset, Size) do {\
- checkOutOfBound(Offset + Size); \
- return * (TOTYPE *)&mReadStream[mTotalRead + Offset];\
- } while (0)
-public:
-
- HbDereferencer(quint8* buf, qint32 length)
- : mTotalRead(0),
- mDataLength(length),
- mReadStream((unsigned char*)buf)
- {
- }
-
- HbDereferencer(const QByteArray& buffer)
- : mTotalRead(0),
- mDataLength(buffer.length()),
- mReadStream((unsigned char*)buffer.data())
- {
- }
-
- void skip(qint32 length)
- {
- checkOutOfBound(length);
- mTotalRead += length;
- }
-
- qint16 derefInt16(qint16 at = 0)
- {
- DEREF_PTR(qint16, at, sizeof(qint16));
- }
- operator qint16()
- {
- return derefInt16();
- }
-
- qint32 derefInt32(qint32 at = 0)
- {
- DEREF_PTR(qint32, at, sizeof(qint32));
- }
-
- operator qint32()
- {
- return derefInt32();
- }
-
- qint8 derefInt8(qint32 at = 0)
- {
- DEREF_PTR(qint8, at, sizeof(qint8));
- }
-
- operator qint8()
- {
- return derefInt8();
- }
-
- quint8* derefInt8Array(qint32 length, qint32 at = 0)
- {
- checkOutOfBound(at + length);
- return (quint8 *)&mReadStream[mTotalRead + at];
- }
-
- float derefReal32(qint32 at = 0)
- {
- DEREF_PTR(float, at, sizeof(float));
- }
- operator float()
- {
- return derefReal32();
- }
-
- void assertBound(qint32 length, qint32 at = 0)
- {
- checkOutOfBound(at + length);
- }
-
- quint8* getPtr() const
- {
- return mReadStream;
- }
-
- qint32 getLength() const
- {
- return mDataLength;
- }
-
- qint32 getReadingPos() const
- {
- return mTotalRead;
- }
-
-private:
- void checkOutOfBound(qint32 length)
- {
- if (mTotalRead + length > mDataLength ||
- mTotalRead + length < 0){
- throw HbNvgException(HbNvgEngine::NvgErrEof);
- }
- }
-
- qint32 mTotalRead;
- qint32 mDataLength;
- quint8* mReadStream;
-};
-
-#endif
-
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgimagebinder_p.h Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HB_VGIMAGEBINDER_P_H
-#define HB_VGIMAGEBINDER_P_H
-
-class HbVgImageBinder
-{
-public:
- virtual ~HbVgImageBinder() {}
-
- virtual qint32 bindClientBuffer(quint32 buffer) = 0;
-
- virtual qint32 unbindClientBuffer() = 0;
-};
-
-#endif
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgutil_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgutil_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -217,37 +217,6 @@
#endif
-#ifdef OPENVG_OBJECT_CACHING
-// first one is for openVG object caching, the macro is used for testing purpose
-#define COND_COM_OC(obj, s1, s2) if (obj) { s1; } else { s2; }
-
-// if object caching is enabled take the first one, which is for object caching,
-// else the second one
-#define COND_COM_OC_NOC(s1, s2) s1
-
-// if object caching is enabled take the first one, which is for object caching
-// else don't do anything
-#define COND_COM_OC_OOC(s1) s1
-
-#else
-
-// first one is for openVG object caching, the macro is used for testing purpose
-#define COND_COM_OC(obj, s1, s2) s2
-
-// if object caching is enabled take the first one, which is for object caching,
-// else the second one
-#define COND_COM_OC_NOC(s1, s2) s2
-
-// if object caching is enabled take the first one, which is for object caching
-// else don't do anything
-// if object caching is enabled take the first one, which is for object caching
-// else don't do anything
-#define COND_COM_OC_OOC(s1)
-
-// if object caching is enabled take the first one, which is for object caching
-// else don't do anything
-#endif
-
/*
* There is an Align4 function in symbian which does the alignement
* this is just to check whether the given pointer is aligned or not
--- a/src/hbcore/theme/hbcolortheme_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/theme/hbcolortheme_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -42,8 +42,8 @@
void HbColorThemePrivate::setCurrentTheme(const QString &themeName)
{
- // If new theme is different from earlier set theme
- if (currentTheme != themeName) {
+ // If new theme is not empty set theme
+ if (!themeName.isEmpty()) {
bool reloadAll = currentTheme.isEmpty();
currentTheme = themeName;
reloadColorFiles( reloadAll );
--- a/src/hbcore/theme/hbcssthemeinterface_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/theme/hbcssthemeinterface_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -41,8 +41,7 @@
* \a loadAllFiles ,On application launch all files are loaded and on theme change unchanged files are not loaded.
* \a enableBinarySupport optional flag for using the binary functionality
*/
-void HbCssThemeInterface::initialise(const QMap<int, QString> &list, bool loadAllFiles,
- bool enableBinarySupport)
+void HbCssThemeInterface::initialise(const QMap<int, QString> &list, bool loadAllFiles)
{
int handle;
flushVariableCache();
@@ -63,14 +62,14 @@
HbLayeredStyleLoader::LayerPriority layerPriority =
static_cast<HbLayeredStyleLoader::LayerPriority>(i.key());
if(loadAllFiles) {
- handle = loader->load(i.value(), layerPriority, enableBinarySupport);
+ handle = loader->load(i.value(), layerPriority);
if (layerPriority != HbLayeredStyleLoader::Priority_Core
&& layerPriority != HbLayeredStyleLoader::Priority_Operator) {
handles.insertMulti(handle, layerPriority);
}
} else if (layerPriority != HbLayeredStyleLoader::Priority_Core
&& layerPriority != HbLayeredStyleLoader::Priority_Operator) {
- handle = loader->load(i.value(), layerPriority, enableBinarySupport);
+ handle = loader->load(i.value(), layerPriority);
handles.insertMulti(handle, layerPriority);
}
}
@@ -113,7 +112,7 @@
HbDeviceProfile profile(HbDeviceProfile::profile(w));
HbCss::ValueExtractor valueExtractor(
loader->declarationsForNode(n, profile.orientation()), true);
- valueExtractor.extractValue(attribute, value);
+ valueExtractor.extractVariableValue(attribute, value);
if ( value.type == Value::Variable) {
value = findVariable ( value.variant.toString ());
@@ -139,7 +138,7 @@
HbCss::Value value;
HbCss::ValueExtractor valueExtractor(mVariables, true);
- valueExtractor.extractValue(variableName, value);
+ valueExtractor.extractVariableValue(variableName, value);
//for varibale cascading support
if ( value.type == Value::Variable){
--- a/src/hbcore/theme/hbcssthemeinterface_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/theme/hbcssthemeinterface_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -37,9 +37,7 @@
HbCssThemeInterface(){};
- void initialise( const QMap<int,QString>& alist,
- bool loadAllFiles,
- bool enableBinarySupport = false );
+ void initialise( const QMap<int,QString>& alist, bool loadAllFiles);
HbCss::Value findAttribute( const QGraphicsWidget * aWidget,
const QString& attributeName ) const;
--- a/src/hbcore/theme/hbeffecttheme_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/theme/hbeffecttheme_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -25,9 +25,6 @@
#include "hbeffecttheme_p.h"
#include "hbthemecommon_p.h"
-#include "hbstandarddirs_p.h"
-#include "hbinstance.h"
-#include "hbthemeutils_p.h"
#include "hbeffectinternal_p.h"
#include "hbthemeindex_p.h"
#include "hbtheme.h"
@@ -36,9 +33,7 @@
#include <QDebug>
#include <QDir>
-#ifdef Q_OS_SYMBIAN
static const char *effectFileSuffix = ".fxml";
-#endif
class HB_AUTOTEST_EXPORT HbEffectThemePrivate
{
@@ -47,26 +42,13 @@
~HbEffectThemePrivate();
void initialise(const QString &themeName);
+public:
QString mThemeName;
- QStringList mDirList;
- QStringList mListOfExistingFolders;
};
void HbEffectThemePrivate::initialise(const QString &themeName)
{
mThemeName = themeName;
-
- QMap<int, QString> maplist = HbThemeUtils::constructHierarchyListWithPathInfo(
- QString(), mThemeName, Hb::EffectResource);
-
- mDirList.clear();
- QList<QString> list = maplist.values(); // sorted by key
- for (int i = list.count() - 1; i >= 0; --i) { // take highest prio first
- mDirList.append(list.at(i));
- }
-
- mListOfExistingFolders = HbStandardDirs::findExistingFolderList(mDirList, mThemeName,
- Hb::EffectResource);
}
HbEffectThemePrivate::HbEffectThemePrivate()
@@ -91,37 +73,22 @@
#ifdef THEME_INDEX_TRACES
qDebug() << "ThemeIndex: getEffectXml effect: " << fileNameLogical;
#endif
-
-#ifdef Q_OS_SYMBIAN
- // Try to get themed icon information from theme index
- QString resourceName(fileNameLogical);
- resourceName.append(effectFileSuffix);
- HbThemeIndexResource resource(resourceName);
- if (resource.isValid()) {
- return resource.fullFileName();
- }
-#endif // Q_OS_SYMBIAN
-
- // Assuming logical name will not have '.' and full filepath will
- // always have some extension.
- if (!fileNameLogical.contains('.')) {
- #ifdef THEME_INDEX_TRACES
- qDebug() << "ThemeIndex: getEffectXml index not used, do a lookup from file system!";
- #endif
+ if (HbThemeUtils::isLogicalName(fileNameLogical)) {
+ // Try to get themed icon information from theme index
+ QString resourceName(fileNameLogical);
+ resourceName.append(effectFileSuffix);
- foreach (const QString &dir, d_ptr->mListOfExistingFolders) {
- QString candidateFullName = dir + fileNameLogical + ".fxml";
- QFile resource(candidateFullName);
- if (resource.exists()) {
- if (d_ptr->mListOfExistingFolders.last() != dir) {
- fromTheme = true;
- }
- return candidateFullName;
- }
+ HbThemeIndexResource resource(resourceName);
+ if (resource.isValid()) {
+ fromTheme = true;
+ return resource.fullFileName();
}
}
- return fileNameLogical;
+
+ // Not a logical name or not found in theme
+ fromTheme = false;
+ return fileNameLogical;
}
HbEffectTheme::HbEffectTheme()
@@ -138,7 +105,6 @@
void HbEffectTheme::setCurrentTheme(const QString &themeName)
{
d_ptr->initialise(themeName);
- d_ptr->mThemeName = themeName;
HbEffectInternal::reloadFxmlFiles();
}
--- a/src/hbcore/theme/hbtheme.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/theme/hbtheme.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -85,7 +85,7 @@
*/
QString HbTheme::name() const
{
- return d_ptr->currentTheme;
+ return d_ptr->iconTheme.name();
}
/*!
@@ -145,10 +145,16 @@
*/
void HbThemePrivate::fetchCurrentThemeFromSettings()
{
+ HbThemeIndexInfo info = HbThemeUtils::getThemeIndexInfo(ActiveTheme);
+ if (info.themeIndexOffset > 0) {
+ currentTheme = info.name;
+ return;
+ }
+
+ // Fallback to settings
currentTheme = HbThemeUtils::getThemeSetting(HbThemeUtils::CurrentThemeSetting);
if (currentTheme.trimmed().isEmpty()){
currentTheme = HbThemeUtils::defaultTheme().name;
- HbThemeUtils::setThemeSetting(HbThemeUtils::CurrentThemeSetting, currentTheme);
}
}
@@ -160,10 +166,15 @@
Q_Q(HbTheme);
QString newTheme;
if (str.isEmpty()) {
- newTheme = HbThemeUtils::getThemeSetting(HbThemeUtils::CurrentThemeSetting);
+ HbThemeIndexInfo info = HbThemeUtils::getThemeIndexInfo(ActiveTheme);
+ if (info.themeIndexOffset > 0) {
+ newTheme = info.name;
+ } else {
+ newTheme = HbThemeUtils::getThemeSetting(HbThemeUtils::CurrentThemeSetting);
+ }
} else {
newTheme = str;
- // Update the new currentTheme setting in HbThemeUtils.
+ // Update the new currentTheme to local settings in HbThemeUtils.
HbThemeUtils::updateThemeSetting(HbThemeUtils::CurrentThemeSetting, newTheme);
}
@@ -173,16 +184,14 @@
// The server sends the signal only if the theme is changed from the previous theme
// Hence here, we need not check whether the theme differs from currentTheme or not.
- if(currentTheme != newTheme) {
- currentTheme = newTheme;
- // This should be used to replace pixmaps from the old theme with the pixmaps from the new theme
- // In application side this is needed only when icon size can be different in different theme.
- iconTheme.emitUpdateIcons();
+ currentTheme = newTheme;
+ // This should be used to replace pixmaps from the old theme with the pixmaps from the new theme
+ // In application side this is needed only when icon size can be different in different theme.
+ iconTheme.emitUpdateIcons();
- emit q->changed();
- // This signal should be used to update the screen after the theme change - it's handled by HbInstance.
- emit q->changeFinished();
- }
+ emit q->changed();
+ // This signal should be used to update the screen after the theme change - it's handled by HbInstance.
+ emit q->changeFinished();
}
/*!
--- a/src/hbcore/theme/hbtheme_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/theme/hbtheme_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -40,7 +40,6 @@
~HbThemePrivate();
static HbThemePrivate *d_ptr(HbTheme *t) { return t->d_func(); }
static HbThemePrivate *instance() { return HbTheme::instance()->d_func(); }
- QStringList iconDirectories() { return iconTheme.dirList();}
public:
QString currentTheme;
--- a/src/hbcore/theme/hbthemeclient_generic_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/theme/hbthemeclient_generic_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -120,13 +120,6 @@
delete localSocket;
}
-QSizeF HbThemeClientPrivate::getSharedIconDefaultSize(const QString &iconPath)
-{
- // Not implemented atm...
- Q_UNUSED(iconPath)
- return QSizeF();
-}
-
/**
* HbThemeClientPrivate::getSharedIconInfo()
*/
@@ -281,7 +274,7 @@
* HbThemeClientPrivate::getSharedStyleSheet()
*/
HbCss::StyleSheet *HbThemeClientPrivate::getSharedStyleSheet(
- const QString &fileName, HbLayeredStyleLoader::LayerPriority priority)
+ const QString &filePath, HbLayeredStyleLoader::LayerPriority priority)
{
#ifdef THEME_SERVER_TRACES
qDebug() << Q_FUNC_INFO;
@@ -296,7 +289,7 @@
HbThemeServerRequest requestType = EStyleSheetLookup;
outputDataStream << int(requestType);
- outputDataStream << fileName;
+ outputDataStream << filePath;
outputDataStream << priority;
disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
@@ -1016,6 +1009,24 @@
}
/**
+ * HbThemeClientPrivate::setTheme()
+ */
+void HbThemeClientPrivate::setTheme(const QString &theme)
+{
+ if ( !clientConnected ) {
+ return;
+ }
+
+ QByteArray outputByteArray;
+ QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
+ HbThemeServerRequest requestType = EThemeSelection;
+ outputDataStream << (int)requestType;
+ outputDataStream << theme;
+ localSocket->write(outputByteArray);
+ localSocket->flush();
+}
+
+/**
* HbThemeClientPrivate::notifyForegroundLostToServer()
*/
void HbThemeClientPrivate::notifyForegroundLostToServer()
--- a/src/hbcore/theme/hbthemeclient_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/theme/hbthemeclient_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -28,7 +28,9 @@
#include "hbsharedmemorymanager_p.h"
#include "hbmemoryutils_p.h"
-static HbThemeClient *clientInst=0;
+static const QLatin1String ResourceStylePath(":/themes/style/hbdefault/");
+
+static HbThemeClient *clientInst = 0;
/**
* Constructor
@@ -47,12 +49,6 @@
return d->connectToServer();
}
-QSizeF HbThemeClient::getSharedIconDefaultSize(const QString &iconPath)
-{
- Q_D(HbThemeClient);
- return d->getSharedIconDefaultSize(iconPath);
-}
-
/**
* HbThemeClient::getSharedIconInfo()
*
@@ -131,47 +127,67 @@
/**
* HbThemeClient::getSharedStyleSheet()
*
- * \a fielName css filename
+ * \a filePath css filepath. Only acceptable path separator is '/'.
* \a priority layer priority
*/
-HbCss::StyleSheet *HbThemeClient::getSharedStyleSheet(const QString &fileName,
+HbCss::StyleSheet *HbThemeClient::getSharedStyleSheet(const QString &filePath,
HbLayeredStyleLoader::LayerPriority priority)
{
- int offset = -1;
- if( HbLayeredStyleLoader::Priority_Core == priority ) {
- offset = sharedCacheItemOffset(HbSharedCache::Stylesheet, fileName);
+ const QString filePathFixed = QDir::fromNativeSeparators(filePath);
+
+ HbCss::StyleSheet *styleSheet = 0;
+ bool requestFromServer = true;
+ if (filePathFixed.startsWith(QLatin1Char(':')) && !filePathFixed.startsWith(ResourceStylePath)) {
+ //filePathFixed is located in application resource, parse it on client side.
+ requestFromServer = false;
}
- if ( -1 != offset ) {
- HbCss::StyleSheet *styleSheet =
- HbMemoryUtils::getAddress<HbCss::StyleSheet>(HbMemoryManager::SharedMemory,
- offset);
- return styleSheet;
+ if (requestFromServer) {
+ int offset = -1;
+ if(HbLayeredStyleLoader::Priority_Core == priority) {
+ offset = sharedCacheItemOffset(HbSharedCache::Stylesheet, filePathFixed);
+ }
+ if ( -1 != offset ) {
+ styleSheet =
+ HbMemoryUtils::getAddress<HbCss::StyleSheet>(HbMemoryManager::SharedMemory,
+ offset);
+ } else {
+ Q_D(HbThemeClient);
+ styleSheet = d->getSharedStyleSheet(filePathFixed, priority);
+ }
}
- Q_D(HbThemeClient);
- return d->getSharedStyleSheet(fileName,priority);
+ return styleSheet;
}
/**
* HbThemeClient::getSharedLayoutDefs()
- *
- * \a fileName
- * \a layout
- * \a section
+ * \a filePath layout definition filepath. Only acceptable path separator is '/'.
+ * \a layout layout name
+ * \a section section name
*/
-HbWidgetLoader::LayoutDefinition *HbThemeClient::getSharedLayoutDefs(const QString &fileName,
+HbWidgetLoader::LayoutDefinition *HbThemeClient::getSharedLayoutDefs(const QString &filePath,
const QString &layout,
const QString §ion)
{
- int offset = sharedCacheItemOffset(HbSharedCache::LayoutDefinition,
- fileName + layout + section);
- if ( -1 != offset ) {
- HbWidgetLoader::LayoutDefinition *layoutDefs =
- HbMemoryUtils::getAddress<HbWidgetLoader::LayoutDefinition>(HbMemoryManager::SharedMemory,
- offset);
- return layoutDefs;
+ const QString filePathFixed = QDir::fromNativeSeparators(filePath);
+
+ HbWidgetLoader::LayoutDefinition *layoutDefinition = 0;
+ bool requestFromServer = true;
+ if (filePathFixed.startsWith(QLatin1Char(':')) && !filePathFixed.startsWith(ResourceStylePath)) {
+ //filePathFixed is located in application resource, parse it on client side.
+ requestFromServer = false;
}
- Q_D(HbThemeClient);
- return d->getSharedLayoutDefs(fileName,layout,section);
+ if (requestFromServer) {
+ int offset = sharedCacheLayoutDefinitionOffset(filePathFixed, layout, section);
+ if (offset != -1) {
+ layoutDefinition =
+ HbMemoryUtils::getAddress<HbWidgetLoader::LayoutDefinition>(
+ HbMemoryManager::SharedMemory, offset);
+ } else {
+ Q_D(HbThemeClient);
+ layoutDefinition = d->getSharedLayoutDefs(filePathFixed, layout, section);
+ }
+ }
+ return layoutDefinition;
}
/**
* HbThemeClient::deviceProfiles()
@@ -204,34 +220,38 @@
/**
* HbThemeClient::getSharedEffect()
*
- * \a filePath
+ * \a filePath. Only acceptable path separator is '/'.
*/
HbEffectFxmlData *HbThemeClient::getSharedEffect(const QString &filePath)
{
- int offset = sharedCacheItemOffset(HbSharedCache::Effect, filePath);
+ const QString filePathFixed = QDir::fromNativeSeparators(filePath);
+
+ int offset = sharedCacheItemOffset(HbSharedCache::Effect, filePathFixed);
if ( -1 != offset ) {
HbEffectFxmlData *effectFxmlData =
HbMemoryUtils::getAddress<HbEffectFxmlData>(HbMemoryManager::SharedMemory, offset);
return effectFxmlData;
}
Q_D(HbThemeClient);
- return d->getSharedEffect(filePath);
+ return d->getSharedEffect(filePathFixed);
}
/**
* HbThemeClient::addSharedEffect()
*
- * \a filePath
+ * \a filePath. Only acceptable path separator is '/'.
*/
bool HbThemeClient::addSharedEffect(const QString& filePath)
{
- int offset = sharedCacheItemOffset(HbSharedCache::Effect, filePath);
+ const QString filePathFixed = QDir::fromNativeSeparators(filePath);
+
+ int offset = sharedCacheItemOffset(HbSharedCache::Effect, filePathFixed);
if ( -1 != offset ) {
// effect already added.
return true;
}
Q_D(HbThemeClient);
- return d->addSharedEffect(filePath);
+ return d->addSharedEffect(filePathFixed);
}
/**
@@ -331,12 +351,11 @@
}
/**
- * sharedCacheItemOffset function returns the offset of the cache item
- * for the given key
+ * returns the offset of the cache item for the given key
* \param key
*
*/
-int HbThemeClient::sharedCacheItemOffset(HbSharedCache::ItemType type, const QString & key)
+int HbThemeClient::sharedCacheItemOffset(HbSharedCache::ItemType type, const QString &key)
{
int offset = -1;
HbSharedCache *cache = HbSharedCache::instance();
@@ -346,6 +365,21 @@
return offset;
}
+/**
+ * returns the offset of the layout definition for the given file, layout and section.
+ */
+int HbThemeClient::sharedCacheLayoutDefinitionOffset(const QString &fileName,
+ const QString &layout,
+ const QString §ion)
+{
+ int offset = -1;
+ HbSharedCache *cache = HbSharedCache::instance();
+ if (cache) {
+ offset = cache->layoutDefinitionOffset(fileName, layout, section);
+ }
+ return offset;
+}
+
#ifdef HB_THEME_SERVER_MEMORY_REPORT
/**
* createMemoryReport creates memory report from current shared memory
@@ -415,3 +449,9 @@
Q_D(HbThemeClient);
return d->switchRenderingMode(renderMode);
}
+
+void HbThemeClient::setTheme(const QString &theme)
+{
+ Q_D(HbThemeClient);
+ d->setTheme(theme);
+}
--- a/src/hbcore/theme/hbthemeclient_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/theme/hbthemeclient_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -40,13 +40,11 @@
class HbThemeClientPrivate;
class HbEffectFxmlData;
-class HB_AUTOTEST_EXPORT HbThemeClient
+class HB_CORE_PRIVATE_EXPORT HbThemeClient
{
public:
bool connectToServer();
- QSizeF getSharedIconDefaultSize(const QString &iconPath);
-
HbSharedIconInfo getSharedIconInfo(const QString &iconPath,
const QSizeF &size,
Qt::AspectRatioMode aspectRatioMode,
@@ -62,7 +60,7 @@
const QString &layout,
const QString §ion);
HbCss::StyleSheet *getSharedStyleSheet(
- const QString &filepath,
+ const QString &filePath,
HbLayeredStyleLoader::LayerPriority priority);
HbEffectFxmlData *getSharedEffect(const QString &filePath);
@@ -108,9 +106,11 @@
HbIconLoader::IconLoaderOptions options,
const QColor &color,
HbRenderingMode renderMode);
-
+
bool switchRenderingMode(HbRenderingMode renderMode);
+ void setTheme(const QString &theme);
+
bool clientConnected() const;
#ifdef HB_THEME_SERVER_MEMORY_REPORT
@@ -128,6 +128,9 @@
private:
HbThemeClient();
int sharedCacheItemOffset(HbSharedCache::ItemType type, const QString &key);
+ int sharedCacheLayoutDefinitionOffset(const QString &filePath,
+ const QString &layout,
+ const QString §ion);
HbThemeClientPrivate *d_ptr;
Q_DECLARE_PRIVATE_D(d_ptr, HbThemeClient)
};
--- a/src/hbcore/theme/hbthemeclient_p_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/theme/hbthemeclient_p_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -66,8 +66,6 @@
HbThemeClientPrivate();
bool connectToServer();
- QSizeF getSharedIconDefaultSize(const QString& iconPath);
-
HbSharedIconInfo getSharedIconInfo(const QString& iconPath ,
const QSizeF &size,
Qt::AspectRatioMode aspectRatioMode,
@@ -81,7 +79,7 @@
const QString &layout,
const QString §ion);
- HbCss::StyleSheet *getSharedStyleSheet(const QString &filepath,
+ HbCss::StyleSheet *getSharedStyleSheet(const QString &filePath,
HbLayeredStyleLoader::LayerPriority priority);
HbEffectFxmlData *getSharedEffect(const QString &filePath);
@@ -125,6 +123,7 @@
HbIconLoader::IconLoaderOptions options,
const QColor &color,
HbRenderingMode renderMode);
+ void setTheme(const QString &theme);
void notifyForegroundLostToServer();
bool switchRenderingMode(HbRenderingMode renderMode);
int freeSharedMemory();
--- a/src/hbcore/theme/hbthemeclient_symbian_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/theme/hbthemeclient_symbian_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -103,30 +103,6 @@
KThemeServerBuildVersionNumber));
}
-QSizeF HbThemeClientPrivate::getSharedIconDefaultSize(const QString &iconPath)
-{
- if (!clientConnected) {
- return QSizeF();
- }
-
- QSizeF defaultSize;
-
- TBuf<256> buffer(iconPath.utf16());
- TPckg<QSizeF> retPckg(defaultSize);
-
- TIconParams params;
- params.fileName = buffer;
-
- TPckg<TIconParams> paramPckg(params);
- TIpcArgs args(¶mPckg, &retPckg);
-
- TInt err = SendReceive(EIconDefaultSize, args);
- if (KErrNone != err) {
- defaultSize = QSizeF();
- }
- return defaultSize;
-}
-
/**
* HbThemeClientPrivate::getSharedIconInfo()
*
@@ -629,6 +605,15 @@
}
/**
+ * HbThemeClientPrivate::setTheme()
+ */
+void HbThemeClientPrivate::setTheme(const QString &theme)
+{
+ // In Symbian P&S is used to change active theme
+ Q_UNUSED(theme);
+}
+
+/**
* Notifies the server about the foreground lost event.
*/
void HbThemeClientPrivate::notifyForegroundLostToServer()
--- a/src/hbcore/theme/hbthemecommon_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/theme/hbthemecommon_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -277,7 +277,6 @@
enum HbThemeServerRequest {
EInvalidServerRequest = 0,
EIconLookup = 1,
- EIconDefaultSize,
EStyleSheetLookup,
EThemeSelection,
EMultiPieceIcon,
--- a/src/hbcore/theme/hbthemelistener_symbian_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/theme/hbthemelistener_symbian_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -67,6 +67,12 @@
#endif
mRepository->NotifyRequest(HbThemeUtils::CurrentThemeSetting, iStatus);
SetActive();
+ HbThemeIndexInfo info = HbThemeUtils::getThemeIndexInfo(ActiveTheme);
+ if (info.themeIndexOffset > 0) {
+ themeClient->handleThemeChange(info.name);
+ return;
+ }
+ // Fallback to reading cenrep
TBuf<256> newTheme;
if (KErrNone == mRepository->Get(HbThemeUtils::CurrentThemeSetting, newTheme)) {
QString qnewTheme((QChar*)newTheme.Ptr(), newTheme.Length());
--- a/src/hbcore/theme/hbthemeutils_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/theme/hbthemeutils_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -52,7 +52,7 @@
const char *HbThemeUtils::effectsResourceFolder = "effects";
const char *HbThemeUtils::styleResourceFolder = "style";
const char *HbThemeUtils::themeResourceFolder = "theme";
-const char *HbThemeUtils::operatorHierarchy = "operatortheme";
+const char *HbThemeUtils::operatorHierarchy = "prioritytheme";
const char *HbThemeUtils::appHierarchy = "apptheme";
const char *HbThemeUtils::platformHierarchy = "themes";
@@ -290,42 +290,90 @@
* @ret list of hierarchy of themes in priority.Also appends the default path with least priority.
*/
QMap<int, QString> HbThemeUtils::constructHierarchyListWithPathInfo(const QString &fileName,
- const QString ¤tTheme,
- const Hb::ResourceType resType)
+ const QString ¤tTheme,
+ const Hb::ResourceType resType)
{
QMap<int,QString> hierarchyListWithPathInfo;
// Map the resource enum to string here
const QString &resourcePath = getResourceFolderName(resType);
-
+#ifdef Q_OS_SYMBIAN
foreach (const HbHierarchy &hierarchy, d.hierarchies) {
switch(hierarchy.layerPriority) {
- case HbLayeredStyleLoader::Priority_Operator:
- if (!d.operatorPath.isEmpty()) {
- hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Operator,
- d.constructOperatorPath(operatorBasePath(), fileName));
+ case HbLayeredStyleLoader::Priority_Operator: {
+ // Operator C drive path
+ HbThemeIndexInfo info = HbThemeUtils::getThemeIndexInfo(OperatorC);
+ if (info.themeIndexOffset > 0) {
+
+ hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Operator,
+ (info.path + '/' + resourcePath + '/' + info.name + '/' + fileName));
+ }
+ // Operator ROM path
+ info = HbThemeUtils::getThemeIndexInfo(OperatorROM);
+ if (info.themeIndexOffset > 0) {
+ hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Operator,
+ (info.path + '/' + resourcePath + '/' + info.name + '/' + fileName));
+ }
+ break;
+ }
+ case HbLayeredStyleLoader::Priority_Theme: {
+ HbThemeIndexInfo info = HbThemeUtils::getThemeIndexInfo(ActiveTheme);
+ if (info.themeIndexOffset > 0) {
+ hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Theme,
+ (info.path + '/' + resourcePath + '/' + info.name + '/' + fileName));
+ }
+ break;
}
- break;
- case HbLayeredStyleLoader::Priority_Application:
- hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Application,
+ default: {
+ // this is for a new hierarchy level and for the time being HbLayeredStyleLoader::Priority_Theme prirority
+ // is used,since there is no enum defined in hblayeredstyleloader_p.h
+ // priority should be replaced with respective enum.
+ hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Theme,
+ (hierarchy.name + '/' + resourcePath + '/' + currentTheme + '/' + fileName));
+ }
+ }
+ }
+ // lets add base CSS path too in this list for now
+ // This comes last in base hierarchy
+ HbThemeIndexInfo info = HbThemeUtils::getThemeIndexInfo(BaseTheme);
+ if (info.themeIndexOffset > 0) {
+ hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Core,
+ (info.path + '/' + resourcePath + '/' + info.name + '/' + fileName));
+ }
+
+#else
+ foreach (const HbHierarchy &hierarchy, d.hierarchies) {
+ switch(hierarchy.layerPriority) {
+ case HbLayeredStyleLoader::Priority_Operator: {
+ if (!d.operatorPath.isEmpty()) {
+ hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Operator,
+ d.constructOperatorPath(operatorBasePath(), fileName));
+ }
+ break;
+ }
+ case HbLayeredStyleLoader::Priority_Application: {
+ hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Application,
(hierarchy.name + '/' + HbMemoryUtils::getCleanAppName() + '/' +
resourcePath + '/' + currentTheme + '/' + fileName));
- break;
- case HbLayeredStyleLoader::Priority_Theme:
- // Add platform theme folder only if it is different from base theme
- // Base theme is anyway added at the core priority
- if (currentTheme != baseTheme().name) {
- hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Theme,
+ break;
+ }
+ case HbLayeredStyleLoader::Priority_Theme: {
+ if (currentTheme != baseTheme().name) {
+ // Add platform theme folder only if it is different from base theme
+ // Base theme is anyway added at the core priority
+ hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Theme,
+ (hierarchy.name + '/' + resourcePath + '/' + currentTheme + '/' + fileName));
+ }
+ break;
+ }
+ default: {
+ // this is for a new hierarchy level and for the time being
+ // HbLayeredStyleLoader::Priority_Theme prirority is used,
+ // since there is no enum defined in hblayeredstyleloader_p.h
+ // priority should be replaced with respective enum.
+ hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Theme,
(hierarchy.name + '/' + resourcePath + '/' + currentTheme + '/' + fileName));
}
- break;
- default:
- // this is for a new hierarchy level and for the time being
- // HbLayeredStyleLoader::Priority_Theme priority is used,
- // since there is no enum defined in hblayeredstyleloader_p.h
- // priority should be replaced with respective enum.
- hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Theme,
- (hierarchy.name + '/' + resourcePath + '/' + currentTheme + '/' + fileName));
}
}
@@ -335,7 +383,7 @@
hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Core,
(QLatin1String("themes/") + resourcePath + '/' + baseTheme().name + '/' + fileName));
}
-
+#endif // Q_OS_SYMBIAN
return hierarchyListWithPathInfo;
}
@@ -361,6 +409,16 @@
} else {
// So settings are initialized, it will have other value as well
baseThemeInfo.rootDir = getThemeSetting(DefaultThemeRootDirSetting).trimmed();
+ // On desktop platforms try the HB_THEMES_DIR environment variable instead of
+ // blindly sticking to the previous stored setting, the theme directory may have been
+ // moved meanwhile and that usually results in a changed HB_THEMES_DIR but nobody will
+ // update the our settings stored via QSettings.
+#ifndef Q_OS_SYMBIAN
+ QString themesDirFromEnv = HbStandardDirs::themesDir();
+ if (!themesDirFromEnv.isEmpty()) {
+ baseThemeInfo.rootDir = themesDirFromEnv;
+ }
+#endif
}
}
@@ -508,40 +566,54 @@
{
HbThemeIndexInfo info;
GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
- HbSharedChunkHeader *chunkHeader = (HbSharedChunkHeader*)(manager->base());
-
- switch(type) {
- case BaseTheme:
- info.name = QString(HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory,
- chunkHeader->baseThemeNameOffset));
- info.path = QString(HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory,
- chunkHeader->baseThemePathOffset));
- info.themeIndexOffset = chunkHeader->baseThemeIndexOffset;
- break;
- case OperatorC:
- info.name = QString(HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory,
- chunkHeader->operatorThemeDriveCNameOffset));
- info.path = QString(HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory,
- chunkHeader->operatorThemeDriveCPathOffset));
- info.themeIndexOffset = chunkHeader->operatorThemeDriveCIndexOffset;
- break;
- case OperatorROM:
- info.name = QString(HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory,
- chunkHeader->operatorThemeRomPathOffset));
- info.path = QString(HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory,
- chunkHeader->operatorThemeRomPathOffset));
- info.themeIndexOffset = chunkHeader->operatorThemeRomIndexOffset;
- break;
- case ActiveTheme:
- info.name = QString(HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory,
- chunkHeader->activeThemeNameOffset));
- info.path = QString(HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory,
- chunkHeader->activeThemePathOffset));
- info.themeIndexOffset = chunkHeader->activeThemeIndexOffset;
- break;
- default:
- break;
+ if (manager) {
+ HbSharedChunkHeader *chunkHeader = (HbSharedChunkHeader*)(manager->base());
+
+ switch(type) {
+ case BaseTheme:
+ if (chunkHeader->baseThemeIndexOffset > 0) {
+ info.name = QString(HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory,
+ chunkHeader->baseThemeNameOffset));
+ info.path = QString(HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory,
+ chunkHeader->baseThemePathOffset));
+ info.themeIndexOffset = chunkHeader->baseThemeIndexOffset;
+ }
+ break;
+ case OperatorC:
+ if (chunkHeader->operatorThemeDriveCIndexOffset > 0) {
+ info.name = QString(HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory,
+ chunkHeader->operatorThemeDriveCNameOffset));
+ info.path = QString(HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory,
+ chunkHeader->operatorThemeDriveCPathOffset));
+ info.themeIndexOffset = chunkHeader->operatorThemeDriveCIndexOffset;
+ }
+ break;
+ case OperatorROM:
+ if (chunkHeader->operatorThemeRomIndexOffset > 0) {
+ info.name = QString(HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory,
+ chunkHeader->operatorThemeRomNameOffset));
+ info.path = QString(HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory,
+ chunkHeader->operatorThemeRomPathOffset));
+ info.themeIndexOffset = chunkHeader->operatorThemeRomIndexOffset;
+ }
+ break;
+ case ActiveTheme:
+ if (chunkHeader->activeThemeIndexOffset > 0) {
+ info.name = QString(HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory,
+ chunkHeader->activeThemeNameOffset));
+ info.path = QString(HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory,
+ chunkHeader->activeThemePathOffset));
+ info.themeIndexOffset = chunkHeader->activeThemeIndexOffset;
+ }
+ break;
+ default:
+ break;
+ }
}
-
return info;
}
+
+bool HbThemeUtils::isLogicalName(const QString &fileName)
+{
+ return !(fileName.contains(QChar('/'), Qt::CaseSensitive) || fileName.contains(QChar('\\'), Qt::CaseSensitive));
+}
--- a/src/hbcore/theme/hbthemeutils_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/theme/hbthemeutils_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -109,7 +109,9 @@
static bool isThemeValid(const HbThemeInfo &themeInfo);
static HbThemeIndexInfo getThemeIndexInfo(const HbThemeType& type);
-
+
+ static bool isLogicalName(const QString &fileName);
+
// Standard folder names
static const char *iconsResourceFolder;
static const char *effectsResourceFolder;
@@ -127,4 +129,3 @@
};
#endif //HBTHEMEUTILS_P_H
-
--- a/src/hbcore/utils/hbdevicemodeinfo_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbdevicemodeinfo_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -23,23 +23,21 @@
**
****************************************************************************/
+#include "hbdevicemodeinfo_p.h"
+#include "hbwsiniparser_p.h"
#include <QMap>
#include <QFile>
#include <QDebug>
-#include "hbdevicemodeinfo_p.h"
-#include "hbwsiniparser_p.h"
-
class HbDeviceModeInfoPrivate
- {
-
+{
public:
HbDeviceModeInfoPrivate();
void init(const QString &wsIniFile);
public:
QMap<int, HbScreenMode> mModes;
- };
+};
void HbDeviceModeInfoPrivate::init(const QString &wsIniFile)
{
@@ -55,11 +53,11 @@
\brief Provides information abstracted from the platform information on all the valid device modes
All valid hardware and distinct user physical configurations should be accessed here.
-
+
*/
HbDeviceModeInfo::HbDeviceModeInfo(const QString &wsIniFile)
-: d_ptr(new HbDeviceModeInfoPrivate())
+ : d_ptr(new HbDeviceModeInfoPrivate())
{
d_ptr->init(wsIniFile);
}
@@ -81,13 +79,10 @@
HbScreenMode *HbDeviceModeInfo::mode(int key)
{
HbScreenMode *result(0);
- if (d_ptr->mModes.contains(key)){
+ if (d_ptr->mModes.contains(key)) {
HbScreenMode &resultRef = d_ptr->mModes[key];
result = &resultRef;
}
return result;
}
-
-
-
--- a/src/hbcore/utils/hbdevicemodeinfo_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbdevicemodeinfo_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -34,18 +34,18 @@
class HbScreenMode;
class HB_AUTOTEST_EXPORT HbDeviceModeInfo
- {
+{
public:
HbDeviceModeInfo(const QString &wsIniFile = QString());
~HbDeviceModeInfo();
-
+
QList<int> modeNumbers() const;
HbScreenMode *mode(int modeNumber);
private:
- HbDeviceModeInfoPrivate * const d_ptr;
+ HbDeviceModeInfoPrivate *const d_ptr;
Q_DISABLE_COPY(HbDeviceModeInfo)
Q_DECLARE_PRIVATE_D(d_ptr, HbDeviceModeInfo)
- };
+};
#endif // HBDEVICEMODEINFO_H
--- a/src/hbcore/utils/hbdeviceprofile.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbdeviceprofile.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -35,20 +35,20 @@
#include <QDebug>
// To store the pointer to the deviceProfiles at the client side.
-static HbDeviceProfileList *deviceProfilesList = NULL;
+static HbDeviceProfileList *deviceProfilesList = 0;
#define MM_PER_INCH 25.4
/*!
- @stable
+ @stable
@hbcore
\class HbDeviceProfile
- \brief HbDeviceProfile holds read-only device parameters.
-
- Instances of this class hold both concrete device specific information
- (e.g. physical display size) and aspects that have been configured for
+ \brief HbDeviceProfile holds read-only device parameters.
+
+ Instances of this class hold both concrete device specific information
+ (e.g. physical display size) and aspects that have been configured for
a specific device (e.g. orientation, unit value).
-
+
*/
/*!
@@ -79,7 +79,7 @@
{
if (d_ptr->deviceProfiles()) {
int count = deviceProfilesList->count();
- bool found( false );
+ bool found(false);
for (int i = 0; !found && i < count; i++) {
if (deviceProfilesList->at(i).mName == name) {
d_ptr->mProfile = deviceProfilesList->at(i);
@@ -174,8 +174,8 @@
}
/*!
- Returns name of alternate profile.
-
+ Returns name of alternate profile.
+
Currently this holds information of the profile which is activated
on layout switch. Use this information if you need to optimize
layout switch.
@@ -189,7 +189,7 @@
Returns standard unit value (denoted by 'un').
The unit value is a display-specific multiplier. It is used in intenal
- layout calculation.
+ layout calculation.
*/
qreal HbDeviceProfile::unitValue() const
{
@@ -209,7 +209,7 @@
/*!
Returns current global profile reflecting properties of primary display.
-
+
Usually, you should not use this method. Instead, use one of \c profile
methods.
*/
@@ -236,7 +236,7 @@
/*!
Returns current profile for this graphics item.
-
+
Graphics item must be tied to a scene and scene needs to be part of
main window. Otherwise, value returned by \c current is provided.
@@ -253,10 +253,10 @@
return current();
}
QList<QGraphicsView *> views = scene->views();
- foreach(QGraphicsView *view, views) {
+ foreach(QGraphicsView * view, views) {
HbMainWindow *window = qobject_cast<HbMainWindow *>(view);
if (window) {
- HbDeviceProfile profile =
+ HbDeviceProfile profile =
HbMainWindowPrivate::d_ptr(window)->profile();
if (!profile.isNull()) {
@@ -280,9 +280,9 @@
QStringList HbDeviceProfilePrivate::profileNames()
{
QStringList profileNames;
- if(deviceProfiles()){
+ if (deviceProfiles()) {
int profilesCount = deviceProfilesList->count();
- for(int i = 0;i < profilesCount ; i++) {
+ for (int i = 0; i < profilesCount ; i++) {
profileNames.append(deviceProfilesList->at(i).mName);
}
}
@@ -299,19 +299,19 @@
HbDeviceProfileList *HbDeviceProfilePrivate::deviceProfiles()
{
- if(!deviceProfilesList) {
- // Will result in IPC call. gets the shared memory offset from themeserver.
+ if (!deviceProfilesList) {
+ // Will result in IPC call. gets the shared memory offset from themeserver.
deviceProfilesList = HbThemeClient::global()->deviceProfiles();
}
-
- if(!deviceProfilesList) {
+
+ if (!deviceProfilesList) {
// This is fall back.Create/Get the HbDeviceProfileDatabase Instance at
// the client side and read the deviceProfilesList.
- qDebug()<<"DeviceProfile offset not returned by themeserver .. working in fallback mode";
+ qDebug() << "DeviceProfile offset not returned by themeserver .. working in fallback mode";
HbDeviceProfileDatabase *deviceProfileDataBase =
- HbDeviceProfileDatabase::instance(HbMemoryManager::HeapMemory);
+ HbDeviceProfileDatabase::instance(HbMemoryManager::HeapMemory);
deviceProfilesList = HbMemoryUtils::getAddress<HbDeviceProfileList>(HbMemoryManager::HeapMemory,
- deviceProfileDataBase->deviceProfilesOffset());
+ deviceProfileDataBase->deviceProfilesOffset());
}
return deviceProfilesList;
}
--- a/src/hbcore/utils/hbdeviceprofile.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbdeviceprofile.h Fri Jun 11 13:58:22 2010 +0300
@@ -49,7 +49,7 @@
explicit HbDeviceProfile(const QString &name);
~HbDeviceProfile();
- HbDeviceProfile &operator=(const HbDeviceProfile &other);
+ HbDeviceProfile &operator=(const HbDeviceProfile &other);
bool isNull() const;
@@ -58,17 +58,17 @@
QSizeF physicalSize() const;
QString alternateProfileName() const;
bool touch() const;
-
+
Qt::Orientation orientation() const;
qreal orientationAngle() const;
qreal unitValue() const;
qreal ppmValue() const;
-
+
static HbDeviceProfile current();
static HbDeviceProfile profile(const HbMainWindow *window);
static HbDeviceProfile profile(const QGraphicsItem *item);
-
- static QStringList profileNames();
+
+ static QStringList profileNames();
protected:
QSharedDataPointer<HbDeviceProfilePrivate> d_ptr;
};
--- a/src/hbcore/utils/hbdeviceprofile_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbdeviceprofile_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -31,11 +31,10 @@
#include "hbvector_p.h"
#include <QSharedData>
-struct DeviceProfile
-{
+struct DeviceProfile {
HbString mName;
HbString mAltName;
-
+
QSize mLogicalSize;
qreal mUnitValue;
qreal mPpiValue;
@@ -45,8 +44,7 @@
DeviceProfile(HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory)
: mName(type), mAltName(type), mUnitValue(1), mPpiValue(1),
- mTouch(true), mUiMetricsFile(type), mOrientationAngle(0)
- {
+ mTouch(true), mUiMetricsFile(type), mOrientationAngle(0) {
}
};
--- a/src/hbcore/utils/hbdeviceprofiledatabase_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbdeviceprofiledatabase_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -48,17 +48,17 @@
/*
\class HbDeviceProfileDatabase
\brief HbDeviceProfileDatabase provides access to supported profile information.
- This uses HbDeviceProfileReader and HbWsiniParser to parse the display definition
- xml and the device mode ini files respectively. After parsing the files HbDeviceProfileDataBase
- will store the List of profiles i.e HbDeviceProfileList in to the sharedmemory and maintains
- the offset of it. This class is used by client/server.
+ This uses HbDeviceProfileReader and HbWsiniParser to parse the display definition
+ xml and the device mode ini files respectively. After parsing the files HbDeviceProfileDataBase
+ will store the List of profiles i.e HbDeviceProfileList in to the sharedmemory and maintains
+ the offset of it. This class is used by client/server.
Themeserver will use this class when it starts up.
Client uses this class when it is unable to get the deviceprofile information
from the themeserver.
-
- This class is not supposed to use directly. Instead, use \c HbDeviceProfile
+
+ This class is not supposed to use directly. Instead, use \c HbDeviceProfile
and \c HbExtendedDeviceProfile.
-
+
\sa HbDeviceProfile
\sa HbExtendedDeviceProfile
\internal
@@ -75,15 +75,15 @@
Constructor.
*/
HbDeviceProfileDatabase::HbDeviceProfileDatabase(HbMemoryManager::MemoryType type)
- : mDeviceProfiles(0),mDeviceModes(0),mDeviceProfilesOffset(-1),mType(type)
+ : mDeviceProfiles(0), mDeviceModes(0), mDeviceProfilesOffset(-1), mType(type)
{
GET_MEMORY_MANAGER(mType);
try {
mDeviceProfilesOffset = manager->alloc(sizeof(HbDeviceProfileList));
- mDeviceProfiles = new((char*)manager->base() + mDeviceProfilesOffset)
- HbDeviceProfileList(mType);
+ mDeviceProfiles = new((char *)manager->base() + mDeviceProfilesOffset)
+ HbDeviceProfileList(mType);
init();
- } catch(std::exception &) {
+ } catch (std::exception &) {
if (mDeviceProfilesOffset != -1) {
if (mDeviceProfiles) {
mDeviceProfiles->~HbDeviceProfileList();
@@ -91,7 +91,7 @@
}
manager->free(mDeviceProfilesOffset);
mDeviceProfilesOffset = -1;
- }
+ }
}
}
@@ -106,19 +106,20 @@
*/
void HbDeviceProfileDatabase::init()
{
- HbDeviceProfileReader reader(mDeviceProfiles,mType);
-
+ HbDeviceProfileReader reader(mDeviceProfiles, mType);
+
// resolve correct displaydefinition.xml path for emulator and HW (z:/resource)
// or desktop (Qt resource)
-
+
// from HW and emulator
QFile file("z:/resource/displaydefinition.xml");
-
- if (!file.exists())
+
+ if (!file.exists()) {
file.setFileName(":displaydefinition.xml");
+ }
if (!file.open(QIODevice::ReadOnly)) {
qWarning()
- << "HbDeviceProfileDatabase::init : opening file failed:";
+ << "HbDeviceProfileDatabase::init : opening file failed:";
} else {
reader.read(&file);
}
@@ -126,29 +127,29 @@
#ifndef SKIP_WSINI
// Get the device modes from the device itself
mDeviceModes = new HbDeviceModeInfo();
-
+
#if defined(Q_WS_S60)
const QRectF screenGeometry(qApp->desktop()->screenGeometry());
QSizeF screenSize(screenGeometry.size());
-
+
int i = 0;
bool done = false;
while (i < mDeviceProfiles->size() && !done) {
DeviceProfile profile = mDeviceProfiles->at(i);
- if (profile.mLogicalSize.width() == screenSize.width() &&
- profile.mLogicalSize.height() == screenSize.height()) {
+ if (profile.mLogicalSize.width() == screenSize.width() &&
+ profile.mLogicalSize.height() == screenSize.height()) {
mDeviceProfiles->remove(i);
- mDeviceProfiles->insert(0,profile);
+ mDeviceProfiles->insert(0, profile);
done = true;
}
i++;
}
#endif
- completeProfileData();
+ completeProfileData();
#endif
#ifdef Q_OS_SYMBIAN
initOrientationStatus();
@@ -159,32 +160,32 @@
{
// Mark the device profiles as valid or not depending whether they match the device modes
// If there are no device modes read in, then no removal is done at all
- if (mDeviceProfiles && mDeviceModes && mDeviceModes->modeNumbers().count() > 0){
- for (int i = mDeviceProfiles->size()-1; i >= 0 ; --i) {
+ if (mDeviceProfiles && mDeviceModes && mDeviceModes->modeNumbers().count() > 0) {
+ for (int i = mDeviceProfiles->size() - 1; i >= 0 ; --i) {
QSize size(mDeviceProfiles->at(i).mLogicalSize);
bool found(false);
QList<int> l = mDeviceModes->modeNumbers();
for (int j = 0; j < l.count(); j++) {
HbScreenMode *mode = mDeviceModes->mode(l[j]);
- if (mode->pixelSize() == size){
+ if (mode->pixelSize() == size) {
found = true;
}
}
- if (!found && mDeviceProfiles->size()>1) {
+ if (!found && mDeviceProfiles->size() > 1) {
// Do not remove the 0-th display mode if is the only one left!
mDeviceProfiles->remove(i);
}
- }
- }
-
- if(mDeviceProfiles) {
+ }
+ }
+
+ if (mDeviceProfiles) {
const int numberOfProfiles = mDeviceProfiles->size();
for (int i = 0; i < numberOfProfiles; ++i) {
- if ( mDeviceProfiles->at(i).mAltName == "" ) {
+ if (mDeviceProfiles->at(i).mAltName.isEmpty()) {
QSize size(mDeviceProfiles->at(i).mLogicalSize);
QSize altLogicalSize(size.height(), size.width());
- for (int j = 0; j < numberOfProfiles; ++j ) {
- if ( i != j && altLogicalSize == mDeviceProfiles->at(j).mLogicalSize) {
+ for (int j = 0; j < numberOfProfiles; ++j) {
+ if (i != j && altLogicalSize == mDeviceProfiles->at(j).mLogicalSize) {
mDeviceProfiles->at(i).mAltName = mDeviceProfiles->at(j).mName;
break;
}
@@ -196,8 +197,9 @@
#ifdef Q_OS_SYMBIAN
-void HbDeviceProfileDatabase::initOrientationStatus() {
- if(HbMemoryManager::SharedMemory == mType) {
+void HbDeviceProfileDatabase::initOrientationStatus()
+{
+ if (HbMemoryManager::SharedMemory == mType) {
Qt::Orientation defaultOrientation = Qt::Vertical;
if (mDeviceProfiles && mDeviceProfiles->count()) {
QSize s = mDeviceProfiles->at(0).mLogicalSize;
--- a/src/hbcore/utils/hbdeviceprofiledatabase_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbdeviceprofiledatabase_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -38,20 +38,20 @@
{
public:
static HbDeviceProfileDatabase *instance(HbMemoryManager::MemoryType type =
- HbMemoryManager::HeapMemory);
+ HbMemoryManager::HeapMemory);
int deviceProfilesOffset();
private:
HbDeviceProfileDatabase(HbMemoryManager::MemoryType type =
- HbMemoryManager::HeapMemory);
+ HbMemoryManager::HeapMemory);
void init();
void completeProfileData();
#ifdef Q_OS_SYMBIAN
void initOrientationStatus();
#endif //Q_OS_SYMBIAN
Q_DISABLE_COPY(HbDeviceProfileDatabase)
-
+
private:
HbDeviceProfileList *mDeviceProfiles;
HbDeviceModeInfo *mDeviceModes;
--- a/src/hbcore/utils/hbdeviceprofilemanager_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbdeviceprofilemanager_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -31,12 +31,12 @@
/*
\class HbDeviceProfileManager
\brief HbDeviceProfileManager allows to select specific profile to be used.
-
+
This class is mostly for development purposes where there is need to test
applications in different resolutions and settings.
-
+
\sa HbDeviceProfile
-
+
\proto
*/
--- a/src/hbcore/utils/hbdeviceprofilereader_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbdeviceprofilereader_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -44,9 +44,9 @@
/*! Constructor.
*/
HbDeviceProfileReader::HbDeviceProfileReader(HbDeviceProfileList *profileList,
- HbMemoryManager::MemoryType type
- )
- : QXmlStreamReader(), mDeviceProfileList(profileList),mType(type)
+ HbMemoryManager::MemoryType type
+ )
+ : QXmlStreamReader(), mDeviceProfileList(profileList), mType(type)
{
}
@@ -74,7 +74,7 @@
readNext();
if (isStartElement()) {
- if ( name() == "displayDefinition" ) {
+ if (name() == "displayDefinition") {
readDisplayDefinitions();
} else {
raiseError(
@@ -98,13 +98,14 @@
if (isEndElement()) {
continue;
- }
+ }
if (isStartElement()) {
- if (name() == "display")
+ if (name() == "display") {
readAttributes();
- else
+ } else {
readUnknownElement();
+ }
}
}
}
@@ -114,10 +115,10 @@
*/
void HbDeviceProfileReader::readAttributes()
- {
+{
Q_ASSERT(isStartElement() && name() == "display");
QXmlStreamAttributes attrs = attributes();
-
+
DeviceProfile deviceProfile(mType);
int w = attrs.value("resolutionWidth").toString().toInt();
@@ -127,13 +128,13 @@
QString orientationStr = "portrait";
QString altOrientationStr = "landscape";
- if ( w > h ) {
+ if (w > h) {
orientationStr = "landscape";
altOrientationStr = "portrait";
}
deviceProfile.mUnitValue = attrs.value("unitValue").toString().toFloat();
deviceProfile.mPpiValue = attrs.value("ppiValue").toString().toFloat();
- deviceProfile.mOrientationAngle= attrs.value("orientationAngle").toString().toInt();
+ deviceProfile.mOrientationAngle = attrs.value("orientationAngle").toString().toInt();
QString resName = attrs.value("resolutionName").toString();
// Legacy support for deprecated "styleName"
@@ -142,22 +143,21 @@
}
// Calculate inch size
- qreal diagonal = qSqrt((qreal)(w*w+h*h)); // in "pixels"
- int inchSizeX10 = qRound(10*(diagonal / deviceProfile.mPpiValue));
- QString inchSizeStr = QString::number(inchSizeX10/10);
+ qreal diagonal = qSqrt((qreal)(w * w + h * h)); // in "pixels"
+ int inchSizeX10 = qRound(10 * (diagonal / deviceProfile.mPpiValue));
+ QString inchSizeStr = QString::number(inchSizeX10 / 10);
inchSizeStr.append('.');
- inchSizeStr.append(QString::number(inchSizeX10%10));
+ inchSizeStr.append(QString::number(inchSizeX10 % 10));
deviceProfile.mName = resName + '-' + inchSizeStr + "-inch_" + orientationStr;
deviceProfile.mAltName = resName + '-' + inchSizeStr + "-inch_" + altOrientationStr;
bool defaultMode = false;
defaultMode = attrs.value("defaultMode").toString() == "true";
-
+
if (defaultMode) {
mDeviceProfileList->insert(0, deviceProfile);
- }
- else {
+ } else {
mDeviceProfileList->append(deviceProfile);
}
}
--- a/src/hbcore/utils/hbfontspec.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbfontspec.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -33,7 +33,7 @@
#include <QFont>
/*!
- @stable
+ @stable
@hbcore
\class HbFontSpec
\brief HbFontSpec is used to request a system font.
@@ -142,31 +142,31 @@
#ifdef HB_BOOTSTRAPPED
return 0;
#else
- if ( (mRole != HbFontSpec::Undefined) && (mTextHeight < 0) ) {
+ if ((mRole != HbFontSpec::Undefined) && (mTextHeight < 0)) {
qreal parameterValue;
QString parameterName;
- switch (mRole){
- case HbFontSpec::Primary:
- parameterName = "hb-param-text-height-primary";
- break;
- case HbFontSpec::Secondary:
- parameterName = "hb-param-text-height-secondary";
- break;
- case HbFontSpec::Title:
- parameterName = "hb-param-text-height-title";
- break;
- case HbFontSpec::PrimarySmall:
- parameterName = "hb-param-text-height-tiny";
- break;
- case HbFontSpec::Digital:
- default: // Usage of Secondary as the default system typeface
- parameterName = "hb-param-text-height-secondary";
- break;
+ switch (mRole) {
+ case HbFontSpec::Primary:
+ parameterName = "hb-param-text-height-primary";
+ break;
+ case HbFontSpec::Secondary:
+ parameterName = "hb-param-text-height-secondary";
+ break;
+ case HbFontSpec::Title:
+ parameterName = "hb-param-text-height-title";
+ break;
+ case HbFontSpec::PrimarySmall:
+ parameterName = "hb-param-text-height-tiny";
+ break;
+ case HbFontSpec::Digital:
+ default: // Usage of Secondary as the default system typeface
+ parameterName = "hb-param-text-height-secondary";
+ break;
}
- HbInstance::instance()->style()->parameter( parameterName, parameterValue );
+ HbInstance::instance()->style()->parameter(parameterName, parameterValue);
mTextHeight = parameterValue;
}
- return mTextHeight;
+ return mTextHeight;
#endif
}
@@ -178,7 +178,7 @@
#ifdef HB_BOOTSTRAPPED
return QFont();
#else
- if ( mRole == HbFontSpec::Undefined ) {
+ if (mRole == HbFontSpec::Undefined) {
return QFont();
}
QString typefaceFamily;
@@ -193,7 +193,7 @@
// Sets default size if text height is not set explicitly.
qreal height = textHeight();
- int downSizedSize = tInfo->textHeightToSizeInPixels(typefaceFamily, weight, height);
+ int downSizedSize = tInfo->textHeightToSizeInPixels(typefaceFamily, weight, height);
font.setPixelSize(downSizedSize);
return font;
@@ -212,7 +212,7 @@
/*!
Constructs a new font spec with the given font \a role.
*/
-HbFontSpec::HbFontSpec(HbFontSpec::Role role)
+HbFontSpec::HbFontSpec(HbFontSpec::Role role)
: d(new HbFontSpecPrivate())
{
d->mRole = role;
@@ -307,9 +307,9 @@
Returns true if this fontSpec is equal to \a other fontSpec; otherwise returns false.
*/
bool HbFontSpec::operator==(const HbFontSpec &other) const
-{
+{
return ((d->mRole == other.d->mRole)
- && qFuzzyCompare(d->textHeight(), other.d->textHeight()));
+ && qFuzzyCompare(d->textHeight(), other.d->textHeight()));
}
/*!
@@ -329,7 +329,7 @@
*/
qreal HbFontSpec::textHeight() const
{
- return d->textHeight();
+ return d->textHeight();
}
/*!
--- a/src/hbcore/utils/hbfontspec.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbfontspec.h Fri Jun 11 13:58:22 2010 +0300
@@ -40,8 +40,7 @@
Q_ENUMS(Role)
public:
- enum Role
- {
+ enum Role {
Undefined = 0,
Primary,
Secondary,
--- a/src/hbcore/utils/hbforegroundwatcher.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbforegroundwatcher.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -94,7 +94,7 @@
} else {
qWarning("HbForegroundWatcher: CoeEnv not available");
}
-
+
#endif
QApplication::instance()->installEventFilter(this);
HbSleepModeListener::instance(); // make sure the instance is created
@@ -116,7 +116,7 @@
if (THEME_SERVER_NAME == HbMemoryUtils::getCleanAppName()) {
return;
}
-
+
if (!mForeground) {
emit foregroundGained();
if (!hbInstance->allMainWindows().isEmpty()) {
@@ -128,7 +128,7 @@
HbMainWindow *mWindow = HbInstance::instance()->allMainWindows().first();
if (mWindow) {
HbMainWindowPrivate::d_ptr(mWindow)->updateForegroundOrientationPSKey();
- }
+ }
#endif //Q_OS_SYMBIAN
}
mForeground = true;
@@ -145,7 +145,7 @@
if (THEME_SERVER_NAME == HbMemoryUtils::getCleanAppName()) {
return;
}
-
+
if (mForeground) {
emit foregroundLost();
if (!hbInstance->allMainWindows().isEmpty()) {
--- a/src/hbcore/utils/hbforegroundwatcher_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbforegroundwatcher_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -41,7 +41,7 @@
class HB_CORE_PRIVATE_EXPORT HbForegroundWatcher : public QObject
#ifdef Q_OS_SYMBIAN
-, public MCoeForegroundObserver
+ , public MCoeForegroundObserver
#endif
{
Q_OBJECT
@@ -49,7 +49,7 @@
public:
static HbForegroundWatcher *instance();
void setSensorListener(HbSensorListener *sensorListener);
-
+
signals:
void foregroundGained();
void foregroundLost();
--- a/src/hbcore/utils/hbiniparser.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbiniparser.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -37,57 +37,57 @@
HbIniParser::~HbIniParser()
{
}
-
+
/*
The main function that populates the map data.
currently the data is case sensitive and all api behave that way.
*/
bool HbIniParser::read(QIODevice *file)
{
- if(!file->isOpen())
+ if (!file->isOpen()) {
return false;
-
+ }
+
QByteArray line;
-
+
HbIniGroup groupData;
QString groupName;
-
- while(!file->atEnd()) {
- line=file->readLine().trimmed();
- if (line.isEmpty() || line.at(0) == '#') {
- continue;
+
+ while (!file->atEnd()) {
+ line = file->readLine().trimmed();
+ if (line.isEmpty() || line.at(0) == '#') {
+ continue;
}
-
+
if (line.at(0) == '[') { // found a group
//add old group data
- if(!groupName.isEmpty()) {
- mData.insert(groupName,groupData);
+ if (!groupName.isEmpty()) {
+ mData.insert(groupName, groupData);
groupData.clear();
}
-
- groupName = line.mid (1, line.indexOf(']') - 1);
+
+ groupName = line.mid(1, line.indexOf(']') - 1);
if (groupName.isEmpty()) {
return false; //error in file
- }
- }
- else {
- QByteArray key,value;
+ }
+ } else {
+ QByteArray key, value;
int equalPosition = line.indexOf('=');
if (equalPosition > 0) {
- key = line.left (equalPosition).trimmed();
- line.remove(0,equalPosition+1);
+ key = line.left(equalPosition).trimmed();
+ line.remove(0, equalPosition + 1);
value = line.trimmed();
- groupData.insert(key,value);
+ groupData.insert(key, value);
}
- }
+ }
}
- if(!groupName.isEmpty()) {
- mData.insert(groupName,groupData);
+ if (!groupName.isEmpty()) {
+ mData.insert(groupName, groupData);
groupData.clear();
}
return true;
}
-
+
bool HbIniParser::setCurrentGroup(const QString &name)
{
if (mData.contains(name)) {
@@ -101,10 +101,10 @@
{
return mCurrentGroup;
}
-
-const QString HbIniParser::value(const QString &groupName,const QString &key) const
+
+const QString HbIniParser::value(const QString &groupName, const QString &key) const
{
- if(!mData.contains(groupName)){
+ if (!mData.contains(groupName)) {
return QString();
}
return mData.value(groupName).value(key);
@@ -112,11 +112,11 @@
const QString HbIniParser::value(const QString &key) const
{
- if(mCurrentGroup.isEmpty()) {
+ if (mCurrentGroup.isEmpty()) {
return QString();
}
return mData.value(mCurrentGroup).value(key);
-}
+}
QStringList HbIniParser::groups() const
{
--- a/src/hbcore/utils/hbiniparser_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbiniparser_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -32,25 +32,25 @@
#include <QMap>
#include <hbglobal.h>
-class HB_AUTOTEST_EXPORT HbIniParser
+class HB_AUTOTEST_EXPORT HbIniParser
{
public:
HbIniParser();
~HbIniParser();
-
+
bool read(QIODevice *file);
-
+
QStringList groups() const;
bool setCurrentGroup(const QString &name);
QString currentGroup();
-
- const QString value(const QString &groupName,const QString &key) const;
- const QString value(const QString &key) const;
-
+
+ const QString value(const QString &groupName, const QString &key) const;
+ const QString value(const QString &key) const;
+
private:
- QString mCurrentGroup;
- typedef QMap<QString,QString> HbIniGroup;
- QMap<QString,HbIniGroup> mData;
+ QString mCurrentGroup;
+ typedef QMap<QString, QString> HbIniGroup;
+ QMap<QString, HbIniGroup> mData;
};
#endif
--- a/src/hbcore/utils/hboogmwatcher.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hboogmwatcher.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -71,7 +71,7 @@
static HbOogmWatcher *watcher = new HbOogmWatcher(qApp);
return watcher;
}
-
+
HbOogmWatcher::HbOogmWatcher(QObject *parent)
: QObject(parent), d_ptr(new HbOogmWatcherPrivate)
{
@@ -102,10 +102,10 @@
void HbOogmWatcherPrivate::graphicsMemoryLow()
{
qWarning("HbOogmWatcher::graphicsMemoryLow()");
- if (mRenderMode == EHWRendering) {
+ if (mRenderMode == EHWRendering) {
mRenderMode = ESWRendering;
HbIconLoader::global()->switchRenderingMode(mRenderMode);
- }
+ }
#ifdef HB_EFFECTS_OPENVG
// Destroy the cached pixmaps of effects. This is also necessary
// to make the OpenVG filter effect caching working properly. (if
@@ -117,7 +117,7 @@
// Drop the underlying pixmap data (if possible) for all HbIconItems that
// are not currently visible.
int n = 0;
- foreach (HbIconItem *iconItem, mIconItems) {
+ foreach(HbIconItem * iconItem, mIconItems) {
if (!iconItem->isVisible()) {
HbIconItemPrivate::d_ptr(iconItem)->clearStoredIconContent();
++n;
@@ -133,10 +133,10 @@
void HbOogmWatcherPrivate::graphicsMemoryGood()
{
qWarning("HbOogmWatcher::graphicsMemoryGood()");
- if (mRenderMode == ESWRendering) {
+ if (mRenderMode == ESWRendering) {
mRenderMode = EHWRendering;
HbIconLoader::global()->switchRenderingMode(mRenderMode);
- }
+ }
emit q_ptr->graphicsMemoryGood();
}
--- a/src/hbcore/utils/hboogmwatcher_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hboogmwatcher_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -49,7 +49,7 @@
void iconCleanupDone(int count);
private:
- HbOogmWatcherPrivate * const d_ptr;
+ HbOogmWatcherPrivate *const d_ptr;
Q_DECLARE_PRIVATE_D(d_ptr, HbOogmWatcher)
HbOogmWatcher(QObject *parent = 0);
};
--- a/src/hbcore/utils/hboogmwatcher_sym_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hboogmwatcher_sym_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -46,7 +46,9 @@
void graphicsMemoryLow();
void graphicsMemoryGood();
- static HbOogmWatcherPrivate *d_ptr(HbOogmWatcher *w) { return w->d_ptr; }
+ static HbOogmWatcherPrivate *d_ptr(HbOogmWatcher *w) {
+ return w->d_ptr;
+ }
HbOogmWatcher *q_ptr;
QList<HbIconItem *> mIconItems;
--- a/src/hbcore/utils/hbscreenmode_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbscreenmode_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -23,42 +23,39 @@
**
****************************************************************************/
+#include "hbscreenmode_p.h"
#include <QSize>
#include <QSizeF>
-#include "hbscreenmode_p.h"
-
-// ======== MEMBER FUNCTIONS ========
-
-class HbScreenModePrivate
+class HbScreenModePrivate
{
public:
HbScreenModePrivate();
-
-public:
+
+public:
QSize mSize;
QSizeF mTwipsSize;
int mRotation; // in degrees. How the device would be moved to see/go into this mode
QString mStyleName;
- };
+};
HbScreenModePrivate::HbScreenModePrivate() :
- mSize(-1,-1),
- mTwipsSize(-1.0F,-1.0F),
+ mSize(-1, -1),
+ mTwipsSize(-1.0F, -1.0F),
mRotation(0)
-{
+{
}
/*!
\class HbScreenMode
\brief Information for a single screen including screen pixel size, rotation, physical size
- A single screen mode represents a physical operation mode of a display. Separate modes may be
+ A single screen mode represents a physical operation mode of a display. Separate modes may be
distinguished by a rotation, an opening or closing of a cover, or touch enabled or not
-
- This class should be considered as a abstraction of the underlying operating system's way of reporting
- its information.
-
+
+ This class should be considered as a abstraction of the underlying operating system's way of reporting
+ its information.
+
*/
// ======== MEMBER FUNCTIONS ========
@@ -67,7 +64,7 @@
Construct a screen mode with invalid information
*/
HbScreenMode::HbScreenMode()
-: d_ptr(new HbScreenModePrivate())
+ : d_ptr(new HbScreenModePrivate())
{
}
@@ -75,7 +72,7 @@
Copy constructor
*/
HbScreenMode::HbScreenMode(const HbScreenMode &mode)
-: d_ptr(new HbScreenModePrivate())
+ : d_ptr(new HbScreenModePrivate())
{
*d_ptr = *mode.d_ptr;
}
--- a/src/hbcore/utils/hbscreenmode_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbscreenmode_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -32,14 +32,14 @@
class HbScreenModePrivate;
-class HbScreenMode
+class HbScreenMode
{
public:
HbScreenMode();
HbScreenMode(const HbScreenMode &mode);
HbScreenMode &operator=(const HbScreenMode &other);
-
+
~HbScreenMode();
void setName(const QString &name);
@@ -48,10 +48,10 @@
void setPixelWidth(int width);
void setPixelHeight(int height);
-private:
- HbScreenModePrivate * const d_ptr;
+private:
+ HbScreenModePrivate *const d_ptr;
Q_DECLARE_PRIVATE_D(d_ptr, HbScreenMode)
- };
+};
#endif // HBSCREENMODE_H
--- a/src/hbcore/utils/hbsleepmodelistener_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbsleepmodelistener_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -23,12 +23,11 @@
**
****************************************************************************/
+#include "hbsleepmodelistener_p.h"
+#include "hbsleepmodelistener_p_p.h"
#include <hbinstance.h>
#include <hbevent.h>
-#include "hbsleepmodelistener_p.h"
-#include "hbsleepmodelistener_p_p.h"
-
#if defined(Q_OS_SYMBIAN)
#include <hwrmlight.h>
@@ -52,7 +51,7 @@
}
CSleepModeListenerPrivate::CSleepModeListenerPrivate()
- :CActive( EPriorityNormal )
+ : CActive(EPriorityNormal)
{
User::LeaveIfError(sleepModeState.Attach(KSleepModeProperty, KSleepModeOn));
CActiveScheduler::Add(this);
@@ -70,7 +69,7 @@
TInt err = InitializeStatusArray(currentStatus);
if (err == KErrNone) {
TInt arraySize = sizeof(THWRMStatusInfo) * KHWRMLightMaxTargets;
- TPtr8 arrayPtr((TUint8*)¤tStatus[0], arraySize, arraySize);
+ TPtr8 arrayPtr((TUint8 *)¤tStatus[0], arraySize, arraySize);
err = sleepModeState.Get(arrayPtr);
if (err == KErrNone) {
TInt index = currentStatus.FindInOrder(KHWRMLightFirstTarget, FindByTarget);
@@ -78,7 +77,7 @@
status = static_cast<CHWRMLight::TLightStatus>(currentStatus[index].iStatus);
RProcess process;
//If prosess is something else than themeserver
- if (process.SecureId().iId != KHbPsOrientationCategoryUid.iUid) {
+ if (process.SecureId().iId != KHbPsHardwareCoarseOrientationCategoryUid.iUid) {
QList<HbMainWindow *> mainWindowList = hbInstance->allMainWindows();
for (int i = 0; i < mainWindowList.count(); ++i) {
if (status == CHWRMLight::ELightOff) {
@@ -105,11 +104,11 @@
}
TInt CSleepModeListenerPrivate::InitializeStatusArray(
- RLightStatusArray& aArray) const
+ RLightStatusArray &aArray) const
{
TInt err = KErrNone;
TInt currentTarget(KHWRMLightFirstTarget);
- for( TInt i = 0; i < KHWRMLightMaxTargets; ++i) {
+ for (TInt i = 0; i < KHWRMLightMaxTargets; ++i) {
THWRMStatusInfo info;
info.iTarget = currentTarget;
info.iStatus = CHWRMLight::ELightStatusUnknown;
@@ -125,16 +124,16 @@
return err;
}
-TInt CSleepModeListenerPrivate::FindByTarget(const TInt* aTarget,
- const THWRMStatusInfo& aItem)
- {
+TInt CSleepModeListenerPrivate::FindByTarget(const TInt *aTarget,
+ const THWRMStatusInfo &aItem)
+{
if (*aTarget < aItem.iTarget) {
return -1;
- } else if ( *aTarget > aItem.iTarget ) {
+ } else if (*aTarget > aItem.iTarget) {
return 1;
}
return 0;
- }
+}
#else
@@ -153,7 +152,7 @@
/*!
Returns static instance
*/
-HbSleepModeListener* HbSleepModeListener::instance()
+HbSleepModeListener *HbSleepModeListener::instance()
{
static HbSleepModeListener theInstance;
return &theInstance;
--- a/src/hbcore/utils/hbsleepmodelistener_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbsleepmodelistener_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -26,14 +26,12 @@
#ifndef HBSLEEPMODELISTENER_P_H
#define HBSLEEPMODELISTENER_P_H
-#if defined(Q_OS_SYMBIAN)
-
-class CSleepModeListenerPrivate;
+#include <hbglobal.h>
+#if defined(Q_OS_SYMBIAN)
+class CSleepModeListenerPrivate;
#else
-
class HbSleepModeListenerPrivate;
-
#endif
class HB_CORE_PRIVATE_EXPORT HbSleepModeListener
--- a/src/hbcore/utils/hbsleepmodelistener_p_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbsleepmodelistener_p_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -36,14 +36,13 @@
/**
* Data structure used to handle light status information.
*/
-struct THWRMStatusInfo
- {
+struct THWRMStatusInfo {
// Light target.
TInt iTarget;
// Status of the target.
TInt iStatus;
- };
+};
/**
* Defines THWRMStatusInfo array.
@@ -59,9 +58,9 @@
void RunL();
void DoCancel();
- TInt InitializeStatusArray(RLightStatusArray& aArray) const;
+ TInt InitializeStatusArray(RLightStatusArray &aArray) const;
- static TInt FindByTarget(const TInt* aTarget, const THWRMStatusInfo& aItem);
+ static TInt FindByTarget(const TInt *aTarget, const THWRMStatusInfo &aItem);
private:
RProperty sleepModeState;
};
--- a/src/hbcore/utils/hbtextmeasurementutility_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbtextmeasurementutility_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -309,7 +309,7 @@
#else
QList<HbMainWindow*> mainWindows = hbInstance->allMainWindows();
foreach (HbMainWindow* mainWindow, mainWindows ) {
- QGraphicsScene* scene = mainWindow->scene();
+ QGraphicsScene* scene = mainWindow->scene(); //krazy:exclude=qclasses
QList<QGraphicsItem*> sceneItems = scene->items();
foreach (QGraphicsItem* sceneItem, sceneItems ) {
if ( sceneItem->isWidget() ) {
--- a/src/hbcore/utils/hbthetestutility_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbthetestutility_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -171,7 +171,7 @@
QObject *HbTheTestUtilityPrivate::receiver(const QString& name)
{
- QGraphicsScene* scene = mMainWindow->scene();
+ QGraphicsScene* scene = mMainWindow->scene(); //krazy:exclude=qclasses
QList<QGraphicsItem*> sceneItems = scene->items();
foreach (QGraphicsItem* sceneItem, sceneItems ) {
if (sceneItem->isWidget()) {
@@ -261,9 +261,7 @@
*/
void HbTheTestUtility::invokeSlots(const int button)
{
-#if defined (Q_OS_LINUX) || defined(Q_OS_MAC)
- QString filePath(QDir::tempPath());
-#else
+#if defined (Q_OS_SYMBIAN)
QString filePath;
if (d->useF) {
filePath = "F:\\data\\log\\";
@@ -272,6 +270,10 @@
} else {
filePath = "C:\\data\\log\\";
}
+#elif defined (Q_OS_WIN)
+ QString filePath("C:\\data\\log\\");
+#else
+ QString filePath(QDir::tempPath());
#endif
filePath = QDir::toNativeSeparators(filePath);
--- a/src/hbcore/utils/hbthetestwidget_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbthetestwidget_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -26,7 +26,7 @@
#include "hbthetestwidget_p.h"
#include "hbinstance.h"
#include "hbnamespace_p.h"
-#include <hbapplication.h>
+#include "hbapplication.h"
#include "hbtoolbutton_p.h"
#include "hbstyleoptiontoolbutton_p.h"
#include "hbcolorscheme.h"
@@ -451,7 +451,7 @@
// QPixmap screenPixmap = QPixmap::fromSymbianCFbsBitmap(bitmap);
//#else
QPixmap screenPixmap = QPixmap::grabWindow(
- QApplication::activeWindow()->winId());
+ QApplication::activeWindow()->winId()); //krazy:exclude=qclasses
//#endif
QString format = "png";
screenPixmap.save(filePath.toLatin1(), format.toLatin1());
--- a/src/hbcore/utils/hbthetestwidget_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbthetestwidget_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -66,7 +66,7 @@
public:
~HbTheTestWidget();
- HbTheTestWidget(HbMainWindow *mainWindow, QGraphicsItem *parent = 0);
+ explicit HbTheTestWidget(HbMainWindow *mainWindow, QGraphicsItem *parent = 0);
HbTheTestButton *button1();
HbTheTestButton *button2();
--- a/src/hbcore/utils/hbtimer.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbtimer.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -39,19 +39,20 @@
{
public:
HbTimerAnim(HbTimerEntry *entry) : mEntry(entry), mDuration(entry->interval()) { }
- int duration() const { return mDuration; }
+ int duration() const {
+ return mDuration;
+ }
void updateCurrentTime(int) { }
- void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)
- {
- if (oldState != QAbstractAnimation::Stopped && newState == QAbstractAnimation::Stopped && mEntry) {
- mEntry->timerFired();
- mEntry->mAnim = 0; // to prevent confusing unregisterEntry() and double deletion
- HbTimer::instance()->unregisterEntry(mEntry);
- if (mEntry->mDeleteWhenFinishedNormally) {
- delete mEntry;
- }
+ void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) {
+ if (oldState != QAbstractAnimation::Stopped && newState == QAbstractAnimation::Stopped && mEntry) {
+ mEntry->timerFired();
+ mEntry->mAnim = 0; // to prevent confusing unregisterEntry() and double deletion
+ HbTimer::instance()->unregisterEntry(mEntry);
+ if (mEntry->mDeleteWhenFinishedNormally) {
+ delete mEntry;
}
}
+ }
HbTimerEntry *mEntry;
int mDuration;
};
--- a/src/hbcore/utils/hbtimer_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbtimer_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -52,7 +52,7 @@
class HB_AUTOTEST_EXPORT HbTimerSignalEntry : public QObject, public HbTimerEntry
{
Q_OBJECT
-
+
public:
HbTimerSignalEntry(int interval);
--- a/src/hbcore/utils/hbtypefaceinfodatabase_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbtypefaceinfodatabase_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -52,9 +52,9 @@
#define UNDEFINED_STRING "undefined"
#define TYPEFACE_METRICS_FILE_STEM "typeface_metrics_"
-#define LARGEST_SIZE 100
+static const int LARGEST_SIZE = 100;
// Following must be greater than 0
-#define SMALLEST_SIZE 1
+static const int SMALLEST_SIZE = 1;
--- a/src/hbcore/utils/hbtypefacexmlparser.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbtypefacexmlparser.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -205,7 +205,7 @@
// Construct the locale with the typeface locale info
if (!language.isEmpty()) {
if (!country.isEmpty()) {
- typefaceLocaleName = language + "_" + country;
+ typefaceLocaleName = language + '_' + country;
systemLocaleName = systemLocale.name();
}
else {
--- a/src/hbcore/utils/hbwidgetloader.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbwidgetloader.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -22,6 +22,9 @@
** Nokia at developer.feedback@nokia.com.
**
****************************************************************************/
+#ifndef HB_BIN_CSS
+#define HB_USETHEMESERVER
+#endif
#include "hbwidgetloader_p.h"
#include "hbwidgetloadersyntax_p.h"
@@ -29,7 +32,9 @@
#include "hbinstance.h"
#include "hbtheme_p.h"
+#ifdef HB_USETHEMESERVER
#include "hbthemeclient_p.h"
+#endif
#include <QtDebug>
#include <QFile>
@@ -63,11 +68,11 @@
Q_GLOBAL_STATIC(QStringList, filesNotPresent)
// Layout caching
-static HbWidgetLoader::LayoutDefinition *staticCacheLayout = NULL;
-static QString staticCacheFileName = QString();
-static QString staticCacheName = QString();
-static QString staticCacheSection = QString();
-static QDateTime staticCacheModified = QDateTime();
+static HbWidgetLoader::LayoutDefinition *staticCacheLayout = 0;
+static QString staticCacheFileName;
+static QString staticCacheName;
+static QString staticCacheSection;
+static QDateTime staticCacheModified;
class HbWidgetLoaderPrivate
{
@@ -237,6 +242,12 @@
delete mActions;
}
+#ifdef HB_BIN_CSS
+void HbWidgetLoaderPrivate::setWidget( HbWidget* widget )
+{
+ Q_UNUSED(widget)
+}
+#else
/*!
\internal
*/
@@ -246,6 +257,7 @@
mActions->mWidget = widget;
mActions->mCurrentProfile = HbDeviceProfile::profile(widget);
}
+#endif
/*!
\internal
@@ -280,10 +292,12 @@
}
// get the shared layout definition address.
+#ifdef HB_USETHEMESERVER
layoutDef = HbThemeClient::global()->getSharedLayoutDefs(fileName, name, section);
if (layoutDef) {
clientLayoutDefsCache()->insert(key, layoutDef);
}
+#endif
return true;
}
--- a/src/hbcore/utils/hbwidgetloader_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbwidgetloader_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -51,7 +51,7 @@
Hb::Edge srcEdge;
Hb::Edge dstEdge;
HbXmlLengthValue::Type spacingType;
- qreal spacingVal;
+ float spacingVal;
HbString spacingText;
HbString spacer;
MeshItem(HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory)
--- a/src/hbcore/utils/hbwidgetloaderactions_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbwidgetloaderactions_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -50,6 +50,7 @@
{
}
+#ifndef HB_BIN_CSS
/*!
\internal
*/
@@ -116,7 +117,7 @@
}
return ok;
}
-
+#endif
/*
\class HbWidgetLoaderMemoryActions
\internal
--- a/src/hbcore/utils/hbwidgetloaderactions_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbwidgetloaderactions_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -56,11 +56,12 @@
virtual ~HbWidgetLoaderActions();
void setWidget( HbWidget *widget );
-
+#ifndef HB_BIN_CSS
bool createMeshLayout( const QString &widget );
bool addMeshLayoutEdge( const QString &src, Hb::Edge srcEdge,
const QString &dst, Hb::Edge dstEdge,
const HbXmlLengthValue &spacing, const QString &spacer = QString() );
+#endif
public:
Q_DISABLE_COPY(HbWidgetLoaderActions)
@@ -75,7 +76,6 @@
public:
HbWidgetLoaderMemoryActions();
virtual ~HbWidgetLoaderMemoryActions();
-
bool createMeshLayout( const QString &widget );
bool addMeshLayoutEdge( const QString &src, Hb::Edge srcEdge,
const QString &dst, Hb::Edge dstEdge,
--- a/src/hbcore/utils/hbwidgetloadersyntax_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbwidgetloadersyntax_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -115,7 +115,7 @@
QString ver_str = attribute( ATTR_VERSION );
ver_str.toDouble( &ok );
- QStringList ver = ver_str.split( "." );
+ QStringList ver = ver_str.split( '.' );
if( ( !ok ) || ( ver.size() != 2 ) ) {
--- a/src/hbcore/utils/hbwsiniparser_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbwsiniparser_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -23,13 +23,12 @@
**
****************************************************************************/
+#include "hbwsiniparser_p.h"
#include <QFile>
#include <QTextStream>
#include <QStringList>
#include <QMap>
-#include "hbwsiniparser_p.h"
-
#define WSINI_PARSE_ENTRY(keyword, func) { keyword, &HbWsiniParser::call_##func }
const HbWsiniParser::ParserEntry HbWsiniParser::mParseTable[] =
--- a/src/hbcore/utils/hbxmlloaderabstractsyntax_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderabstractsyntax_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -186,7 +186,7 @@
case HbXmlLengthValue::Unit:
case HbXmlLengthValue::Millimeter:
{
- double f_value = (double)value.mValue;
+ double f_value = (double)value.mValue; //krazy:exclude=typedefs
stream << f_value;
break;
}
@@ -213,7 +213,7 @@
case HbXmlLengthValue::Unit:
case HbXmlLengthValue::Millimeter:
{
- double f_value;
+ double f_value; //krazy:exclude=typedefs
stream >> f_value;
value.mValue = f_value;
break;
--- a/src/hbcore/utils/hbxmlloaderabstractsyntax_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderabstractsyntax_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -95,7 +95,7 @@
ElementType type;
void *data;
};
-};
+}
class HbXmlLoaderAbstractActions;
--- a/src/hbcore/utils/hbxmlloaderbaseactions_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderbaseactions_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -348,7 +348,7 @@
return edge;
}
-
+#ifndef HB_BIN_CSS
bool HbXmlLoaderBaseActions::toPixels(const HbXmlLengthValue &lengthVal, qreal& result) const
{
bool retVal(true);
@@ -373,5 +373,6 @@
}
return retVal;
}
+#endif
--- a/src/hbcore/utils/hbxmlloaderbaseactions_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderbaseactions_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -101,7 +101,9 @@
private:
Q_DISABLE_COPY(HbXmlLoaderBaseActions)
public:
+#ifndef HB_BIN_CSS
HbDeviceProfile mCurrentProfile;
+#endif
};
#endif // HBXMLLOADERBASEACTIONS_P_H
--- a/src/hbcore/utils/hbxmlloaderbasesyntax_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderbasesyntax_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -386,15 +386,15 @@
return false;
}
- HB_DOCUMENTLOADER_PRINT( QString( "READ ALIEN SECTION: LEAVING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
+ HB_DOCUMENTLOADER_PRINT( QString( "READ ALIEN SECTION: LEAVING SECTION " ) + ''' + mCurrentSection.join(' ') + ''' );
mCurrentSection << name;
- HB_DOCUMENTLOADER_PRINT( QString("READ ALIEN SECTION: ENTERING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
+ HB_DOCUMENTLOADER_PRINT( QString("READ ALIEN SECTION: ENTERING SECTION " ) + ''' + mCurrentSection.join(' ') + ''' );
} else if( mCurrentTokenType == QXmlStreamReader::EndElement ) {
- HB_DOCUMENTLOADER_PRINT( QString( "READ ALIEN SECTION: LEAVING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
+ HB_DOCUMENTLOADER_PRINT( QString( "READ ALIEN SECTION: LEAVING SECTION " ) + ''' + mCurrentSection.join(' ') + ''' );
mCurrentSection.removeLast();
- HB_DOCUMENTLOADER_PRINT( QString( "READ ALIEN SECTION: ENTERING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
+ HB_DOCUMENTLOADER_PRINT( QString( "READ ALIEN SECTION: ENTERING SECTION " ) + ''' + mCurrentSection.join(' ') + ''' );
} else {
@@ -527,9 +527,9 @@
break;
}
- HB_DOCUMENTLOADER_PRINT( QString( "GENERAL START ITEM: LEAVING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
+ HB_DOCUMENTLOADER_PRINT( QString( "GENERAL START ITEM: LEAVING SECTION " ) + ''' + mCurrentSection.join(' ') + ''' );
mCurrentSection << name;
- HB_DOCUMENTLOADER_PRINT( QString( "GENERAL START ITEM: ENTERING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
+ HB_DOCUMENTLOADER_PRINT( QString( "GENERAL START ITEM: ENTERING SECTION " ) + ''' + mCurrentSection.join(' ') + ''' );
result = true;
break;
@@ -566,9 +566,9 @@
{
HB_DOCUMENTLOADER_PRINT( "GENERAL END ITEM: SECTION" );
- HB_DOCUMENTLOADER_PRINT( QString( "GENERAL END ITEM: LEAVING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
+ HB_DOCUMENTLOADER_PRINT( QString( "GENERAL END ITEM: LEAVING SECTION " ) + ''' + mCurrentSection.join(' ') + ''' );
mCurrentSection.removeLast();
- HB_DOCUMENTLOADER_PRINT( QString( "GENERAL END ITEM: ENTERING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
+ HB_DOCUMENTLOADER_PRINT( QString( "GENERAL END ITEM: ENTERING SECTION " ) + ''' + mCurrentSection.join(' ') + ''' );
result = true;
break;
--- a/src/hbcore/utils/hbxmlloaderbinaryactions_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderbinaryactions_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -29,6 +29,8 @@
#include <QCoreApplication>
+#include <QDebug>
+
#define VERSION_MAJOR 0
#define VERSION_MINOR 1
@@ -53,6 +55,7 @@
void HbXmlLoaderBinaryActions::cleanUp()
{
+ qDebug() << "BinaryActions, cleanUp";
mOut << (quint8)HbXml::ActionCleanUp;
}
@@ -68,6 +71,7 @@
bool HbXmlLoaderBinaryActions::pushDocument( const QString& context)
{
+ qDebug() << "BinaryActions, pushDocument, in";
if( mOut.device()->pos() != 0 ) {
mOut << (quint8)HbXml::ActionPushDocument << context;
return true;
@@ -75,6 +79,7 @@
mOut.device()->write(HbXmlLoaderBinarySyntax::signature(), strlen(HbXmlLoaderBinarySyntax::signature()));
mOut << (qint8)VERSION_MAJOR << (qint8)VERSION_MINOR;
mOut << (quint8)HbXml::ActionPushDocument << context;
+ qDebug() << "BinaryActions, pushDocument, out";
return true;
}
--- a/src/hbcore/vkbhosts/hbabstractvkbhost.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/vkbhosts/hbabstractvkbhost.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -32,6 +32,8 @@
#include "hbmainwindow.h"
#include "hbpopup.h"
#include "hbview.h"
+#include "hbwidgetfeedback.h"
+#include "hbinstance.h"
#include <QTextEdit>
@@ -41,6 +43,114 @@
const qreal HbContainerBorderMargin = 20.0;
const qreal HbHeightVerticalFactor = 0.5;
const qreal HbHeightHorizFactor = 0.7;
+const QString KHandWritingName("Handwriting");
+
+HbVkbHostContainerWidget::HbVkbHostContainerWidget(QObject *containterWidget)
+:mContainerWidget(containterWidget)
+{
+}
+
+// sets container widgets position to new position.
+void HbVkbHostContainerWidget::setPos(QPointF newPosition)
+{
+ if (mContainerWidget) {
+ QGraphicsObject *graphicsObject = qobject_cast<QGraphicsObject *>(mContainerWidget);
+ if (graphicsObject) {
+ graphicsObject->setPos(newPosition);
+ return;
+ }
+
+ QWidget *qWidget = qobject_cast<QWidget *>(mContainerWidget);
+ if (qWidget) {
+#ifdef Q_WS_WIN
+ QPoint finalPosition = newPosition.toPoint();
+ finalPosition -= qWidget->geometry().topLeft() - qWidget->frameGeometry().topLeft();
+ qWidget->move(finalPosition);
+#else
+ qWidget->move(newPosition.toPoint());
+#endif
+ return;
+ }
+ }
+}
+
+// returns the global position, if container widget is a QGraphicsObject, it returns
+// scene position. In case the widget is QWidget it returns global co-ordinates
+QPointF HbVkbHostContainerWidget::pos()
+{
+ if (mContainerWidget) {
+ QGraphicsObject *graphicsObject = qobject_cast<QGraphicsObject *>(mContainerWidget);
+ if (graphicsObject) {
+ return graphicsObject->pos();;
+ }
+
+ QWidget *qWidget = qobject_cast<QWidget *>(mContainerWidget);
+ if (qWidget) {
+ return qWidget->mapToGlobal(QPoint(0,0));
+ }
+ }
+
+ return QPointF(0, 0);
+}
+
+// returns the bounding rect in global co-ordinate, if container widget is a QGraphicsObject
+// it returns in scene co-ordinate, incase widget is QWidget it returns in global co-ordinate
+QRectF HbVkbHostContainerWidget::sceneBoundingRect()
+{
+ if (mContainerWidget) {
+ QGraphicsObject *graphicsObject = qobject_cast<QGraphicsObject *>(mContainerWidget);
+ if (graphicsObject) {
+ return graphicsObject->sceneBoundingRect();;
+ }
+
+ QWidget *qWidget = qobject_cast<QWidget *>(mContainerWidget);
+ if (qWidget) {
+ return QRectF(qWidget->mapToGlobal(QPoint(0,0)), qWidget->size());
+ }
+ }
+
+ return QRectF(0, 0, 0, 0);
+}
+
+// connect container specific signals here.
+void HbVkbHostContainerWidget::connectSignals(QObject *reciever)
+{
+ if (qobject_cast<QGraphicsObject*> (mContainerWidget)) {
+ QObject::connect(mContainerWidget, SIGNAL(yChanged())
+ , reciever, SLOT(ensureCursorVisibility()));
+ }
+
+ HbPopup *popup = qobject_cast<HbPopup*>(mContainerWidget);
+ if (popup) {
+ QObject::connect(popup, SIGNAL(aboutToHide()), reciever, SLOT(containerAboutToClose()));
+ }
+
+ HbView *view = qobject_cast<HbView*>(mContainerWidget);
+ if (view) {
+ QObject::connect(view->mainWindow(), SIGNAL(currentViewChanged(HbView *))
+ , reciever, SLOT(currentViewChanged(HbView *)));
+ }
+}
+
+// disconnect container specific signals here.
+void HbVkbHostContainerWidget::disconnectSignals(QObject *reciever)
+{
+ if (qobject_cast<QGraphicsObject*> (mContainerWidget)) {
+ QObject::disconnect(mContainerWidget, SIGNAL(yChanged())
+ , reciever, SLOT(ensureCursorVisibility()));
+ }
+
+ HbPopup *popup = qobject_cast<HbPopup*>(mContainerWidget);
+ if (popup) {
+ QObject::disconnect(popup, SIGNAL(aboutToHide()), reciever, SLOT(containerAboutToClose()));
+ }
+
+ HbPopup *view = qobject_cast<HbPopup*>(mContainerWidget);
+ if (view) {
+ QObject::disconnect(view->mainWindow(), SIGNAL(currentViewChanged(HbView *))
+ , reciever, SLOT(currentViewChanged(HbView *)));
+ }
+}
/*!
\proto
@@ -52,11 +162,11 @@
/// @cond
-HbAbstractVkbHostPrivate::HbAbstractVkbHostPrivate(HbAbstractVkbHost *myHost, QGraphicsWidget *containerWidget)
+HbAbstractVkbHostPrivate::HbAbstractVkbHostPrivate(HbAbstractVkbHost *myHost, QObject *containerWidget)
: q_ptr(myHost),
mCallback(0),
mKeypad(0),
-mContainerWidget(containerWidget),
+mContainerWidget(new HbVkbHostContainerWidget(containerWidget)),
mTimeLine(HbAnimationTime),
mKeypadStatus(HbVkbHost::HbVkbStatusClosed),
mKeypadOperationOngoing(false),
@@ -71,9 +181,14 @@
mTimeLine.setUpdateInterval(16);
}
+HbAbstractVkbHostPrivate::~HbAbstractVkbHostPrivate()
+{
+ delete mContainerWidget;
+}
+
void HbAbstractVkbHostPrivate::prepareAnimationsCommon()
{
- if (mContainerWidget && mKeypad) {
+ if (mContainerWidget->widgetObject() && mKeypad) {
// If the keyboard is not already open, remember the original position.
// That is where the container will eventually be returned to.
if (mKeypadStatus == HbVkbHost::HbVkbStatusClosed) {
@@ -93,7 +208,7 @@
bool HbAbstractVkbHostPrivate::prepareContainerAnimation(HbVkbHost::HbVkbStatus status)
{
- if (!mKeypad || !mContainerWidget || !mInputMethod || !mInputMethod->focusObject()) {
+ if (!mKeypad || !mContainerWidget->widgetObject() || !mInputMethod || !mInputMethod->focusObject()) {
return false;
}
@@ -204,6 +319,7 @@
}
} else if (status == HbVkbHost::HbVkbStatusMinimized && mCallback) {
mKeypadMovementVector = QPointF(0, mKeypad->size().height() - mCallback->minimizedKeyboardSize().height());
+ return true;
} else {
// It is going to be closed.
mKeypadMovementVector = QPointF(0, mKeypad->size().height());
@@ -233,49 +349,33 @@
void HbAbstractVkbHostPrivate::connectSignals()
{
- if (mContainerWidget) {
- q_ptr->connect(mContainerWidget, SIGNAL(yChanged()), q_ptr, SLOT(ensureCursorVisibility()));
- }
+ mContainerWidget->connectSignals(q_ptr);
- HbWidget *hbWidget = qobject_cast<HbWidget*>(mContainerWidget);
- if (hbWidget) {
- HbMainWindow* mainWindow = hbWidget->mainWindow();
- if (mainWindow) {
- q_ptr->connect(mainWindow, SIGNAL(aboutToChangeOrientation()), q_ptr, SLOT(orientationAboutToChange()));
- q_ptr->connect(mainWindow, SIGNAL(orientationChanged(Qt::Orientation)), q_ptr, SLOT(orientationChanged(Qt::Orientation)));
- }
- }
-
- HbPopup *popup = qobject_cast<HbPopup*>(mContainerWidget);
- if (popup) {
- q_ptr->connect(popup, SIGNAL(aboutToHide()), q_ptr, SLOT(containerAboutToClose()));
+ // global signal not specific to any containter widget, can be connected now.
+ HbMainWindow* mainWindow = this->mainWindow();
+ if (mainWindow) {
+ q_ptr->connect(mainWindow, SIGNAL(aboutToChangeOrientation()), q_ptr, SLOT(orientationAboutToChange()));
+ q_ptr->connect(mainWindow, SIGNAL(orientationChanged(Qt::Orientation)), q_ptr, SLOT(orientationChanged(Qt::Orientation)));
+ q_ptr->connect(mainWindow, SIGNAL(currentViewChanged(HbView*)), q_ptr, SLOT(currentViewChanged(HbView*)));
}
}
void HbAbstractVkbHostPrivate::disconnectSignals()
{
- if (mContainerWidget) {
- q_ptr->disconnect(mContainerWidget, SIGNAL(yChanged()), q_ptr, SLOT(ensureCursorVisibility()));
- }
+ mContainerWidget->disconnectSignals(q_ptr);
- HbWidget *hbWidget = qobject_cast<HbWidget*>(mContainerWidget);
- if (hbWidget) {
- HbMainWindow* mainWindow = hbWidget->mainWindow();
- if (mainWindow) {
- q_ptr->disconnect(mainWindow, SIGNAL(aboutToChangeOrientation()), q_ptr, SLOT(orientationAboutToChange()));
- q_ptr->disconnect(mainWindow, SIGNAL(orientationChanged(Qt::Orientation)), q_ptr, SLOT(orientationChanged(Qt::Orientation)));
- }
- }
-
- HbPopup *popup = qobject_cast<HbPopup*>(mContainerWidget);
- if (popup) {
- q_ptr->disconnect(popup, SIGNAL(aboutToHide()), q_ptr, SLOT(containerAboutToClose()));
+ // global signal not specific to any containter widget, can be connected now.
+ HbMainWindow* mainWindow = this->mainWindow();
+ if (mainWindow) {
+ q_ptr->disconnect(mainWindow, SIGNAL(aboutToChangeOrientation()), q_ptr, SLOT(orientationAboutToChange()));
+ q_ptr->disconnect(mainWindow, SIGNAL(orientationChanged(Qt::Orientation)), q_ptr, SLOT(orientationChanged(Qt::Orientation)));
+ q_ptr->disconnect(mainWindow, SIGNAL(currentViewChanged(HbView*)), q_ptr, SLOT(currentViewChanged(HbView*)));
}
}
void HbAbstractVkbHostPrivate::openKeypad()
{
- if (mContainerWidget) {
+ if (mContainerWidget->widgetObject()) {
HbMainWindow* mainWin = mainWindow();
if (mainWin && mKeypad) {
if (mKeypad->scene() != mainWin->scene()) {
@@ -318,7 +418,7 @@
{
if (mCallback && mKeypadStatus != HbVkbHost::HbVkbStatusMinimized) {
mCallback->aboutToClose(q_ptr);
- if (mContainerWidget) {
+ if (mContainerWidget->widgetObject()) {
if (prepareAnimations(HbVkbHost::HbVkbStatusMinimized)) {
mKeypadStatus = HbVkbHost::HbVkbStatusMinimized;
mTimeLine.start();
@@ -330,7 +430,7 @@
void HbAbstractVkbHostPrivate::openKeypadWithoutAnimation()
{
HbMainWindow *mainWin = mainWindow();
- if (mKeypadStatus!= HbVkbHost::HbVkbStatusOpened && mKeypad && mContainerWidget && mainWin) {
+ if (mKeypadStatus!= HbVkbHost::HbVkbStatusOpened && mKeypad && mContainerWidget->widgetObject() && mainWin) {
if (mKeypad->scene() != mainWin->scene()) {
// Add item to scene if it is not already in there.
mainWin->scene()->addItem(mKeypad);
@@ -360,7 +460,7 @@
// No need of any animation as this minimized keypad is very small to be a candidate for an
// animation.
HbMainWindow *mainWin = mainWindow();
- if (mainWin && mKeypad && mContainerWidget) {
+ if (mainWin && mKeypad && mContainerWidget->widgetObject()) {
if (mKeypad->scene() != mainWin->scene()) {
// Add item to scene if it is not already in there.
mainWin->scene()->addItem(mKeypad);
@@ -445,12 +545,18 @@
HbMainWindow *HbAbstractVkbHostPrivate::mainWindow() const
{
- HbWidget *hbWidget = qobject_cast<HbWidget*>(mContainerWidget);
+ HbWidget *hbWidget = qobject_cast<HbWidget*>(mContainerWidget->widgetObject());
if (hbWidget) {
return hbWidget->mainWindow();
}
- return qobject_cast<HbMainWindow*>(qApp->activeWindow());
+ // below is the case when we have a pure vanilla application.
+ // there should be one hbmainwindow to show all the widgets.
+ if (hbInstance->allMainWindows().size())
+ return hbInstance->allMainWindows().at(0);
+
+ // no mainwindow.
+ return 0;
}
QSizeF HbAbstractVkbHostPrivate::screenSize() const
@@ -482,9 +588,10 @@
return false;
}
- if ( (mainWindow()->orientation() == Qt::Horizontal)
- && (mInputMethod->inputState().inputMode() == HbInputModeHwrChinese
- || mInputMethod->inputState().inputMode() == HbInputModeHwrChineseFull) ) {
+ QByteArray baModes = HbInputSettingProxy::instance()->preferredInputMethodCustomData(Qt::Horizontal);
+ QString imName(baModes);
+
+ if (mainWindow() && mainWindow()->orientation() == Qt::Horizontal && imName == KHandWritingName) {
return true;
}
return false;
@@ -505,6 +612,17 @@
connect(&d->mTimeLine, SIGNAL(valueChanged(qreal)), this, SLOT(animValueChanged(qreal)));
}
+HbAbstractVkbHost::HbAbstractVkbHost(QWidget *containerWidget) : d_ptr(new HbAbstractVkbHostPrivate(this, containerWidget))
+{
+ Q_D(HbAbstractVkbHost);
+
+ setParent(containerWidget);
+ HbVkbHost::attachHost(this, containerWidget);
+
+ connect(&d->mTimeLine, SIGNAL(finished()), this, SLOT(animationFinished()));
+ connect(&d->mTimeLine, SIGNAL(valueChanged(qreal)), this, SLOT(animValueChanged(qreal)));
+}
+
HbAbstractVkbHost::HbAbstractVkbHost(QGraphicsWidget *containerWidget) : d_ptr(new HbAbstractVkbHostPrivate(this, containerWidget))
{
Q_D(HbAbstractVkbHost);
@@ -516,19 +634,40 @@
connect(&d->mTimeLine, SIGNAL(valueChanged(qreal)), this, SLOT(animValueChanged(qreal)));
}
-HbAbstractVkbHost::HbAbstractVkbHost(HbAbstractVkbHostPrivate *dd) : d_ptr(dd)
+HbAbstractVkbHost::HbAbstractVkbHost(QGraphicsObject *containerWidget) : d_ptr(new HbAbstractVkbHostPrivate(this, containerWidget))
{
Q_D(HbAbstractVkbHost);
- setParent(d->mContainerWidget);
- HbVkbHost::attachHost(this, d->mContainerWidget);
+ setParent(containerWidget);
+ HbVkbHost::attachHost(this, containerWidget);
connect(&d->mTimeLine, SIGNAL(finished()), this, SLOT(animationFinished()));
connect(&d->mTimeLine, SIGNAL(valueChanged(qreal)), this, SLOT(animValueChanged(qreal)));
}
+HbAbstractVkbHost::HbAbstractVkbHost(HbAbstractVkbHostPrivate *dd) : d_ptr(dd)
+{
+ Q_D(HbAbstractVkbHost);
+
+ setParent(d->mContainerWidget->widgetObject());
+ HbVkbHost::attachHost(this, d->mContainerWidget->widgetObject());
+
+ connect(&d->mTimeLine, SIGNAL(finished()), this, SLOT(animationFinished()));
+ connect(&d->mTimeLine, SIGNAL(valueChanged(qreal)), this, SLOT(animValueChanged(qreal)));
+}
+
+
HbAbstractVkbHost::~HbAbstractVkbHost()
{
+ if (d_ptr->mKeypad) {
+ d_ptr->mKeypad->hide();
+
+ if (d_ptr->mCallback) {
+ d_ptr->mCallback->keyboardClosed(this);
+ d_ptr->mCallback = 0;
+ }
+ }
+ emit keypadClosed();
delete d_ptr;
}
@@ -561,10 +700,13 @@
}
if (!HbVkbHostBridge::instance()->connectHost(this)) {
- connect(HbVkbHostBridge::instance(), SIGNAL(stateTransitionCompleted()), this, SLOT(stateTransitionCompleted()));
- // The previous keyboard is still closing. Set the call pending and return.
- d->mPendingCall.vkb = vkb;
- d->mPendingCall.animationAllowed = animationAllowed;
+ // Do not set open call pending if orientation change is ongoing
+ if (HbInputSettingProxy::instance()->orientationChangeCompleted()) {
+ connect(HbVkbHostBridge::instance(), SIGNAL(stateTransitionCompleted()), this, SLOT(stateTransitionCompleted()));
+ // The previous keyboard is still closing. Set the call pending and return.
+ d->mPendingCall.vkb = vkb;
+ d->mPendingCall.animationAllowed = animationAllowed;
+ }
return;
}
@@ -592,6 +734,7 @@
d->openKeypadWithoutAnimation();
emit keypadOpened();
}
+ HbWidgetFeedback::triggered(qobject_cast<const HbWidget*>(d->mKeypad), Hb::InstantPopupOpened);
d->connectSignals();
d->mKeypadOperationOngoing = false;
@@ -632,7 +775,7 @@
if (!d->disableCursorShift()) {
// Move the container.
- if (d->mContainerWidget) {
+ if (d->mContainerWidget->widgetObject()) {
d->mContainerWidget->setPos(d->mContainerMovementStartingPoint + (d->mContainerMovementVector * value));
}
@@ -654,7 +797,7 @@
{
Q_D(HbAbstractVkbHost);
- if (d->mContainerWidget && d->mKeypad && d->mCallback && d->mInputMethod) {
+ if (d->mContainerWidget->widgetObject() && d->mKeypad && d->mCallback && d->mInputMethod) {
if (!d->disableCursorShift()) {
// Make sure the container reached target position.
d->mContainerWidget->setPos(d->mContainerMovementStartingPoint + d->mContainerMovementVector);
@@ -701,7 +844,7 @@
Q_D(const HbAbstractVkbHost);
HbMainWindow *mainWindow = d->mainWindow();
- if (d->mContainerWidget && mainWindow) {
+ if (d->mContainerWidget->widgetObject() && mainWindow) {
QSizeF screenSize = d->screenSize();
if (mainWindow->orientation() == Qt::Horizontal) {
@@ -755,7 +898,7 @@
if ((d->mTimeLine.state() == QTimeLine::Running) ||
(d->mKeypadStatus == HbVkbStatusClosed) ||
(d->mKeypadStatus == HbVkbStatusMinimized) ||
- !d->mContainerWidget) {
+ !d->mContainerWidget->widgetObject()) {
return;
}
@@ -772,11 +915,15 @@
Q_D(const HbAbstractVkbHost);
HbMainWindow *mainWindow = d->mainWindow();
- if (d->mContainerWidget && mainWindow) {
+ if (d->mContainerWidget->widgetObject() && mainWindow && d->mCallback) {
QSizeF vpSize = d->screenSize();
QRectF viewport = QRectF(QPointF(0.0, 0.0), QPointF(vpSize.width(), vpSize.height()));
- viewport.setHeight(viewport.height() - confirmedKeyboardSize().height());
+ if (d->mKeypadStatus == HbVkbStatusMinimized) {
+ viewport.setHeight(viewport.height() - d->mCallback->minimizedKeyboardSize().height());
+ } else {
+ viewport.setHeight(viewport.height() - confirmedKeyboardSize().height());
+ }
return viewport;
}
@@ -792,7 +939,7 @@
Q_D(const HbAbstractVkbHost);
if (d->mCallback && d->mKeypad) {
- QSizeF kbArea = keyboardArea();
+ QSizeF kbArea = keyboardArea();
QSizeF confirmed = d->mCallback->preferredKeyboardSize();
if (confirmed.width() > kbArea.width()) {
@@ -832,7 +979,8 @@
{
Q_D(const HbAbstractVkbHost);
- if (d->mKeypadStatus == HbVkbStatusOpened) {
+ if (d->mKeypadStatus == HbVkbStatusOpened ||
+ d->mKeypadStatus == HbVkbStatusMinimized) {
return activeViewRect();
}
@@ -904,7 +1052,7 @@
{
Q_D(HbAbstractVkbHost);
- if (view != d->mContainerWidget) {
+ if (view != d->mContainerWidget->widgetObject()) {
if (d->mTimeLine.state() == QTimeLine::Running) {
d->cancelAnimationAndHideVkbWidget();
if (d->mCallback) {
@@ -912,6 +1060,7 @@
}
} else if (d->mKeypadStatus != HbVkbStatusClosed) {
d->closeKeypadWithoutAnimation();
+ emit keypadClosed();
}
}
}
--- a/src/hbcore/vkbhosts/hbabstractvkbhost.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/vkbhosts/hbabstractvkbhost.h Fri Jun 11 13:58:22 2010 +0300
@@ -34,6 +34,7 @@
class HbView;
class HbAbstractVkbHostPrivate;
class HbWidget;
+class QGraphicsObject;
class HB_CORE_EXPORT HbAbstractVkbHost : public HbVkbHost
{
@@ -41,7 +42,9 @@
public:
HbAbstractVkbHost(HbWidget* containerWidget);
+ HbAbstractVkbHost(QWidget* containerWidget);
HbAbstractVkbHost(QGraphicsWidget* containerWidget);
+ HbAbstractVkbHost(QGraphicsObject* containerWidget);
~HbAbstractVkbHost();
public: // From HbVkbHost
--- a/src/hbcore/vkbhosts/hbabstractvkbhost_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/vkbhosts/hbabstractvkbhost_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -44,11 +44,28 @@
bool animationAllowed;
};
+
+// This class is to handle all the specific widget actions in an ,
+// abstract way, put all such widget specific code in below class.
+class HbVkbHostContainerWidget
+{
+ public:
+ HbVkbHostContainerWidget(QObject *containterWidget);
+ void setPos(QPointF newPosition);
+ QPointF pos();
+ QRectF sceneBoundingRect();
+ QObject *widgetObject() {return mContainerWidget;}
+ void connectSignals(QObject *reciever);
+ void disconnectSignals(QObject *reciever);
+private:
+ QPointer<QObject> mContainerWidget;
+};
+
class HbAbstractVkbHostPrivate
{
public:
- HbAbstractVkbHostPrivate(HbAbstractVkbHost *myVkbHost, QGraphicsWidget *containerWidget);
- virtual ~HbAbstractVkbHostPrivate() {}
+ HbAbstractVkbHostPrivate(HbAbstractVkbHost *myVkbHost, QObject *containerWidget);
+ virtual ~HbAbstractVkbHostPrivate();
virtual void openKeypad();
virtual void closeKeypad();
@@ -75,7 +92,7 @@
HbAbstractVkbHost *q_ptr;
HbVirtualKeyboard *mCallback;
QPointer<QGraphicsWidget> mKeypad;
- QPointer<QGraphicsWidget> mContainerWidget;
+ HbVkbHostContainerWidget *mContainerWidget;
QSizeF mScreenSize;
QTimeLine mTimeLine;
HbVkbHost::HbVkbStatus mKeypadStatus;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/vkbhosts/hbshrinkingvkbhost.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,170 @@
+/****************************************************************************
+**
+** 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 "hbshrinkingvkbhost.h"
+#include "hbabstractvkbhost_p.h"
+
+#include <hbinputvirtualkeyboard.h>
+#include <hbinputmethod.h>
+
+#include "hbwidget.h"
+#include "hbmainwindow.h"
+#include "hbmainwindow_p.h"
+
+/*!
+\proto
+\class HbShrinkingVkbHost
+\brief A virtual keyboard host that doesn't move the active mainwindow view but shrinks it.
+
+The default virtual keyboard host moves the editor container widget in order to keep the
+cursor line visible. In some situations that doesn't work and the container should be shrunk
+and relayouted instead.
+
+This virtual keyboard host does that. It works with editors that live inside in main window's
+active view and shrinks the view instead of moving it around when the virtual keyboard comes up.
+*/
+
+/// @cond
+
+class HbShrinkingVkbHostPrivate : public HbAbstractVkbHostPrivate
+{
+ Q_DECLARE_PUBLIC(HbShrinkingVkbHost)
+
+public:
+ HbShrinkingVkbHostPrivate(HbAbstractVkbHost *myHost, HbWidget *widget);
+ bool prepareContainerAnimation(HbVkbHost::HbVkbStatus status);
+ void closeKeypad();
+ void closeKeypadWithoutAnimation();
+ void openKeypadWithoutAnimation();
+ void minimizeKeypadWithoutAnimation();
+
+ void shrinkView();
+ void resetViewSize();
+
+public:
+ QSizeF mContainerOriginalSize;
+};
+
+HbShrinkingVkbHostPrivate::HbShrinkingVkbHostPrivate(HbAbstractVkbHost *myHost, HbWidget *widget)
+: HbAbstractVkbHostPrivate(myHost, widget)
+{
+}
+
+bool HbShrinkingVkbHostPrivate::prepareContainerAnimation(HbVkbHost::HbVkbStatus status)
+{
+ Q_UNUSED(status);
+
+ // This host doesn't move the container, only the keypad.
+ return false;
+}
+
+void HbShrinkingVkbHostPrivate::closeKeypad()
+{
+ resetViewSize();
+ HbAbstractVkbHostPrivate::closeKeypad();
+}
+
+void HbShrinkingVkbHostPrivate::closeKeypadWithoutAnimation()
+{
+ resetViewSize();
+ HbAbstractVkbHostPrivate::closeKeypadWithoutAnimation();
+}
+
+void HbShrinkingVkbHostPrivate::openKeypadWithoutAnimation()
+{
+ HbAbstractVkbHostPrivate::openKeypadWithoutAnimation();
+ shrinkView();
+}
+
+void HbShrinkingVkbHostPrivate::minimizeKeypadWithoutAnimation()
+{
+ HbAbstractVkbHostPrivate::minimizeKeypadWithoutAnimation();
+ shrinkView();
+}
+
+void HbShrinkingVkbHostPrivate::resetViewSize()
+{
+ HbMainWindow *mainWin = mainWindow();
+ if (mainWin && mContainerOriginalSize.isValid()) {
+ HbMainWindowPrivate::d_ptr(mainWin)->setViewportSize(mContainerOriginalSize);
+ mContainerOriginalSize = QSizeF();
+ }
+}
+
+void HbShrinkingVkbHostPrivate::shrinkView()
+{
+ Q_Q(HbShrinkingVkbHost);
+
+ HbMainWindow *mainWin = mainWindow();
+ if (mainWin) {
+ if (!mContainerOriginalSize.isValid()) {
+ mContainerOriginalSize = HbMainWindowPrivate::d_ptr(mainWin)->viewPortSize();
+ }
+ HbMainWindowPrivate::d_ptr(mainWin)->setViewportSize(q->applicationArea().size());
+ }
+}
+
+/// @endcond
+
+/*!
+Constructs the object.
+*/
+HbShrinkingVkbHost::HbShrinkingVkbHost(HbWidget *widget) : HbAbstractVkbHost(new HbShrinkingVkbHostPrivate(this, widget))
+{
+ setParent(widget);
+}
+
+/*!
+Destructs the object.
+*/
+HbShrinkingVkbHost::~HbShrinkingVkbHost()
+{
+}
+
+/*!
+\reimp
+*/
+int HbShrinkingVkbHost::priority() const
+{
+ return 0;
+}
+
+/*!
+\reimp
+*/
+void HbShrinkingVkbHost::animationFinished()
+{
+ Q_D(HbShrinkingVkbHost);
+
+
+ HbAbstractVkbHost::animationFinished();
+
+ if (d->mKeypadStatus == HbVkbHost::HbVkbStatusOpened ||
+ d->mKeypadStatus == HbVkbHost::HbVkbStatusMinimized) {
+ d->shrinkView();
+ }
+}
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/vkbhosts/hbshrinkingvkbhost.h Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** 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 HBSHRINKINGVKBHOST_H
+#define HBSHRINKINGVKBHOST_H
+
+#include "hbabstractvkbhost.h"
+
+class HbWidget;
+class HbShrinkingVkbHostPrivate;
+
+class HB_CORE_EXPORT HbShrinkingVkbHost : public HbAbstractVkbHost
+{
+ Q_OBJECT
+
+public:
+ explicit HbShrinkingVkbHost(HbWidget *target);
+ ~HbShrinkingVkbHost();
+
+ int priority() const;
+
+public slots:
+ void animationFinished();
+
+private:
+ Q_DECLARE_PRIVATE_D(d_ptr, HbShrinkingVkbHost)
+ Q_DISABLE_COPY(HbShrinkingVkbHost)
+};
+
+#endif // HBSHRINKINGVKBHOST_H
+
+// End of file
+
--- a/src/hbcore/vkbhosts/vkbhosts.pri Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/vkbhosts/vkbhosts.pri Fri Jun 11 13:58:22 2010 +0300
@@ -32,7 +32,9 @@
PUBLIC_HEADERS += $$PWD/hbstaticvkbhost.h
PUBLIC_HEADERS += $$PWD/hbabstractvkbhost.h
+PUBLIC_HEADERS += $$PWD/hbshrinkingvkbhost.h
SOURCES += $$PWD/hbabstractvkbhost.cpp
SOURCES += $$PWD/hbstaticvkbhost.cpp
+SOURCES += $$PWD/hbshrinkingvkbhost.cpp
--- a/src/hbfeedback/hbfeedback.pro Thu May 27 13:10:59 2010 +0300
+++ b/src/hbfeedback/hbfeedback.pro Fri Jun 11 13:58:22 2010 +0300
@@ -41,7 +41,7 @@
CONVENIENCE_HEADERS += $${HB_BUILD_DIR}/include/hbfeedback/hbfeedback.h
CONVENIENCE_HEADERS += $$files($${HB_BUILD_DIR}/include/hbfeedback/Hb*)
-HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS $$CONVENIENCE_HEADERS
+HEADERS += $$PUBLIC_HEADERS $$RESTRICTED_HEADERS $$PRIVATE_HEADERS $$CONVENIENCE_HEADERS
# dependencies
hbAddLibrary(hbcore/HbCore)
@@ -54,10 +54,13 @@
pubheaders.files = $$PUBLIC_HEADERS
pubheaders.path = $${HB_INCLUDE_DIR}/hbfeedback
+ restheaders.files = $$RESTRICTED_HEADERS
+ restheaders.path = $${HB_INCLUDE_DIR}/hbfeedback/restricted
+
convheaders.files = $$CONVENIENCE_HEADERS
convheaders.path = $${HB_INCLUDE_DIR}/hbfeedback
- INSTALLS += target pubheaders convheaders
+ INSTALLS += target pubheaders restheaders convheaders
win32:INSTALLS += dlltarget
}
--- a/src/hbfeedback/player/hbfeedbackplayer_symbian.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbfeedback/player/hbfeedbackplayer_symbian.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -131,34 +131,34 @@
instantFeedbackSymbian = ETouchFeedbackSensitiveButton;
break;
case HbFeedback::BasicItem:
- instantFeedbackSymbian = ETouchFeedbackBasic; // Effects changing in 10.1 are mapped to basic.
+ instantFeedbackSymbian = ETouchFeedbackBasicItem;
break;
case HbFeedback::SensitiveItem:
- instantFeedbackSymbian = ETouchFeedbackBasic; // Effects changing in 10.1 are mapped to basic.
+ instantFeedbackSymbian = ETouchFeedbackSensitiveItem;
break;
case HbFeedback::BounceEffect:
- instantFeedbackSymbian = ETouchFeedbackBasic; // Effects changing in 10.1 are mapped to basic.
+ instantFeedbackSymbian = ETouchFeedbackBounceEffect;
break;
case HbFeedback::PopupOpen:
- instantFeedbackSymbian = ETouchFeedbackBasic; // Effects changing in 10.1 are mapped to basic.
+ instantFeedbackSymbian = ETouchFeedbackPopupOpen;
break;
case HbFeedback::PopupClose:
- instantFeedbackSymbian = ETouchFeedbackBasic; // Effects changing in 10.1 are mapped to basic.
+ instantFeedbackSymbian = ETouchFeedbackPopupClose;
break;
case HbFeedback::BasicSlider:
- instantFeedbackSymbian = ETouchFeedbackBasic; // Effects changing in 10.1 are mapped to basic.
+ instantFeedbackSymbian = ETouchFeedbackBasicSlider;
break;
case HbFeedback::SensitiveSlider:
- instantFeedbackSymbian = ETouchFeedbackBasic; // Effects changing in 10.1 are mapped to basic.
+ instantFeedbackSymbian = ETouchFeedbackSensitiveSlider;
break;
case HbFeedback::StopFlick:
- instantFeedbackSymbian = ETouchFeedbackBasic; // Effects changing in 10.1 are mapped to basic.
+ instantFeedbackSymbian = ETouchFeedbackStopFlick;
break;
case HbFeedback::Flick:
- instantFeedbackSymbian = ETouchFeedbackBasic; // Effects changing in 10.1 are mapped to basic.
+ instantFeedbackSymbian = ETouchFeedbackFlick;
break;
case HbFeedback::Editor:
- instantFeedbackSymbian = ETouchFeedbackBasic; // Effects changing in 10.1 are mapped to basic.
+ instantFeedbackSymbian = ETouchFeedbackEditor;
break;
case HbFeedback::TextSelection:
instantFeedbackSymbian = ETouchFeedbackTextSelection;
@@ -176,37 +176,36 @@
instantFeedbackSymbian = ETouchFeedbackCheckbox;
break;
case HbFeedback::MultipleCheckbox:
- instantFeedbackSymbian = ETouchFeedbackBasic; // Effects changing in 10.1 are mapped to basic.
+ instantFeedbackSymbian = ETouchFeedbackMultipleCheckbox;
break;
case HbFeedback::SensitiveKeypad:
- instantFeedbackSymbian = ETouchFeedbackBasic; // Effects changing in 10.1 are mapped to basic.
+ instantFeedbackSymbian = ETouchFeedbackSensitiveKeypad;
break;
case HbFeedback::BasicKeypad:
- instantFeedbackSymbian = ETouchFeedbackBasic; // Effects changing in 10.1 are mapped to basic.
+ instantFeedbackSymbian = ETouchFeedbackBasicKeypad;
break;
case HbFeedback::MultitouchActivate:
- instantFeedbackSymbian = ETouchFeedbackBasic; // Effects changing in 10.1 are mapped to basic.
+ instantFeedbackSymbian = ETouchFeedbackMultitouchActivate;
break;
case HbFeedback::RotateStep:
- instantFeedbackSymbian = ETouchFeedbackBasic; // Effects changing in 10.1 are mapped to basic.
- break;
- case HbFeedback::ItemDrop:
- instantFeedbackSymbian = ETouchFeedbackBasic; // Effects changing in 10.1 are mapped to basic.
- break;
- case HbFeedback::ItemMoveOver:
- instantFeedbackSymbian = ETouchFeedbackBasic; // Effects changing in 10.1 are mapped to basic.
- break;
- case HbFeedback::ItemPick:
- instantFeedbackSymbian = ETouchFeedbackBasic; // Effects changing in 10.1 are mapped to basic.
+ instantFeedbackSymbian = ETouchFeedbackRotateStep;
break;
case HbFeedback::ItemScroll:
- instantFeedbackSymbian = ETouchFeedbackBasic; // Effects changing in 10.1 are mapped to basic.
+ instantFeedbackSymbian = ETouchFeedbackItemScroll;
break;
case HbFeedback::PopUp:
instantFeedbackSymbian = ETouchFeedbackPopUp;
break;
+ case HbFeedback::ItemDrop:
+ instantFeedbackSymbian = ETouchFeedbackItemDrop;
+ break;
+ case HbFeedback::ItemMoveOver:
+ instantFeedbackSymbian = ETouchFeedbackItemMoveOver;
+ break;
+ case HbFeedback::ItemPick:
+ instantFeedbackSymbian = ETouchFeedbackItemPick;
case HbFeedback::LongPress:
- instantFeedbackSymbian = ETouchFeedbackBasic; // Effects changing in 10.1 are mapped to basic.
+ instantFeedbackSymbian = ETouchFeedbackLongTap;
break;
default:
break;
@@ -247,15 +246,14 @@
case HbFeedback::ContinuousSlider:
continuousFeedbackSymbian = ETouchContinuousSlider;
break;
+ case HbFeedback::ContinuousPinch:
+ continuousFeedbackSymbian = ETouchContinuousPinch;
+ break;
case HbFeedback::ContinuousInput:
continuousFeedbackSymbian = ETouchContinuousInput;
break;
- // Effects coming in 10.1 are mapped to smooth temporarily.
case HbFeedback::ContinuousPopup:
- continuousFeedbackSymbian = ETouchContinuousSmooth;
- break;
- case HbFeedback::ContinuousPinch:
- continuousFeedbackSymbian = ETouchContinuousSmooth;
+ continuousFeedbackSymbian = ETouchContinuousPopup;
break;
default:
break;
--- a/src/hbinput/hbinput.pro Thu May 27 13:10:59 2010 +0300
+++ b/src/hbinput/hbinput.pro Fri Jun 11 13:58:22 2010 +0300
@@ -37,7 +37,7 @@
CONVENIENCE_HEADERS += $${HB_BUILD_DIR}/include/hbinput/hbinput.h
CONVENIENCE_HEADERS += $$files($${HB_BUILD_DIR}/include/hbinput/Hb*)
-HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS $$CONVENIENCE_HEADERS
+HEADERS += $$PUBLIC_HEADERS $$RESTRICTED_HEADERS $$PRIVATE_HEADERS $$CONVENIENCE_HEADERS
# dependencies
hbAddLibrary(hbcore/HbCore)
@@ -51,13 +51,13 @@
pubheaders.files = $$PUBLIC_HEADERS
pubheaders.path = $${HB_INCLUDE_DIR}/hbinput
- privheaders.files = $$PRIVATE_HEADERS
- privheaders.path = $${HB_INCLUDE_DIR}/hbinput/private
+ restheaders.files = $$RESTRICTED_HEADERS
+ restheaders.path = $${HB_INCLUDE_DIR}/hbinput/restricted
convheaders.files = $$CONVENIENCE_HEADERS
convheaders.path = $${HB_INCLUDE_DIR}/hbinput
- INSTALLS += target pubheaders privheaders convheaders
+ INSTALLS += target pubheaders restheaders convheaders
win32:INSTALLS += dlltarget
}
--- a/src/hbinput/inputwidgets/hbinputbuttongroup.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputbuttongroup.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -23,12 +23,13 @@
**
****************************************************************************/
-#include <QDebug>
#include <QPainter>
#include <QTextLayout>
#include <QGraphicsSceneMouseEvent>
#include <QTouchEvent>
#include <QTimer>
+#include <QApplication>
+#include <QInputContext>
#include <hbmainwindow.h>
#include <hbaction.h>
@@ -38,6 +39,7 @@
#include <hbframeitem.h>
#include <hbwidgetfeedback.h>
#include <hbdeviceprofile.h>
+#include <hbinputregioncollector_p.h>
#include "hbframedrawerpool_p.h"
#include "hbinputbuttongroup.h"
@@ -314,13 +316,23 @@
int index = mButtonData.indexOf(item);
if (mButtonPreviewEnabled && item->type() != HbInputButton::ButtonTypeFunction &&
!mButtonPreview.contains(index)) {
- HbInputButtonGroup *group = new HbInputButtonGroup(QSize(1, 1), q);
+ HbInputButtonGroup *group = new HbInputButtonGroup(QSize(1, 1));
mButtonPreview.insert(index, group);
QList<HbInputButton*> buttons;
- HbInputButton *previewItem = new HbInputButton(item->text(HbInputButton::ButtonTextIndexPrimary).at(0).unicode(), QPoint(0, 0));
+ HbInputButton *previewItem = 0;
+ if (!item->icon(HbInputButton::ButtonIconIndexPrimary).isNull()) {
+ int keyCode = -1;
+ if (!item->text(HbInputButton::ButtonTextIndexPrimary).isEmpty()) {
+ keyCode = item->text(HbInputButton::ButtonTextIndexPrimary).at(0).unicode();
+ }
+ previewItem = new HbInputButton(keyCode, QPoint(0, 0));
+ previewItem->setIcon(item->icon(HbInputButton::ButtonIconIndexPrimary), HbInputButton::ButtonIconIndexPrimary);
+ } else if (!item->text(HbInputButton::ButtonTextIndexPrimary).isEmpty()) {
+ previewItem = new HbInputButton(item->text(HbInputButton::ButtonTextIndexPrimary).at(0).unicode(), QPoint(0, 0));
+ previewItem->setText(item->text(HbInputButton::ButtonTextIndexPrimary), HbInputButton::ButtonTextIndexPrimary);
+ }
previewItem->setType(HbInputButton::ButtonTypeLabel);
- previewItem->setText(item->text(HbInputButton::ButtonTextIndexPrimary), HbInputButton::ButtonTextIndexPrimary);
buttons.append(previewItem);
group->setButtons(buttons);
@@ -328,22 +340,24 @@
qreal cellHeight = q->boundingRect().height() / mGridSize.height();
QFont font = HbFontSpec(HbFontSpec::Primary).font();
- font.setPixelSize(int(fontSize(ButtonTextTypeLabel)));
+ font.setPixelSize(int(fontSize(ButtonTextTypeLabel)));
QFontMetricsF fontMetrics(font);
qreal textWidth = fontMetrics.width(item->text(HbInputButton::ButtonTextIndexPrimary));
qreal width = textWidth + HbPreviewMarginInUnits * mUnitValue;
- if (width < HbPreviewWidthInUnits * mUnitValue) {
+ if (!item->icon(HbInputButton::ButtonIconIndexPrimary).isNull()) {
+ width = item->boundingRect().width();
+ } else if (width < HbPreviewWidthInUnits * mUnitValue) {
width = HbPreviewWidthInUnits * mUnitValue;
}
qreal height = HbPreviewHeightInUnits * mUnitValue;
- qreal x = (item->position().x() + 0.5 * item->size().width()) * cellWidth - 0.5 * width;
+ qreal x = q->scenePos().x() + (item->position().x() + 0.5 * item->size().width()) * cellWidth - 0.5 * width;
if (x < 0) {
x = 0;
} else if (x + width > q->boundingRect().width()) {
x = q->boundingRect().width() - width;
}
- qreal y = item->position().y() * cellHeight - height;
+ qreal y = q->scenePos().y() + item->position().y() * cellHeight - height;
group->setGeometry(QRectF(x, y, width, height));
if (q->parentItem()) {
group->setZValue(q->parentItem()->zValue() + 1);
@@ -371,12 +385,15 @@
if (mCharacterSelectionPreviewEnabled && item->type() != HbInputButton::ButtonTypeFunction &&
item->mappedCharacters().count() > 1) {
+
+ HbWidgetFeedback::triggered(q, Hb::InstantLongPressed);
mProbabilities.clear();
q->cancelButtonPress();
if (!mCharacterSelectionPreview) {
mCharacterSelectionPreview = new HbDialog();
+ HbInputRegionCollector::instance()->attach(mCharacterSelectionPreview);
mCharacterSelectionPreview->setModal(true);
mCharacterSelectionPreview->setBackgroundFaded(false);
mCharacterSelectionPreview->setTimeout(HbPopup::NoTimeout);
@@ -398,7 +415,7 @@
qreal cellHeight = q->boundingRect().height() / mGridSize.height();
QFont font = HbFontSpec(HbFontSpec::Primary).font();
- font.setPixelSize(int(fontSize(ButtonTextTypeLabel)));
+ font.setPixelSize(int(fontSize(ButtonTextTypeLabel)));
QFontMetricsF fontMetrics(font);
qreal textWidth = fontMetrics.width(item->mappedCharacters());
@@ -441,7 +458,7 @@
int column = static_cast<int>(position.x() / (q->boundingRect().width() / mGridSize.width()));
int row = static_cast<int>(position.y() / (q->boundingRect().height() / mGridSize.height()));
- int index = mButtonGridPositions.value(QPair<int, int>(column, row));
+ int index = mButtonGridPositions.value(QPair<int, int>(column, row), -1);
if (index >= 0 && index < mButtonData.count()) {
HbInputButton *item = mButtonData.at(index);
@@ -491,7 +508,7 @@
int column = static_cast<int>(position.x() / (q->boundingRect().width() / mGridSize.width()));
int row = static_cast<int>(position.y() / (q->boundingRect().height() / mGridSize.height()));
- int index = mButtonGridPositions.value(QPair<int, int>(column, row));
+ int index = mButtonGridPositions.value(QPair<int, int>(column, row), -1);
if (index >= 0 && index < mButtonData.count()) {
HbInputButton *item = mButtonData.at(index);
@@ -538,8 +555,8 @@
int newColumn = static_cast<int>(newPosition.x() / (q->boundingRect().width() / mGridSize.width()));
int newRow = static_cast<int>(newPosition.y() / (q->boundingRect().height() / mGridSize.height()));
- int oldIndex = mButtonGridPositions.value(QPair<int, int>(oldColumn, oldRow));
- int newIndex = mButtonGridPositions.value(QPair<int, int>(newColumn, newRow));
+ int oldIndex = mButtonGridPositions.value(QPair<int, int>(oldColumn, oldRow), -1);
+ int newIndex = mButtonGridPositions.value(QPair<int, int>(newColumn, newRow), -1);
if (newPosition.x() >= 0 && newPosition.x() < q->boundingRect().width() &&
newPosition.y() >= 0 && newPosition.y() < q->boundingRect().height() &&
@@ -583,7 +600,7 @@
int column = static_cast<int>(position.x() / (q->boundingRect().width() / mGridSize.width()));
int row = static_cast<int>(position.y() / (q->boundingRect().height() / mGridSize.height()));
- int index = mButtonGridPositions.value(QPair<int, int>(column, row));
+ int index = mButtonGridPositions.value(QPair<int, int>(column, row), -1);
if (index >= 0 && index < mButtonData.count()) {
HbInputButton *item = mButtonData.at(index);
@@ -611,6 +628,7 @@
HbWidgetFeedback::triggered(q, Hb::InstantClicked);
int actionIndex = item->keyCode() - HbInputButton::ButtonKeyCodeCustom;
if (actionIndex >= 0 && actionIndex < mCustomActions.count()) {
+ emit q->aboutToActivateCustomAction(mCustomActions.at(actionIndex));
mCustomActions.at(actionIndex)->activate(QAction::Trigger);
} else {
calculateButtonProbabilities(position);
@@ -656,20 +674,20 @@
QKeyEvent pressEvent(QEvent::KeyPress, item->keyCode(), Qt::NoModifier, text, true);
q->emitButtonPressed(pressEvent);
} else {
- if (mCharacterSelectionPreviewEnabled) {
+ if (mCharacterSelectionPreviewEnabled && item->type() != HbInputButton::ButtonTypeFunction && item->mappedCharacters().count() > 1) {
showCharacterSelectionPreview(item);
- }
+ } else {
+ HbWidgetFeedback::triggered(q, Hb::InstantLongPressed);
- HbWidgetFeedback::triggered(q, Hb::InstantLongPressed);
+ delete timer;
- delete timer;
-
- QString text;
- if (item->type() == HbInputButton::ButtonTypeLabel) {
- text = item->text(HbInputButton::ButtonTextIndexPrimary);
+ QString text;
+ if (item->type() == HbInputButton::ButtonTypeLabel) {
+ text = item->text(HbInputButton::ButtonTextIndexPrimary);
+ }
+ QKeyEvent event(QEvent::KeyPress, item->keyCode(), Qt::NoModifier, text, true);
+ q->emitButtonLongPressed(event);
}
- QKeyEvent event(QEvent::KeyPress, item->keyCode(), Qt::NoModifier, text, true);
- q->emitButtonLongPressed(event);
}
}
}
@@ -742,7 +760,7 @@
qreal textHeight = fontMetrics.height();
QTextLine line = mTextLayouts.at(index)->createLine();
- line.setNumColumns(1);
+ line.setNumColumns(item->text(HbInputButton::ButtonTextIndexPrimary).length());
if (typeIndex == HbInputButton::ButtonTypeLabel) {
layoutTextLine(ButtonTextTypeLabel, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
@@ -784,7 +802,7 @@
qreal textHeight = fontMetrics.height();
QTextLine line = mTextLayouts.at(index)->createLine();
- line.setNumColumns(1);
+ line.setNumColumns(item->text(HbInputButton::ButtonTextIndexPrimary).length());
layoutTextLine(ButtonTextTypePrimary, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
}
@@ -819,7 +837,7 @@
qreal textHeight = fontMetrics.height();
QTextLine line = mTextLayouts.at(index)->createLine();
- line.setNumColumns(1);
+ line.setNumColumns(item->text(HbInputButton::ButtonTextIndexSecondaryFirstRow).length());
layoutTextLine(ButtonTextTypeSecondaryFirstRow, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
}
@@ -830,7 +848,7 @@
qreal textHeight = fontMetrics.height();
QTextLine line = mTextLayouts.at(index)->createLine();
- line.setNumColumns(1);
+ line.setNumColumns(item->text(HbInputButton::ButtonTextIndexSecondarySecondRow).length());
layoutTextLine(ButtonTextTypeSecondarySecondRow, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
}
@@ -960,6 +978,15 @@
}
}
+void HbInputButtonGroupPrivate::_q_customActionDestroyed(QObject *object)
+{
+ Q_Q(HbInputButtonGroup);
+
+ HbAction *action = static_cast<HbAction *>(object);
+ mCustomActions.removeAll(action);
+ q->updateCustomButtons();
+}
+
/// @endcond
/*!
@@ -1133,7 +1160,7 @@
int index = -1;
if (d->mButtonGridPositions.contains(QPair<int, int>(column, row))) {
- index = d->mButtonGridPositions.value(QPair<int, int>(column, row));
+ index = d->mButtonGridPositions.value(QPair<int, int>(column, row), -1);
}
setButton(data, index);
}
@@ -1207,7 +1234,7 @@
int index = -1;
if (d->mButtonGridPositions.contains(QPair<int, int>(column, row))) {
- index = d->mButtonGridPositions.value(QPair<int, int>(column, row));
+ index = d->mButtonGridPositions.value(QPair<int, int>(column, row), -1);
}
return button(index);
}
@@ -1243,11 +1270,13 @@
Q_D(HbInputButtonGroup);
disconnect(this, SLOT(updateCustomButtons()));
+ disconnect(this, SLOT(_q_customActionDestroyed(QObject *)));
d->mCustomActions = actions;
foreach (HbAction *action, d->mCustomActions) {
connect(action, SIGNAL(changed()), this, SLOT(updateCustomButtons()));
+ connect(action, SIGNAL(destroyed(QObject *)), this, SLOT(_q_customActionDestroyed(QObject *)));
}
d->updateCustomActions();
@@ -1571,6 +1600,7 @@
} else if (event->type() == QEvent::GraphicsSceneMouseRelease) {
QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent*>(event);
d->releaseEvent(mouseEvent->pos());
+ cancelButtonPress();
} else {
return HbWidget::event(event);
}
@@ -1762,4 +1792,6 @@
update();
}
+#include "moc_hbinputbuttongroup.cpp"
+
// End of file
--- a/src/hbinput/inputwidgets/hbinputbuttongroup.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputbuttongroup.h Fri Jun 11 13:58:22 2010 +0300
@@ -109,6 +109,7 @@
void buttonReleased(const QKeyEvent &event);
void buttonLongPressed(const QKeyEvent &event);
void pressedButtonChanged(const QKeyEvent &releaseEvent, const QKeyEvent &pressEvent);
+ void aboutToActivateCustomAction(HbAction *custAction);
private slots:
void longPressEvent();
@@ -117,6 +118,7 @@
private:
Q_DECLARE_PRIVATE_D(d_ptr, HbInputButtonGroup)
Q_DISABLE_COPY(HbInputButtonGroup)
+ Q_PRIVATE_SLOT(d_func(), void _q_customActionDestroyed(QObject *))
};
#endif // HB_INPUT_BUTTON_GROUP_H
--- a/src/hbinput/inputwidgets/hbinputbuttongroup_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputbuttongroup_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -66,6 +66,8 @@
virtual void calculateButtonProbabilities(const QPointF &position);
+ void _q_customActionDestroyed(QObject *object);
+
protected:
virtual void createPrimarySingleTextLayout(int index, const QHash<int, QString> &textContent, const QSizeF &size);
virtual void createPrimaryTextLayout(int index, const QHash<int, QString> &textContent, const QSizeF &size);
--- a/src/hbinput/inputwidgets/hbinputcandidatelist.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputcandidatelist.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -25,7 +25,6 @@
#include <QLabel>
#include <QGraphicsLayout>
-
#include <hblistwidget.h>
#include <hblistwidgetitem.h>
#include <hbview.h>
@@ -37,6 +36,7 @@
#include <hbinputmethod.h>
#include <hbinputsettingproxy.h>
#include <hbinputvkbhost.h>
+#include <hbinputregioncollector_p.h>
#include "hbinputcandidatelist.h"
@@ -68,7 +68,9 @@
int numCandidates;
int longestStringWidth;
HbFrameItem *mFrameBackground;
+ HbListWidgetItem* mSpellQueryItem;
bool mCandidateCommitted;
+ bool mSpellQueryOpenIsPending;
};
HbCandidateListPrivate::HbCandidateListPrivate(HbInputMethod* input)
@@ -77,7 +79,9 @@
numCandidates(0),
longestStringWidth(0),
mFrameBackground(0),
- mCandidateCommitted(false)
+ mSpellQueryItem(0),
+ mCandidateCommitted(false),
+ mSpellQueryOpenIsPending(false)
{
Q_Q(HbCandidateList);
@@ -124,6 +128,10 @@
finalWidth = finalWidth + l + r ;
finalHeight = (qreal)numLines * oneLineHeight + 5.0 + t + b;
+ if(mSpellQueryItem) {
+ finalHeight += oneLineHeight ; // for spell button
+ }
+
if(finalHeight > HbDeviceProfile::current().logicalSize().height() - 30) {
finalHeight = HbDeviceProfile::current().logicalSize().height() - 30;
}
@@ -159,6 +167,8 @@
{
Q_D(HbCandidateList);
+ HbInputRegionCollector::instance()->attach(this);
+
d->setPriority(HbPopupPrivate::VirtualKeyboard + 1); // Should be shown on top of virtual keyboard.
d->initFrameIcon();
@@ -186,7 +196,7 @@
@param
*/
-void HbCandidateList::populateList(const QStringList& candidates)
+void HbCandidateList::populateList(const QStringList& candidates,bool addSpellQuery)
{
Q_D(HbCandidateList);
@@ -209,6 +219,18 @@
longestwidth = finalWidth;
}
}
+
+ d->mSpellQueryItem = 0;
+ if(addSpellQuery) {
+ d->mSpellQueryItem = new HbListWidgetItem();
+ d->mSpellQueryItem->setText(tr("Spell"));
+ d->mList->addItem(d->mSpellQueryItem);
+ QFontMetrics fontMetrics(d->mList->fontSpec().font());
+ finalWidth = fontMetrics.width(tr("Spell"));
+ if (finalWidth > longestwidth) {
+ longestwidth = finalWidth;
+ }
+ }
d->mList->setMinimumWidth(HbCandListMinWidth);
d->numCandidates = candidates.count();
@@ -255,10 +277,13 @@
*/
void HbCandidateList::itemActivated(HbListWidgetItem *item)
{
- Q_UNUSED(item);
Q_D(HbCandidateList);
- if (!d->mCandidateCommitted) {
- emit candidateSelected(0, currentCandidate());
+ if (!d->mCandidateCommitted) {
+ if(d->mSpellQueryItem != item) {
+ emit candidateSelected(0, currentCandidate());
+ } else if(d->mSpellQueryItem){
+ d->mSpellQueryOpenIsPending = true;
+ }
d->mCandidateCommitted = true;
}
hide();
@@ -289,9 +314,17 @@
*/
void HbCandidateList::hideEvent(QHideEvent * event)
{
- Q_D(HbCandidateList);
- d->mCandidateCommitted = false;
+ Q_D(HbCandidateList);
+ d->mCandidateCommitted = false;
HbDialog::hideEvent(event);
+ // If we try to open spell query in itemActivated, first spell query tries to
+ // open, and then candidatel list is closed. This creates problems if we
+ // quickly double click on the Spell button. So open spell query only after candidate
+ // list is closed.
+ if(d->mSpellQueryOpenIsPending) {
+ d->mSpellQueryOpenIsPending = false;
+ emit launchSpellQueryDialog();
+ }
}
void HbCandidateList::updatePrimitives()
--- a/src/hbinput/inputwidgets/hbinputcandidatelist.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputcandidatelist.h Fri Jun 11 13:58:22 2010 +0300
@@ -44,7 +44,7 @@
explicit HbCandidateList(HbInputMethod* input, QGraphicsItem* parent = 0);
virtual ~HbCandidateList();
- void populateList(const QStringList& candidates);
+ void populateList(const QStringList& candidates,bool addSpellQuery = false);
QString currentCandidate();
void setNumberOfVisibleLines(int numLines);
bool setSizeAndPositionForAutoCompletion(HbVkbHost *vkbHost);
@@ -52,6 +52,7 @@
signals:
void candidatePopupCancelled();
void candidateSelected(int key, const QString &candidate);
+ void launchSpellQueryDialog();
protected:
void closeEvent(QCloseEvent* event);
--- a/src/hbinput/inputwidgets/hbinputcheckboxlist.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputcheckboxlist.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -117,6 +117,7 @@
d->mListWidget->setSelectionMode(HbAbstractItemView::MultiSelection);
d->mListWidget->contentWidget()->setContentsMargins(10, 10, 10, 10);
d->mListWidget->setBackgroundItem(HbStyle::P_DataItem_background);
+ d->mListWidget->setScrollDirections(0);
QStringList items = modelItem->contentWidgetData(QString("items")).toStringList();
foreach(QString itemName, items) {
--- a/src/hbinput/inputwidgets/hbinputcommondialogs.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputcommondialogs.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -31,6 +31,7 @@
#include <hbinpututils.h>
#include <hbinputsettingproxy.h>
#include <hbinputmethod.h>
+#include <hbinputregioncollector_p.h>
#include "hbinputcommondialogs.h"
@@ -97,6 +98,7 @@
langDialog->setDismissPolicy(HbPopup::NoDismiss);
langDialog->setModal(true);
//langDialog->exec(); TODO
+ HbInputRegionCollector::instance()->attach(langDialog);
//TODO: needed to check from action which button was pressed (ok, cancel)
//HbAction* action = langDialog->exec();
if (langDialog->selectedItems().count()) {
@@ -154,6 +156,7 @@
methodDialog->setDismissPolicy(HbPopup::NoDismiss);
methodDialog->setModal(true);
//methodDialog->exec(); TODO
+ HbInputRegionCollector::instance()->attach(methodDialog);
//TODO: needed to check from action which button was pressed (ok, cancel)
//HbAction* action = langDialog->exec();
--- a/src/hbinput/inputwidgets/hbinputexactwordpopup.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputexactwordpopup.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -29,6 +29,7 @@
#include <QGraphicsSceneMouseEvent>
#include <QGraphicsLinearLayout>
+#include <hbinputregioncollector_p.h>
#include "hbdeviceprofile.h"
#include "hbdialog.h"
#include "hblabel.h"
@@ -111,6 +112,7 @@
HbDialog(*new HbExactWordPopupPrivate(), parent)
{
Q_D(HbExactWordPopup);
+ HbInputRegionCollector::instance()->attach(this);
d->mText = new HbLabel(this);
d->mText->setAlignment(Qt::AlignCenter);
--- a/src/hbinput/inputwidgets/hbinputscreenshotwidget.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputscreenshotwidget.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -27,8 +27,10 @@
#include <hbeffect.h>
#include <hbwidget_p.h>
+#include <hbinputregioncollector_p.h>
#include "hbframedrawerpool_p.h"
+
#include "hbinputscreenshotwidget.h"
#include "hbinputvkbwidget.h"
@@ -84,6 +86,7 @@
{
Q_D(HbInputScreenshotWidget);
d->q_ptr = this;
+ HbInputRegionCollector::instance()->attach(this);
setPos(QPointF(0,0));
--- a/src/hbinput/inputwidgets/hbinputsctkeyboard.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputsctkeyboard.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -289,7 +289,7 @@
HbInputButton *item = buttons.at(i);
const HbKeyboardMap *keyboardMap = mKeymap->keyboard(q->keyboardType());
- if (keyboardMap && key < keyboardMap->keys.count()) {
+ if (keyboardMap && key < keyboardMap->keys.count() && keyboardMap->keys.at(key)->characters(HbModifierNone)!= QString("")) {
QString keydata = keyboardMap->keys.at(key)->characters(HbModifierNone);
item->setText(keydata.at(0), HbInputButton::ButtonTextIndexPrimary);
} else {
--- a/src/hbinput/inputwidgets/hbinputsettinglist.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputsettinglist.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -34,6 +34,8 @@
#include <hbinputsettingproxy.h>
#include <hbinpututils.h>
#include <hbinputpredictionfactory.h>
+#include <hbinputregioncollector_p.h>
+
#include "hbinputsettinglist.h"
#include "hbdialog_p.h"
@@ -89,6 +91,7 @@
: HbDialog(*new HbInputSettingListPrivate(), parent)
{
Q_D(HbInputSettingList);
+ HbInputRegionCollector::instance()->attach(this);
QGraphicsLinearLayout *mainLayout = new QGraphicsLinearLayout(Qt::Vertical);
QGraphicsGridLayout *gridLayout = new QGraphicsGridLayout();
--- a/src/hbinput/inputwidgets/hbinputsettingwidget.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputsettingwidget.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -28,6 +28,7 @@
#include <hbinpututils.h>
#include <hbinputsettingproxy.h>
#include <hbinputpredictionfactory.h>
+#include <QtAlgorithms>
#include "hbinputsettingwidget.h"
#include "hbinputcheckboxlist_p.h"
@@ -37,6 +38,7 @@
const QString bestPrediction = QObject::tr("Best prediction");
const QString exactTyping = QObject::tr("Exact typing");
+
/// @cond
class HbInputSettingWidgetPrivate
@@ -225,7 +227,7 @@
*/
void HbInputSettingWidgetPrivate::fillLanguageList(QStringList &list, QList<HbInputLanguage> &languageList, const QString &replace)
{
- foreach(HbInputLanguage language, languageList) {
+ foreach(HbInputLanguage language, languageList) {
QString langName = language.localisedName();
if (langName.length() == 0) {
langName = replace;
--- a/src/hbinput/inputwidgets/hbinputsmileypicker.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputsmileypicker.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -35,6 +35,7 @@
#include <HbFrameItem>
#include <HbFrameDrawer>
#include <hbdialog_p.h>
+#include <hbinputregioncollector_p.h>
#include "hbinputsmileypicker.h"
@@ -116,7 +117,7 @@
: HbDialog(*new HbInputSmileyPickerPrivate(rows, columns), parent)
{
Q_D(HbInputSmileyPicker);
-
+ HbInputRegionCollector::instance()->attach(this);
#if QT_VERSION >= 0x040600
// Make sure the smiley picker never steals focus.
setFlag(QGraphicsItem::ItemIsPanel, true);
@@ -129,6 +130,7 @@
setBackgroundFaded(false);
setTimeout(NoTimeout);
setContentWidget(d->mView);
+ d->mView->setLongPressEnabled(false);
// extract smilies.
d->getSmilies(smileys);
--- a/src/hbinput/inputwidgets/hbinputvkbwidget.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputvkbwidget.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -43,12 +43,14 @@
#include <hbframedrawer.h>
#include <hbevent.h>
#include <hbdataform.h>
+#include <hbinputregioncollector_p.h>
#include <hbinputmethod.h>
#include <hbinputsettingproxy.h>
#include <hbinpututils.h>
#include <hbinputdef.h>
#include <hbinputvkbhost.h>
+#include <hbinputvkbhostbridge.h>
#include <hbinputsettingwidget.h>
#include <hbinputcommondialogs.h>
#include <hbinputkeymap.h>
@@ -59,6 +61,8 @@
#include <hbinputbutton.h>
#include <HbSwipeGesture>
#include <HbTapGesture>
+#include <HbSelectionDialog>
+#include <HbListWidgetItem>
#include "hbinputvirtualrocker.h"
#include "hbinputvkbwidget.h"
#include "hbinputvkbwidget_p.h"
@@ -68,6 +72,11 @@
#include "hbinputsmileypicker.h"
#include "hbinputscreenshotwidget.h"
+#define HB_DIGIT_LATIN_START_VALUE 0x0030
+#define HB_DIGIT_ARABIC_INDIC_START_VALUE 0x0660
+#define HB_DIGIT_EASTERN_ARABIC_START_VALUE 0x06F0
+#define HB_DIGIT_DEVANAGARI_START_VALUE 0x0966
+
const qreal HbRockerWidth = 50.0;
@@ -126,7 +135,8 @@
mCloseHandle(0),
mSettingView(0),
mCurrentView(0),
-mKeyboardDimmed(false)
+mKeyboardDimmed(false),
+mImSelectionDialog(0)
{
mScreenshotTimeLine.setUpdateInterval(16);
}
@@ -138,7 +148,8 @@
delete mBackgroundDrawer;
delete mIconDrawer;
delete mSmileyPicker;
- delete mScreenshotWidget;
+ delete mScreenshotWidget;
+ delete mImSelectionDialog;
}
void HbInputVkbWidgetPrivate::initLayout()
@@ -167,6 +178,10 @@
{
Q_Q(HbInputVkbWidget);
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
+ QObject::connect(buttonGroup,SIGNAL(aboutToActivateCustomAction(HbAction*)),
+ q,SIGNAL(aboutToActivateCustomAction(HbAction*)));
+
mRocker = new HbInputVirtualRocker(q);
mRocker->setObjectName("VirtualRocker");
QSizeF rockerSize(HbRockerWidth, HbRockerWidth);
@@ -198,6 +213,8 @@
// eating gestures below the panel (remove when panel starts to do this)
q->grabGesture(Qt::TapGesture);
q->grabGesture(Qt::PanGesture);
+
+ HbInputRegionCollector::instance()->attach(q);
}
// re-implemented by inherited keyboards
@@ -299,7 +316,7 @@
HbInputButton *item = buttons.at(i);
const HbKeyboardMap *keyboardMap = mKeymap->keyboard(q->keyboardType());
- if (keyboardMap && key < keyboardMap->keys.count()) {
+ if (keyboardMap && key < keyboardMap->keys.count() && keyboardMap->keys.at(key)->characters(mModifiers)!= QString("")) {
QString keydata = keyboardMap->keys.at(key)->characters(mModifiers);
item->setText(keydata.at(0), HbInputButton::ButtonTextIndexPrimary);
@@ -411,6 +428,122 @@
return ret;
}
+
+QChar HbInputVkbWidgetPrivate::numberCharacterBoundToKey(int key)
+{
+ QChar numChr;
+ if (!mKeymap || !mOwner) {
+ return numChr;
+ }
+
+ HbInputFocusObject *focusObject = mOwner->focusObject();
+ if (!focusObject) {
+ return numChr;
+ }
+ HbInputLanguage language = mKeymap->language();
+ if (language.language() != (QLocale::Language)0) {
+ HbInputDigitType digitType = HbInputUtils::inputDigitType(language);
+
+ // In number editors, show the native digits only when both device and writing languages are same,
+ // else show latin digits
+ if (focusObject->editorInterface().isNumericEditor()) {
+ QLocale::Language systemLanguage = QLocale::system().language();
+ if (language.language() != systemLanguage) {
+ digitType = HbDigitTypeLatin;
+ }
+ }
+
+ HbKeyboardType keyboardType = mOwner->inputState().keyboard();
+
+ if (keyboardType == HbKeyboardVirtual12Key) {
+ numChr = HbInputUtils::findFirstNumberCharacterBoundToKey(
+ mKeymap->keyboard(keyboardType)->keys.at(key),
+ language, digitType);
+ } else if (keyboardType == HbKeyboardVirtualQwerty) {
+ switch (digitType) {
+ case HbDigitTypeLatin:
+ numChr = HB_DIGIT_LATIN_START_VALUE + key;
+ break;
+ case HbDigitTypeArabicIndic:
+ numChr = HB_DIGIT_ARABIC_INDIC_START_VALUE + key;
+ break;
+ case HbDigitTypeEasternArabic:
+ numChr = HB_DIGIT_EASTERN_ARABIC_START_VALUE + key;
+ break;
+ case HbDigitTypeDevanagari:
+ numChr = HB_DIGIT_DEVANAGARI_START_VALUE + key;
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ return numChr;
+}
+
+void HbInputVkbWidgetPrivate::showInputMethodSelectionDialog()
+{
+ Q_Q(HbInputVkbWidget);
+
+ delete mImSelectionDialog;
+ mImSelectionDialog = new HbSelectionDialog();
+
+ mImSelectionDialog->setObjectName("Input method dialog");
+
+ // Make sure the language dialog never steals focus.
+ mImSelectionDialog->setFlag(QGraphicsItem::ItemIsPanel, true);
+ mImSelectionDialog->setActive(false);
+
+ QList<HbInputMethodDescriptor> customList = HbInputMethod::listCustomInputMethods();
+
+ QList<HbListWidgetItem*> listItems;
+ HbListWidgetItem* item = new HbListWidgetItem();
+ QString methodName("Default");
+ item->setText(methodName);
+ listItems.append(item);
+
+ foreach (HbInputMethodDescriptor descriptor, customList) {
+ QString displayName = descriptor.displayName();
+ if (displayName.length() == 0) {
+ displayName = QString("Unknown");
+ }
+ item = new HbListWidgetItem();
+ item->setText(displayName);
+ listItems.append(item);
+ }
+ mImSelectionDialog->setWidgetItems(listItems, true);
+ mImSelectionDialog->setSelectionMode(HbAbstractItemView::SingleSelection);
+ mImSelectionDialog->setDismissPolicy(HbPopup::NoDismiss);
+ mImSelectionDialog->setModal(true);
+
+ q->connect(mImSelectionDialog, SIGNAL(finished(HbAction*)), q, SLOT(_q_inputMethodSelectionDialogFinished(HbAction*)));
+
+ mImSelectionDialog->open();
+}
+
+void HbInputVkbWidgetPrivate::_q_inputMethodSelectionDialogFinished(HbAction *action)
+{
+ Q_UNUSED(action);
+
+ QList<QVariant> selectedItems = mImSelectionDialog->selectedItems();
+ if (selectedItems.count()) {
+ HbInputMethodDescriptor result;
+ int selection = selectedItems.first().toInt();
+ if (selection == 0) {
+ result.setDefault();
+ } else {
+ QList<HbInputMethodDescriptor> customList = HbInputMethod::listCustomInputMethods();
+ if (customList.count() <= selection) {
+ result = customList[selection-1];
+ }
+ }
+
+ if (!result.isEmpty() && mOwner) {
+ mOwner->activateInputMethod(result);
+ }
+ }
+}
+
/// @endcond
/*!
@@ -617,6 +750,7 @@
d->mModifiers = modifiers;
d->updateButtons();
+ d->updateKeyCodes();
d->applyEditorConstraints();
HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(contentItem());
@@ -676,6 +810,9 @@
d->mCurrentHost = host;
+ if (d->mSmileyPicker && d->mSmileyPicker->isVisible()) {
+ d->mSmileyPicker->hide();
+ }
d->mRocker->setVisible(false);
if (d->mSettingList) {
d->mSettingList->close();
@@ -783,11 +920,26 @@
void HbInputVkbWidget::showSettingsView()
{
Q_D(HbInputVkbWidget);
+
+ //HbVkbHostBridge::instance()->minimizeKeypad(true);
+ /*
+ Added for vanilla input
+ When settings dialog is launched, keypad is not closed.
+ */
+ HbInputFocusObject *focusObject = 0;
+ if (!d->mOwner || !(focusObject = d->mOwner->focusObject())) {
+ return;
+ }
+ HbVkbHost *vkbHost = focusObject->editorInterface().vkbHost();
+ if (vkbHost && vkbHost->keypadStatus() != HbVkbHost::HbVkbStatusClosed) {
+ vkbHost->closeKeypad();
+ }
closeSettingList();
hide();
d->mSettingView = new HbView(this);
+ HbInputRegionCollector::instance()->attach(d->mSettingView);
d->mSettingView->setTitle(tr("Input Settings"));
mainWindow()->addView(d->mSettingView);
@@ -815,8 +967,20 @@
mainWindow()->setCurrentView(d->mCurrentView);
mainWindow()->removeView(d->mSettingView);
+ HbInputRegionCollector::instance()->detach(d->mSettingView);
delete d->mSettingView;
d->mSettingView = 0;
+
+ /***** To be removed, Added for vanilla input.
+ HbInputFocusObject *focusObject = 0;
+ if (!d->mOwner || !(focusObject = d->mOwner->focusObject())) {
+ return;
+ }
+ HbVkbHost *vkbHost = focusObject->editorInterface().vkbHost();
+ if (vkbHost && vkbHost->keypadStatus() != HbVkbHost::HbVkbStatusOpened) {
+ vkbHost->openKeypad();
+ }
+ *****/
}
/*!
@@ -827,11 +991,7 @@
Q_D(HbInputVkbWidget);
closeSettingList();
- HbInputMethodDescriptor method
- = HbInputCommonDialogs::showCustomInputMethodSelectionDialog(HbInputSettingProxy::instance()->globalInputLanguage());
- if (!method.isEmpty() && d->mOwner) {
- d->mOwner->activateInputMethod(method);
- }
+ d->showInputMethodSelectionDialog();
}
/*!
@@ -1019,13 +1179,13 @@
{
Q_D(HbInputVkbWidget);
+ if (d->mOwner && event.key() > 0) {
+ d->mOwner->filterEvent(&event);
+ }
+
if (event.key() == HbInputButton::ButtonKeyCodeSettings) {
showSettingList();
- } else {
- if (d->mOwner) {
- d->mOwner->filterEvent(&event);
- }
- }
+ }
}
/*!
@@ -1169,11 +1329,12 @@
} else if(HbTapGesture *gesture = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
if (gesture->state() == Qt::GestureFinished) {
// if keypad is minimized, open it
- if ( d->mCurrentHost->keypadStatus() == HbVkbHost::HbVkbStatusMinimized ) {
+ if (d->mCurrentHost && d->mCurrentHost->keypadStatus() == HbVkbHost::HbVkbStatusMinimized ) {
d->mCurrentHost->openKeypad(this, d->mOwner);
}
}
}
}
+#include "moc_hbinputvkbwidget.cpp"
// End of file
--- a/src/hbinput/inputwidgets/hbinputvkbwidget.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputvkbwidget.h Fri Jun 11 13:58:22 2010 +0300
@@ -142,12 +142,14 @@
void flickEvent(HbInputVkbWidget::HbFlickDirection direction);
void smileySelected(QString text);
void mouseMovedOutOfButton();
+ void aboutToActivateCustomAction(HbAction *custAction);
protected:
HbInputVkbWidget(HbInputVkbWidgetPrivate &dd, QGraphicsItem* parent);
private:
Q_DECLARE_PRIVATE_D(d_ptr, HbInputVkbWidget)
Q_DISABLE_COPY(HbInputVkbWidget)
+ Q_PRIVATE_SLOT(d_func(), void _q_inputMethodSelectionDialogFinished(HbAction *))
friend class HbTouchKeypadButton;
friend class HbInputUsedSymbolPane;
--- a/src/hbinput/inputwidgets/hbinputvkbwidget_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputvkbwidget_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -67,6 +67,7 @@
class HbInputScreenshotWidget;
class HbInputFocusObject;
class HbInputSettingList;
+class HbSelectionDialog;
const qreal VerticalSpacing = 0.0, HorizontalSpacing = 0.0; //vertical and horizontal spacing for buttons in layout
@@ -111,7 +112,11 @@
bool isSmileysEnabled();
bool isKeyboardDimmed();
+
+ void showInputMethodSelectionDialog();
+ void _q_inputMethodSelectionDialogFinished(HbAction *action);
+ virtual QChar numberCharacterBoundToKey(int key);
friend class HbTouchKeypadButton;
friend class HbInputUsedSymbolPane;
@@ -168,6 +173,7 @@
HbView *mSettingView;
HbView *mCurrentView;
bool mKeyboardDimmed;
+ HbSelectionDialog *mImSelectionDialog;
};
#endif //HB_INPUT_VKB_WIDGET_PRIVATE_H
--- a/src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenu.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenu.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -173,11 +173,20 @@
{
HbMainWindow* mainWnd = mainWindow();
Q_ASSERT(mainWnd);
- if (mainWnd && !mShowEventReceived) {
- connect(mainWnd, SIGNAL(orientationChanged(Qt::Orientation)),
- this, SLOT(orientationChanged(Qt::Orientation)));
+ if (mainWnd && !mShowEventReceived) {
+ // To have a consistant user experience the indicator menu's behaviour
+ // got aligned to the options menu's behaviour.
+ // The menu is now closed before a view/orientation change happens.
+ connect(mainWnd, SIGNAL(aboutToChangeOrientation()),
+ this, SLOT(close()));
+ connect(mainWnd, SIGNAL(aboutToChangeView(HbView *,HbView *)),
+ this, SLOT(close()));
}
+ HbIndicatorMenuContent *menuContent =
+ qobject_cast<HbIndicatorMenuContent*>(contentWidget());
+ menuContent->handleAboutToShow();
+
HbDialog::showEvent(event);
mShowEventReceived = true;
}
@@ -242,12 +251,3 @@
qobject_cast<HbIndicatorMenuContent*>(contentWidget());
menuContent->indicatorRemoved(indicatorRemoved);
}
-
-void HbIndicatorMenu::orientationChanged(Qt::Orientation orientation)
-{
- Q_UNUSED(orientation);
- doMenuLayout();
-}
-
-
-
--- a/src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenu_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenu_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -67,8 +67,6 @@
void indicatorsActivated(QList<HbIndicatorInterface*> activatedIndicators);
void indicatorActivated(HbIndicatorInterface *activatedIndicator);
void indicatorRemoved(HbIndicatorInterface *indicatorRemoved);
-protected slots:
- void orientationChanged(Qt::Orientation orientation);
private:
bool constructMenu(const QVariantMap ¶meters);
--- a/src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenucontent.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenucontent.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -152,6 +152,19 @@
return indicatorModel.rowCount();
}
+void HbIndicatorMenuContent::handleAboutToShow()
+{
+ for (int i = 0; i < mIndicatorList->model()->rowCount(); ++i) {
+ HbIndicatorInterface *indicator =
+ indicatorFromIndex(indicatorModel.item(i)->index());
+ if (indicator) {
+ if (indicator->refreshData()) {
+ setData(indicator, indicatorModel.item(i)->index());
+ }
+ }
+ }
+}
+
void HbIndicatorMenuContent::updatePrimitives()
{
repolish();
@@ -233,12 +246,12 @@
int index = listIndexFromIndicator(indicatorRemoved);
if (index >= 0) {
indicatorModel.removeRow(index);
+ //update indices.
+ for(int i = indicatorRemoved->category()+1; i < IndicatorTypes;++i){
+ mGroupTypeIndeces[i]--;
+ }
+ repolish();
}
- //update indices.
- for(int i = indicatorRemoved->category()+1; i < IndicatorTypes;++i){
- mGroupTypeIndeces[i]--;
- }
- repolish();
}
//data changed inside indicator.
--- a/src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenucontent_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenucontent_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -88,6 +88,8 @@
static HbIndicatorInterface *indicatorFromIndex(
const QModelIndex &modelIndex);
+ void handleAboutToShow();
+
signals:
void aboutToClose();
void userActivity();
--- a/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectengine.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectengine.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -320,12 +320,11 @@
}
else if (HbFeedbackEffectUtils::widgetFamily(widget) == HbFeedbackEffectUtils::Editor) {
effect = HbFeedbackEffectUtils::instantOnRelease(widget, modifiers());
- } else if (widget->type() == HbPrivate::ItemType_GroupBoxHeadingWidget || widget->type() == Hb::ItemType_ComboBox) {
+ } else if (widget->type() == Hb::ItemType_ComboBox) {
effect = HbFeedbackEffectUtils::instantOnRelease(widget, modifiers()) ;
}
- else if (widget->type() == HbPrivate::ItemType_GroupBoxHeadingWidget
- || widget->type() == HbPrivate::ItemType_GroupBoxContentWidget
- || widget->type() == HbPrivate::ItemType_DataGroupHeadingWidget
+ else if (widget->type() == HbPrivate::ItemType_GroupBoxContentWidget
+ || widget->type() == HbPrivate::ItemType_GroupBoxHeadingWidget
|| widget->type() == Hb::ItemType_ComboBox) {
effect = HbFeedbackEffectUtils::instantOnRelease(widget, modifiers());
}
@@ -450,13 +449,26 @@
QGraphicsItem* graphicsItem = trackPoint->mainWindow()->scene()->focusItem();
- if (graphicsItem->isWidget() &&
- static_cast<QGraphicsWidget*>(graphicsItem)->inherits("HbAbstractEdit")) {
-
- if (HbAbstractEdit* edit = static_cast<HbAbstractEdit*>(graphicsItem)) {
- if (edit->cursorPosition() != previousCursorPosition) {
- effect = HbFeedbackEffectUtils::instantOnEditorHighlight(edit, previousCursorPosition);
- previousCursorPosition = edit->cursorPosition();
+ if (graphicsItem->isWidget()) {
+ if (static_cast<QGraphicsWidget*>(graphicsItem)->inherits("HbAbstractEdit")) {
+ if (HbAbstractEdit* edit = static_cast<HbAbstractEdit*>(graphicsItem)) {
+ if (edit->cursorPosition() != previousCursorPosition) {
+ effect = HbFeedbackEffectUtils::instantOnEditorHighlight(edit, previousCursorPosition);
+ previousCursorPosition = edit->cursorPosition();
+ }
+ }
+ }
+ else if (static_cast<QGraphicsWidget*>(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>()) {
+ int currentCursorPosition = v.toInt();
+ if (currentCursorPosition != previousCursorPosition) {
+ effect = HbFeedbackEffectUtils::instantOnEditorHighlight(trackPoint, previousCursorPosition);
+ previousCursorPosition = currentCursorPosition;
+ }
}
}
}
@@ -512,18 +524,17 @@
*/
void HbFeedbackEffectEngine::rotated90Degrees(const HbWidget *widget)
{
- HbFeedback::InstantEffect effect = HbFeedback::None ;
- HbFeedback::Modalities modalities = 0 ;
+ HbFeedback::InstantEffect effect = HbFeedback::None;
+ HbFeedback::Modalities modalities = 0;
Hb::InstantInteraction interaction = Hb::InstantRotated90Degrees;
- if(widgetOverridesEffect( widget, interaction)) {
+ if(widgetOverridesEffect(widget, interaction)) {
effect = overrider.newInstantEffect;
} else {
effect = HbFeedback::RotateStep;
-
}
- if(widgetOverridesModalities(widget,interaction)) {
+ if (widgetOverridesModalities(widget,interaction)) {
modalities = overrider.newModalities ;
} else {
modalities = HbFeedbackEffectUtils::modalities(widget, interaction, modifiers());
@@ -539,18 +550,20 @@
{
HbFeedback::Modalities modalities = 0 ;
Hb::InstantInteraction interaction = Hb::InstantPopupOpened;
+ HbFeedback::InstantEffect effect = HbFeedback::None;
if(widgetOverridesModalities(widget,interaction)) {
- modalities = overrider.newModalities ;
- } else {
+ modalities = overrider.newModalities;
+ } else {
modalities = HbFeedbackEffectUtils::modalities(widget, interaction, modifiers());
}
- if(widgetOverridesEffect( widget, interaction)) {
+ if (widgetOverridesEffect(widget, interaction)) {
playInstantFeedback(widget, overrider.newInstantEffect, modalities);
} else {
- if(HbFeedbackEffectUtils::isFeedbackAllowedForPopup(widget)) {
- playInstantFeedback(widget, HbFeedback::PopupOpen, modalities);
+ if (HbFeedbackEffectUtils::isFeedbackAllowedForPopup(widget)) {
+ effect = HbFeedbackEffectUtils::instantOnPopupOpened(widget);
+ playInstantFeedback(widget, effect, modalities);
}
}
}
@@ -562,6 +575,7 @@
{
HbFeedback::Modalities modalities = 0 ;
Hb::InstantInteraction interaction = Hb::InstantPopupClosed;
+ HbFeedback::InstantEffect effect = HbFeedback::None;
if(widgetOverridesModalities(widget,interaction)) {
modalities = overrider.newModalities ;
@@ -569,11 +583,12 @@
modalities = HbFeedbackEffectUtils::modalities(widget, interaction, modifiers());
}
- if(widgetOverridesEffect( widget, interaction)) {
+ if(widgetOverridesEffect(widget, interaction)) {
playInstantFeedback(widget, overrider.newInstantEffect, modalities);
} else {
- if(HbFeedbackEffectUtils::isFeedbackAllowedForPopup(widget)) {
- playInstantFeedback(widget, HbFeedback::PopupClose, modalities);
+ if (HbFeedbackEffectUtils::isFeedbackAllowedForPopup(widget)) {
+ effect = HbFeedbackEffectUtils::instantOnPopupClosed(widget);
+ playInstantFeedback(widget, effect, modalities);
}
}
}
--- a/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -31,6 +31,7 @@
#include <hbabstractedit.h>
#include <hbtextedit.h>
#include <hblineedit.h>
+#include <hbinputvirtualrocker.h>
#include <hbabstractslidercontrol.h>
#include <hbprogressslider.h>
#include <hbscrollbar.h>
@@ -239,9 +240,8 @@
}
}
- if (widget->type() == HbPrivate::ItemType_NavigationButton
- // Commented out until use cases are clarified
- /*|| widget->type() == HbPrivate::ItemType_IndicatorButton*/) {
+ if (widget->type() == HbPrivate::ItemType_NavigationButton ||
+ widget->type() == Hb::ItemType_ToolButton) {
effect = HbFeedback::BasicButton;
}
@@ -253,7 +253,7 @@
effect = HbFeedback::BasicKeypad;
}
else if (widget->type() == Hb::ItemType_CheckBox) {
- effect = HbFeedback::None; // Checkbox deferred to release
+ effect = HbFeedback::BasicButton;
}
// title pane specific special case
@@ -269,18 +269,25 @@
effect = HbFeedback::BasicItem;
}
else {
+ effect = HbFeedback::BasicItem;
+ }
+ if (widget->type() == Hb::ItemType_DataFormViewItem) {
effect = HbFeedback::SensitiveItem;
}
+ else if (widget->type() == HbPrivate::ItemType_DataGroup) {
+ effect = HbFeedback::None;
+ }
+
break;
case HbFeedbackEffectUtils::Grid:
- effect = HbFeedback::SensitiveItem;
+ effect = HbFeedback::BasicItem;
break;
case HbFeedbackEffectUtils::Slider:
// slider track default
- effect = HbFeedback::SensitiveSlider;
+ effect = HbFeedback::BasicSlider;
// special cases
if (const HbProgressSlider *progressSlider = qobject_cast<const HbProgressSlider *>(widget)) {
@@ -293,12 +300,12 @@
// slider handle
if (modifiers & Hb::ModifierSliderHandle) {
- effect = HbFeedback::SensitiveSlider;
+ effect = HbFeedback::BasicSlider;
}
// slider elements
if (modifiers & Hb::ModifierSliderElement) {
- effect = HbFeedback::SensitiveButton;
+ effect = HbFeedback::BasicButton;
}
break;
@@ -324,11 +331,11 @@
if ( const HbAbstractViewItem * viewItem = qobject_cast<const HbAbstractViewItem *>(widget)) {
const HbAbstractItemView* itemView = viewItem->itemView();
if (itemView) {
- // checkable item is checked with a press
+ // Different press feedbacks for single and multiselection list items
switch (itemView->selectionMode()) {
case HbAbstractItemView::SingleSelection:
case HbAbstractItemView::MultiSelection: {
- effect = HbFeedback::SensitiveItem;
+ effect = HbFeedback::BasicButton;
break;
}
case HbAbstractItemView::NoSelection:
@@ -343,9 +350,9 @@
break;
}
- // radio button list works like a normal list item
+ // radio button list behaves like an item view on press
if (viewItem->type() == Hb::ItemType_RadioButtonListViewItem) {
- effect = HbFeedback::SensitiveItem;
+ effect = HbFeedback::BasicItem;
}
else if(viewItem->type() == Hb::ItemType_TumbleViewItem ) {
effect = HbFeedback::SensitiveItem;
@@ -362,6 +369,11 @@
}
}
}
+
+ if (widget->type() == Hb::ItemType_VirtualTrackPoint) {
+ effect = HbFeedback::BasicButton;
+ }
+
if (modifiers & Hb::ModifierScrolling) {
effect = HbFeedback::StopFlick;
}
@@ -405,9 +417,8 @@
}
}
- if (widget->type() == HbPrivate::ItemType_NavigationButton
- // Commented out until use cases are clarified
- /*|| widget->type() == HbPrivate::ItemType_IndicatorButton*/) {
+ if (widget->type() == HbPrivate::ItemType_NavigationButton ||
+ widget->type() == Hb::ItemType_ToolButton) {
effect = HbFeedback::BasicButton;
}
@@ -416,14 +427,12 @@
|| widget->type() == Hb::ItemType_InputFunctionButton) {
effect = HbFeedback::SensitiveKeypad;
} else if (widget->type() == Hb::ItemType_CheckBox) {
- effect = HbFeedback::Checkbox; // deferred from press
+ effect = HbFeedback::Checkbox;
}
// title pane specific special case
if (widget->type() == HbPrivate::ItemType_TitlePane) {
- if (isOptionsMenuEmpty(widget)) {
- effect = HbFeedback::None;
- }
+ effect = HbFeedback::None;
}
if (widget->type() == Hb::ItemType_ComboBox) {
@@ -437,31 +446,34 @@
effect = HbFeedback::BasicItem;
}
else {
- effect = HbFeedback::SensitiveItem;
+ effect = HbFeedback::BasicItem;
}
- // menu items give popop closed feedback on release
+ // menu items give popup close feedback on release
if (widget->type() == Hb::ItemType_MenuItem) {
effect = HbFeedback::None;
}
+ else if (widget->type() == Hb::ItemType_DataFormViewItem) {
+ effect = HbFeedback::None;
+ }
break;
case HbFeedbackEffectUtils::Grid:
- effect = HbFeedback::SensitiveItem;
+ effect = HbFeedback::BasicItem;
break;
case HbFeedbackEffectUtils::Slider:
// slider track default
- effect = HbFeedback::SensitiveSlider;
+ effect = HbFeedback::BasicSlider;
// slider handle
if (modifiers & Hb::ModifierSliderHandle) {
- effect = HbFeedback::SensitiveSlider;
+ effect = HbFeedback::BasicSlider;
}
// slider elements
if (modifiers & Hb::ModifierSliderElement) {
- effect = HbFeedback::SensitiveButton;
+ effect = HbFeedback::None;
}
break;
@@ -479,7 +491,7 @@
if (itemView) {
switch (itemView->selectionMode()) {
case HbAbstractItemView::SingleSelection:
- effect = HbFeedback::Checkbox; // deferred from press
+ effect = HbFeedback::Checkbox;
break;
case HbAbstractItemView::MultiSelection: {
effect = HbFeedback::None;
@@ -503,9 +515,9 @@
}
}
- // radio button list works like a normal list item
+ // radio button list has checkbox feedback behaviour on release
if (viewItem->type() == Hb::ItemType_RadioButtonListViewItem) {
- effect = HbFeedback::SensitiveItem;
+ effect = HbFeedback::Checkbox;
}
else if(viewItem->type() == Hb::ItemType_TumbleViewItem ) {
effect = HbFeedback::SensitiveItem;
@@ -600,9 +612,11 @@
if (widget->type() == Hb::ItemType_VirtualTrackPoint) {
effect = HbFeedback::Editor;
}
+
if (widget->type() == Hb::ItemType_Menu) {
effect = HbFeedback::ItemScroll;
}
+
return effect;
}
@@ -662,6 +676,49 @@
}
}
}
+ else if (const HbInputVirtualRocker *trackPoint = qobject_cast<const HbInputVirtualRocker *>(widget)) {
+
+ QGraphicsItem* graphicsItem = trackPoint->mainWindow()->scene()->focusItem();
+
+ if (graphicsItem->isWidget() && (static_cast<QGraphicsWidget*>(graphicsItem)->inherits("QGraphicsWebView"))) {
+ QVariant v;
+ v = graphicsItem->scene()->inputMethodQuery( Qt::ImCursorPosition );
+ if ( v.isValid() && v.canConvert<int>()) {
+ 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;
}
@@ -671,11 +728,11 @@
bool HbFeedbackEffectUtils::isFeedbackAllowedForPopup(const HbWidget *widget)
{
bool feedbackAllowed(false);
+
if (widgetFamily(widget) == HbFeedbackEffectUtils::Popup) {
feedbackAllowed = true;
if (widget->type() == HbPrivate::ItemType_ToolTipLabel
- || widget->type() == Hb::ItemType_InputCharPreviewPane
- || widget->type() == Hb::ItemType_InputVkbWidget) {
+ || widget->type() == Hb::ItemType_InputCharPreviewPane) {
feedbackAllowed = false;
}
else if (QString(widget->metaObject()->className()) == "HbSelectionControl") {
@@ -685,10 +742,44 @@
else if (QString(widget->metaObject()->className()) == "HbComboDropDown") {
feedbackAllowed = true;
}
+
return feedbackAllowed;
}
/*!
+ Returns the instant feedback effect for popup open event.
+*/
+HbFeedback::InstantEffect HbFeedbackEffectUtils::instantOnPopupOpened(const HbWidget *widget) {
+
+ HbFeedback::InstantEffect effect = HbFeedback::None;
+
+ if (QString(widget->metaObject()->className()) == "HbDeviceNotificationDialogWidget") {
+ effect = HbFeedback::PopUp;
+ }
+ else {
+ effect = HbFeedback::PopupOpen;
+ }
+ return effect;
+}
+
+/*!
+ Returns the instant feedback effect for popup close event.
+*/
+HbFeedback::InstantEffect HbFeedbackEffectUtils::instantOnPopupClosed(const HbWidget *widget) {
+
+ HbFeedback::InstantEffect effect = HbFeedback::None;
+
+ if (QString(widget->metaObject()->className()) == "HbDeviceNotificationDialogWidget") {
+ effect = HbFeedback::None;
+ }
+ else {
+ effect = HbFeedback::PopupClose;
+ }
+
+ return effect;
+}
+
+/*!
Returns the instant feedback effect on key press interaction.
*/
HbFeedback::InstantEffect HbFeedbackEffectUtils::instantOnKeyPress(const HbWidget *widget, Hb::InteractionModifiers modifiers)
@@ -702,7 +793,6 @@
*/
HbFeedback::InstantEffect HbFeedbackEffectUtils::instantOnSelectionChanged(const HbWidget *widget, Hb::InteractionModifiers modifiers)
{
- Q_UNUSED(modifiers);
HbFeedback::InstantEffect effect = HbFeedback::None;
if (const HbAbstractViewItem * viewItem = qobject_cast<const HbAbstractViewItem *>(widget)) {
@@ -715,7 +805,7 @@
break;
}
case HbAbstractItemView::MultiSelection: {
- effect = HbFeedback::MultipleCheckbox;
+ effect = HbFeedback::Checkbox;
break;
}
default:
@@ -723,6 +813,11 @@
}
}
}
+ else if (const HbAbstractItemView* itemView = qobject_cast<const HbAbstractItemView*>(widget)) {
+ if (itemView->selectionMode() == HbAbstractItemView::MultiSelection && (modifiers & Hb::ModifierScrolling)) {
+ effect = HbFeedback::MultipleCheckbox;
+ }
+ }
return effect;
}
@@ -854,6 +949,7 @@
HbFeedback::Modalities HbFeedbackEffectUtils::modalities(const HbWidget *widget, Hb::InstantInteraction interaction, Hb::InteractionModifiers modifiers )
{
Q_UNUSED(modifiers)
+ Q_UNUSED(widget)
HbFeedback::Modalities modalities = 0;
@@ -869,9 +965,6 @@
case Hb::InstantClicked:
modalities = HbFeedback::Tactile;
- if(widget->type() == Hb::ItemType_CheckBox) {
- modalities |= HbFeedback::Audio;
- }
break;
case Hb::InstantKeyRepeated:
--- a/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.h Fri Jun 11 13:58:22 2010 +0300
@@ -65,9 +65,11 @@
static HbFeedback::InstantEffect instantOnKeyPress(const HbWidget *widget, Hb::InteractionModifiers modifiers);
static HbFeedback::InstantEffect instantOnEditorHighlight(const HbWidget *widget, int previousCursorFocus);
static HbFeedback::InstantEffect instantOnSelectionChanged(const HbWidget *widget, Hb::InteractionModifiers modifiers);
+ static HbFeedback::InstantEffect instantOnPopupOpened(const HbWidget *widget);
+ static HbFeedback::InstantEffect instantOnPopupClosed(const HbWidget *widget);
static HbFeedback::ContinuousEffect continuousEffect(const HbWidget *widget, Hb::ContinuousInteraction interaction);
- static HbFeedback::Modalities modalities(const HbWidget *widget, Hb::InstantInteraction interaction, Hb::InteractionModifiers modifiers );
- static HbFeedback::Modalities modalities(const HbWidget *widget, Hb::ContinuousInteraction interaction, Hb::InteractionModifiers modifiers );
+ static HbFeedback::Modalities modalities(const HbWidget *widget, Hb::InstantInteraction interaction, Hb::InteractionModifiers modifiers);
+ static HbFeedback::Modalities modalities(const HbWidget *widget, Hb::ContinuousInteraction interaction, Hb::InteractionModifiers modifiers);
static bool isFeedbackAllowedForPopup(const HbWidget *widget);
static int intensity(const HbWidget *widget, Hb::ContinuousInteraction interaction, QPointF delta = QPointF());
static bool isFeedbackAllowed(const HbWidget* widget);
--- a/src/hbplugins/inputmethods/common/hbinputabstractbase.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputabstractbase.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -27,6 +27,8 @@
#include <hbinputvkbwidget.h>
#include <hbinputcandidatelist.h>
#include <hbmainwindow.h>
+#include <hbaction.h>
+#include <hbinputsettingproxy.h>
#include "hbinputabstractbase.h"
@@ -38,6 +40,7 @@
// ---------------------------------------------------------------------------
HbInputAbstractMethod::HbInputAbstractMethod()
{
+ mVanillQwertySwitch = new HbAction(QString("QTY"));
}
// ---------------------------------------------------------------------------
@@ -46,6 +49,7 @@
// ---------------------------------------------------------------------------
HbInputAbstractMethod::~HbInputAbstractMethod()
{
+ delete mVanillQwertySwitch;
}
// ---------------------------------------------------------------------------
@@ -156,18 +160,60 @@
}
}
-void HbInputAbstractMethod::showThaiSpecialCharacters(uint buttonId)
-{
- Q_UNUSED(buttonId);
-}
bool HbInputAbstractMethod::isSctModeActive() const
{
return false;
}
+
HbKeyboardType HbInputAbstractMethod::currentKeyboardType() const
{
return HbKeyboardNone;
}
+
+void HbInputAbstractMethod::focusReceived()
+{
+ bool isVannilaApp = false;
+ QInputContext* context = qApp->inputContext();
+ if (context && context->focusWidget()) {
+ QWidget *focusedWidget = context->focusWidget();
+ if (!focusedWidget->inherits("HbMainWindow")) {
+ isVannilaApp = true;
+ }
+ }
+
+ if(isVannilaApp && focusObject() ) {
+ QList<HbAction*> customActions= focusObject()->editorInterface().actions();
+ if(!customActions.contains(mVanillQwertySwitch)) {
+ disconnect(mVanillQwertySwitch, SIGNAL(triggered(bool)));
+ connect(mVanillQwertySwitch, SIGNAL(triggered(bool)), this, SLOT(switchKeypad(bool)));
+ focusObject()->editorInterface().addAction(mVanillQwertySwitch);
+ }
+ }
+}
+
+void HbInputAbstractMethod::switchKeypad(bool isActive)
+{
+ Q_UNUSED(isActive);
+ HbKeyboardType keyboard = HbInputSettingProxy::instance()->activeKeyboard();
+ if (keyboard == HbKeyboardVirtual12Key) {
+ HbInputSettingProxy::instance()->setActiveKeyboard(HbKeyboardVirtualQwerty);
+ } else if (keyboard == HbKeyboardVirtualQwerty) {
+ HbInputSettingProxy::instance()->setActiveKeyboard(HbKeyboardVirtual12Key);
+ }
+}
+
+// EOF
+
+
+
+QChar HbInputAbstractMethod ::previousChar()
+{
+ return QChar();
+}
+
+
+// EOF
+
--- a/src/hbplugins/inputmethods/common/hbinputabstractbase.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputabstractbase.h Fri Jun 11 13:58:22 2010 +0300
@@ -49,13 +49,18 @@
virtual void launchAutoCompletionPopup(const QStringList& candidates);
virtual void closeAutoCompletionPopup();
virtual void switchMode(int keyCode);
- virtual void showThaiSpecialCharacters(uint buttonId);
virtual void starKeySelected();
virtual void getCandidatePositionAndSize(HbCandidateList *candidatePopup,
HbInputVkbWidget *currentKeypad, QPointF & pos,QSizeF & size);
virtual bool isSctModeActive() const;
+ virtual QChar previousChar();
virtual HbKeyboardType currentKeyboardType() const;
+public: // From HbInputMethod
+ void focusReceived();
+public slots:
+ void switchKeypad(bool isActive);
private:
+ HbAction *mVanillQwertySwitch;
Q_DISABLE_COPY(HbInputAbstractMethod)
};
--- a/src/hbplugins/inputmethods/common/hbinputmodehandler.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputmodehandler.h Fri Jun 11 13:58:22 2010 +0300
@@ -85,7 +85,7 @@
// Utility functions.
void commitFirstMappedNumber(int key, HbKeyboardType type);
void getAndFilterCharactersBoundToKey(QStringList &list, Qt::Key key);
- QChar getNthCharacterInKey(int &index, int key, HbKeyboardType type);
+ virtual QChar getNthCharacterInKey(int &index, int key, HbKeyboardType type);
virtual void commitAndAppendString(const QString& string);
virtual void commitAndUpdate(const QString& string, int replaceFrom = 0, int replaceLength = 0, bool isAsync = false);
void sendAndUpdate(QEvent &event);
@@ -184,14 +184,16 @@
virtual void deleteOneCharacter();
virtual void processExactWord(QString exactWord);
void commitExactWord();
- virtual void processCustomWord(QString customWord);
virtual void candidatePopupClosed(QString activatedWord, int closingKey);
virtual void showExactWordPopupIfNeeded();
+ void closeSpellQueryDialog();
+ void spellQueryDialogClosed(QObject *savedFocusObject,bool isOk,QString string);
public slots:
// different utility popup callbacks
virtual void inputQueryPopupClosed(QString activatedWord, int closingKey);
void sctCharacterSelected(QString character);
void smileySelected(QString smiley);
+ void launchSpellQueryDialog();
signals://some useful signals related to popups
void launchInputQueryPopup(QString editWord);
--- a/src/hbplugins/inputmethods/common/hbinputpredictionhandler.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputpredictionhandler.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -34,6 +34,7 @@
#include <hbcolorscheme.h>
#include <hbinpututils.h>
#include <hbinputbutton.h>
+#include "hbinputspellquerydialog.h"
#include "../touchinput/virtualqwerty.h"
#include "hbinputpredictionhandler_p.h"
@@ -49,7 +50,8 @@
mTailShowing(false),
mAutoAddedSpace(true),
mCanContinuePrediction(true),
- mShowTooltip(true)
+ mShowTooltip(true),
+ mSpellQueryDialog(0)
{
}
@@ -168,7 +170,8 @@
void HbInputPredictionHandlerPrivate::showExactWordPopupIfNeeded()
{
Q_Q(HbInputPredictionHandler);
- if (mShowTooltip && mBestGuessLocation > 0 && mCandidates->at(0).mid(0, mEngine->inputLength()) \
+ if (mShowTooltip && mBestGuessLocation > 0 && mCandidates->count() > 0
+ && mCandidates->at(0).mid(0, mEngine->inputLength()) \
!= mCandidates->at(mBestGuessLocation).mid(0, mEngine->inputLength())) {
q->processExactWord(mCandidates->at(0));
} else {
@@ -222,7 +225,14 @@
QBrush brush(col);
QTextCharFormat gray;
gray.setForeground(brush);
- list.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, mEngine->inputLength(), taillength, gray));
+ if((focusedObject->object())->inherits("QGraphicsWebView") || (focusedObject->object())->inherits("QWebView")) {
+ //QGraphicsWebView does not handle partial input length formatting well. Causes crash, a temporary fix provided,
+ //This makes the whole text field grey insted of just the auto-completion part. Anyways, it does not cause crash.
+ //This should be treated as a work around till QGraphicsWebView is fixed.
+ 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));
QInputMethodEvent event(mCandidates->at(mBestGuessLocation), list);
focusedObject->sendEvent(event);
@@ -252,7 +262,8 @@
HbInputFocusObject* focusObject = 0;
focusObject = mInputMethod->focusObject();
//If the focused object is NULL or the key event is improper, can not continue
- if(!focusObject || (event->key()<0)) {
+ if(!focusObject || event->key() < 0 ||
+ event->key() == HbInputButton::ButtonKeyCodeCustom) {
return false;
}
@@ -425,7 +436,7 @@
//Remove the "?" mark
(*mCandidates)[mBestGuessLocation].chop(1);
updateEditor();
- q->processCustomWord((*mCandidates)[mBestGuessLocation]);
+ q->launchSpellQueryDialog();
mCanContinuePrediction = true;
} else {
@@ -601,6 +612,17 @@
}
}
+void HbInputPredictionHandlerPrivate::setPreEditTextToEditor(QString string)
+{
+ //update the editor with pre-edit text
+ mEngine->setWord(string);
+ bool used = false;
+ mEngine->updateCandidates(mBestGuessLocation, used);
+ mTailShowing = true;
+ updateEditor();
+
+}
+
HbInputPredictionHandler::HbInputPredictionHandler(HbInputPredictionHandlerPrivate &dd, HbInputAbstractMethod* inputMethod)
:HbInputModeHandler(dd, inputMethod)
{
@@ -631,7 +653,9 @@
Q_D(HbInputPredictionHandler);
bool ret = true;
switch (action) {
- case HbInputModeActionReset: {
+ case HbInputModeActionReset:
+ case HbInputModeActionCommit:
+ case HbInputModeActionFocusLost: {
//At the moment we are commiting the text with the autocompletion part as it needs to be committed on clicking outside the editor.
//TO DO : When We back to the application by pressing Application key the inline word should not commit and remain in the inline editing
//d->mShowTail = false;
@@ -639,17 +663,6 @@
d->reset();
}
break;
- case HbInputModeActionFocusLost: {
- // if focus lost happens and before that if toolitip is available then typing line word should be committed in the editor
- // if tooltip and autocompletion part is available then typing line word should be committed in the editor along with the autocompletion part
- // Focus change should commit the auto-completed part as well.
- d->commit();
- }
- break;
- case HbInputModeActionCommit: {
- d->commit();
- }
- break;
case HbInputModeActionDeleteAndCommit: {
deleteOneCharacter();
d->commit();
@@ -694,9 +707,12 @@
case HbInputModeActionHideTail:
d->mShowTail = false;
break;
+ case HbInputModeActionCloseSpellQuery:
+ closeSpellQueryDialog();
+ break;
default:
ret = HbInputModeHandler::actionHandler(action);
- break;
+ break;
}
return ret;
@@ -813,14 +829,78 @@
Q_UNUSED(exactWord);
}
-void HbInputPredictionHandler::processCustomWord(QString customWord)
-{
- Q_UNUSED(customWord);
-}
-
void HbInputPredictionHandler::showExactWordPopupIfNeeded()
{
Q_D(HbInputPredictionHandler);
d->showExactWordPopupIfNeeded();
}
+
+// Launch spell query dialog in responce to launchSpellQueryDialog signal
+void HbInputPredictionHandler::launchSpellQueryDialog()
+{
+ Q_D(HbInputPredictionHandler);
+ HbInputFocusObject *focusedObject = d->mInputMethod->focusObject();
+ if(!focusedObject) {
+ return;
+ }
+
+ // As of now we need to delete and create mSpellQueryDialog every time
+ // we launch it. If we launch the same dialog, keypad does not open sometimes.
+ // Will take sometime to find out the root cause of this, and will fix this.
+ if(d->mSpellQueryDialog) {
+ delete d->mSpellQueryDialog;
+ d->mSpellQueryDialog =0;
+ }
+ if(!d->mSpellQueryDialog) {
+ d->mSpellQueryDialog = new HbInputSpellQuery(d->mInputMethod,this);
+ d->mSpellQueryDialog->setParent(this);
+ }
+
+ QString string;
+ if(d->mCandidates && (*(d->mCandidates)).size() >= d->mBestGuessLocation + 1) {
+ string = (*(d->mCandidates))[d->mBestGuessLocation].left(d->mEngine->inputLength());
+ }
+ d->reset();
+ d->mSpellQueryDialog->launch(string);
+
+}
+
+// To force the spell query dialog to close.
+void HbInputPredictionHandler::closeSpellQueryDialog()
+{
+ Q_D(HbInputPredictionHandler);
+ if (d->mSpellQueryDialog && d->mSpellQueryDialog->isVisible()) {
+ d->mSpellQueryDialog->close();
+ }
+}
+
+//
+void HbInputPredictionHandler::spellQueryDialogClosed(QObject *savedFocusObject,bool isOk,QString string)
+{
+ Q_D(HbInputPredictionHandler);
+
+ // set the focus back to the editor which caused the launch of spell dialog.
+ if(savedFocusObject) {
+ HbInputFocusObject *newFocusObject = new HbInputFocusObject(savedFocusObject);
+ newFocusObject->releaseFocus();
+ newFocusObject->setFocus();
+ HbAbstractEdit *abstractEdit = qobject_cast<HbAbstractEdit*>(savedFocusObject);
+ if(abstractEdit) {
+ abstractEdit->setCursorPosition(abstractEdit->cursorPosition());
+ }
+ d->mInputMethod->setFocusObject(newFocusObject);
+ }
+
+ if (isOk) {
+ d->commit(string,true);
+ } else {
+ //update the editor with pre-edit text
+ d->setPreEditTextToEditor(string);
+ // This update is need for below usecase
+ // Editor is empty => enter some data till their is no match => click on word
+ // to lauch spell query => now press cancel => testcase of keypad is uppercase,
+ // but it should be lower case
+ d->mInputMethod->updateState();
+ }
+}
// EOF
--- a/src/hbplugins/inputmethods/common/hbinputpredictionhandler_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputpredictionhandler_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -28,6 +28,7 @@
#include "hbinputmodehandler_p.h"
class HbPredictionEngine;
+class HbInputSpellQuery;
QT_BEGIN_NAMESPACE
class QStringList;
class QInputMethodEvent;
@@ -56,6 +57,7 @@
void handleEmptyCandidateList();
void showExactWordPopupIfNeeded();
QList<HbKeyPressProbability> probableKeypresses();
+ void setPreEditTextToEditor(QString string);
public:
HbPredictionEngine *mEngine;
QStringList *mCandidates;
@@ -66,6 +68,7 @@
bool mCanContinuePrediction;
bool mShowTooltip;
Qt::KeyboardModifiers mModifiers;
+ HbInputSpellQuery *mSpellQueryDialog;
public:
void updateEditor();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/common/hbinputspellquerydialog.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,145 @@
+/****************************************************************************
+**
+** 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 HbPlugins 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 <QTimer>
+#include <QGraphicsScene>
+#include <hbinputmethod.h>
+#include <hbinputkeymapfactory.h>
+#include <hbinputpredictionengine.h>
+#include <hbinputsettingproxy.h>
+#include <hbinputvirtualkeyboard.h>
+#include <hbinputvkbhost.h>
+#include <hbaction.h>
+#include <hbmainwindow.h>
+#include <hbinstance.h>
+#include <hbeffect.h>
+#include <hbinputregioncollector_p.h>
+
+#include "hbinputspellquerydialog.h"
+#include "hbinputmodehandler.h"
+
+#define MAXUDBWORDSIZE 64
+
+HbInputSpellQuery::HbInputSpellQuery(HbInputMethod *inputMethod, HbInputPredictionHandler *predictionHandler)
+ : mOwner(inputMethod), mPredictionHandler(predictionHandler), mPrimaryAction(0)
+{
+ setInputMode(HbInputDialog::TextInput);
+ setPromptText(tr("Word:"));
+ setActive(true);
+ HbInputRegionCollector::instance()->attach(this);
+}
+
+HbInputSpellQuery::~HbInputSpellQuery()
+{
+}
+
+void HbInputSpellQuery::launch(QString editorText)
+{
+ HbInputFocusObject *focusObject = 0;
+ if (!mOwner || !(focusObject = mOwner->focusObject())) {
+ return;
+ }
+ mSavedState = mOwner->inputState();
+ // close the keypad before showing the spell dialog
+ HbVkbHost *vkbHost = focusObject->editorInterface().vkbHost();
+ if (vkbHost && vkbHost->keypadStatus() != HbVkbHost::HbVkbStatusClosed) {
+ vkbHost->closeKeypad();
+ }
+
+ setValue(QVariant(editorText));
+
+ // set the spell dialog position
+ QPointF newPos((qreal)HbDeviceProfile::current().logicalSize().width() * 0.5,
+ (qreal)HbDeviceProfile::current().logicalSize().height() * 0.5);
+ if (vkbHost) {
+ newPos.setY(((qreal)HbDeviceProfile::current().logicalSize().height() -
+ vkbHost->activeKeypad()->preferredKeyboardSize().height()) * 0.5);
+ }
+ setPreferredPos(newPos, HbPopup::Center);
+
+ // change the focus to spell dialog editor
+ HbLineEdit *spellEdit = lineEdit();
+ if (spellEdit) {
+ spellEdit->setMaxLength(MAXUDBWORDSIZE);
+ spellEdit->setSmileysEnabled(false);
+ HbEditorInterface eInt(spellEdit);
+ // we don't want prediction and automatic textcase in spell query dialog
+ spellEdit->setInputMethodHints(spellEdit->inputMethodHints() | Qt::ImhNoPredictiveText | Qt::ImhNoAutoUppercase);
+ eInt.setLastFocusedState(mSavedState);
+ spellEdit->setFocus();
+ }
+ // execute the spell dialog
+ mSavedFocusObject = focusObject->object();
+ mSavedEditorText = editorText;
+ mDidHandleFinish = false;
+ mainWindow()->setProperty("SpellQueryLaunched", true);
+ open(this,SLOT(dialogClosed(HbAction*)));
+ mPrimaryAction = qobject_cast<HbAction*>(actions().first());
+}
+
+void HbInputSpellQuery::dialogClosed(HbAction* action)
+{
+ mainWindow()->setProperty("SpellQueryLaunched", false);
+ //There are multiple dialog closed event received. This will make sure we handle finish
+ //only once
+ if(mDidHandleFinish) {
+ return;
+ } else {
+ mDidHandleFinish = true;
+ }
+
+ bool isOk = false;
+ bool isCancel = false;
+ bool isExternalClose = false;
+ // action is null when input query is closed externally , for example by calling
+ // HbDialog::close() function.
+ if (action) {
+ isOk = mPrimaryAction == action ? true : false;
+ isCancel = mPrimaryAction != action ? true : false;
+ } else {
+ isExternalClose = true;
+ }
+
+ //Need to disable effects as asynchronous hide will commit the word otherwise.
+ HbEffect::disable(this);
+ hide();
+ HbEffect::enable(this);
+
+ QString string = mSavedEditorText;
+ bool status = false;
+ if (isOk) {
+ string = value().toString();
+ status = true;
+ } else if (isCancel) {
+ status = false;
+ } else if (isExternalClose) {
+ status = true;
+ }
+ mPredictionHandler->spellQueryDialogClosed(mSavedFocusObject,status,string);
+ mSavedFocusObject = 0;
+ mSavedEditorText.clear();
+ mPrimaryAction = 0;
+}
+
+// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/common/hbinputspellquerydialog.h Fri Jun 11 13:58:22 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 HbPlugins 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_SPELL_QUERY_H
+#define HB_INPUT_SPELL_QUERY_H
+
+#include <hbinputstate.h>
+#include <hbinputdialog.h>
+
+class HbAction;
+class HbInputMethod;
+class HbInputPredictionHandler;
+
+class HbInputSpellQuery : public HbInputDialog
+{
+ Q_OBJECT
+public:
+ HbInputSpellQuery(HbInputMethod *mOwner,HbInputPredictionHandler *predictionHandler);
+ ~HbInputSpellQuery();
+ void launch(QString editorText);
+public slots:
+ void dialogClosed(HbAction* action);
+private:
+ HbInputState mSavedState;
+ bool mDidHandleFinish;
+ QString mSavedEditorText;
+ QPointer<HbInputMethod> mOwner;
+ QPointer<HbInputPredictionHandler> mPredictionHandler;
+ HbAction *mPrimaryAction;
+ QObject *mSavedFocusObject;
+};
+
+#endif // HB_INPUT_SPELL_QUERY_H
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/hbim/hbim.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,139 @@
+/****************************************************************************
+**
+** 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 HbPlugins 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 "hbim.h"
+
+#include <private/hbmainwindow_p.h>
+#include <hbinputmethod.h>
+#include <hbinputmethod_p.h>
+
+bool HbInputInitializer::mRecursive = false;
+// ---------------------------------------------------------------------------
+// HbInputInitializer::HbInputInitializer
+//
+// Constructs HbInputInitializer
+// ---------------------------------------------------------------------------
+//
+HbInputInitializer::HbInputInitializer(QObject *parent)
+ : QInputContextPlugin(parent)
+{
+}
+
+// ---------------------------------------------------------------------------
+// HbInputInitializer::~HbInputInitializer
+//
+// ---------------------------------------------------------------------------
+//
+HbInputInitializer::~HbInputInitializer()
+{
+}
+
+// ---------------------------------------------------------------------------
+// Virtual12KeyImpl::create
+//
+// ---------------------------------------------------------------------------
+//
+QInputContext* HbInputInitializer::create(const QString& key)
+{
+ if (key == QString("hbim")) {
+ // this function is called from Qt framework's QApplication::inputContext()
+ // now if inside this function or any function which is called from this function.
+ // calls QApplication::inputContext() it will result in infinite recursion.
+ // to guard this we are using this with mRecursive.
+ // also setting HbMainWindowPrivate::initializeInputs to false will avoid
+ // re-initialization of inputfw when HbMainWindow is launched.
+ if (!mRecursive) {
+ HbMainWindowPrivate::initializeInputs = false;
+ mRecursive = true;
+ HbInputMethod::initializeFramework(*qApp);
+ QInputContext *ic = qApp->inputContext();
+ mRecursive = false;
+ return ic;
+ } else {
+ // it was a recursive call, so for clarity return 0 from here.
+ // this function is called only when QApplicaion's inputContext is null.
+ // so returning a null for a recursive call.
+ return 0;
+ }
+ }
+ return 0;
+}
+
+// ---------------------------------------------------------------------------
+// HbInputInitializer::description
+//
+// ---------------------------------------------------------------------------
+//
+QString HbInputInitializer::description(const QString& key)
+{
+ if (key == QString("hbim")) {
+ return QString("Hb Input Initialization");
+ } else {
+ return QString("");
+ }
+}
+
+// ---------------------------------------------------------------------------
+// HbInputInitializer::displayName
+//
+// ---------------------------------------------------------------------------
+//
+QString HbInputInitializer::displayName(const QString& key)
+{
+ if (key == QString("hbim")) {
+ return QString("Hb Input Initialization");
+ } else {
+ return QString("");
+ }
+}
+
+// ---------------------------------------------------------------------------
+// HbInputInitializer::keys
+//
+// ---------------------------------------------------------------------------
+//
+QStringList HbInputInitializer::keys() const
+{
+ QStringList keys;
+ keys.append(QString("hbim"));
+ return keys;
+}
+
+// ---------------------------------------------------------------------------
+// HbInputInitializer::languages
+//
+// ---------------------------------------------------------------------------
+//
+QStringList HbInputInitializer::languages(const QString& /*key*/)
+{
+ return QStringList();
+}
+
+//
+// Make plugin loadable.
+//
+Q_EXPORT_PLUGIN2(OrbitInputInit, HbInputInitializer)
+
+// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/hbim/hbim.h Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** 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 HbPlugins 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_IM
+#define HB_IM
+
+#include <QInputContextPlugin>
+
+class HbInputInitializer : public QInputContextPlugin
+{
+ Q_OBJECT
+
+public:
+ HbInputInitializer(QObject *parent = 0);
+ ~HbInputInitializer();
+
+public:
+ QInputContext *create(const QString& key);
+ QString description(const QString& key);
+ QString displayName(const QString& key);
+ QStringList keys() const;
+ QStringList languages(const QString& key);
+private:
+ static bool mRecursive;
+};
+
+#endif //HB_IM
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/hbim/hbim.pro Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,50 @@
+#
+#############################################################################
+##
+## Copyright (C) 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 = lib
+TARGET = $$hbLibraryTarget(HbIm)
+CONFIG += plugin
+
+hbAddLibrary(hbcore/HbCore)
+
+SOURCES += hbim.cpp
+HEADERS += hbim.h
+
+symbian {
+ TARGET.EPOCALLOWDLLDATA = 1
+ TARGET.CAPABILITY = CAP_GENERAL_DLL
+ TARGET.UID3 = 0x2002EACD
+
+ pluginstub.sources = HbIm.dll
+ pluginstub.path = /resource/qt/plugins/inputmethods
+ DEPLOYMENT += pluginstub
+}
+
+target.path = $$[QT_INSTALL_PLUGINS]/inputmethods
+INSTALLS += target
+
+include($${HB_SOURCE_DIR}/src/hbcommon.pri)
--- a/src/hbplugins/inputmethods/inputmethods.pro Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/inputmethods/inputmethods.pro Fri Jun 11 13:58:22 2010 +0300
@@ -27,6 +27,7 @@
TEMPLATE = subdirs
SUBDIRS += touchinput
+SUBDIRS += hbim
# SUBDIRS += hardwareinput
include($${HB_SOURCE_DIR}/src/hbcommon.pri)
--- a/src/hbplugins/inputmethods/touchinput/hbinput12keytouchkeyboard.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinput12keytouchkeyboard.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -195,7 +195,7 @@
QChar numChr;
const HbKeyboardMap *keyboardMap = mKeymap->keyboard(HbKeyboardVirtual12Key);
if (keyboardMap && key < keyboardMap->keys.count()) {
- numChr = HbInputUtils::findFirstNumberCharacterBoundToKey(keyboardMap->keys.at(key), mKeymap->language());
+ numChr = numberCharacterBoundToKey(key);
}
if (numChr > 0) {
@@ -214,7 +214,7 @@
const HbKeyboardMap *keyboardMap = mKeymap->keyboard(HbKeyboardVirtual12Key);
if (keyboardMap && key < keyboardMap->keys.count()) {
keydata = keyboardMap->keys.at(key)->characters(mModifiers);
- numChr = HbInputUtils::findFirstNumberCharacterBoundToKey(keyboardMap->keys.at(key), mKeymap->language());
+ numChr = numberCharacterBoundToKey(key);
}
QString title("");
@@ -226,7 +226,7 @@
title.append(keydata.left(numberOfCharactersToShow(key)));
}
- if (numChr == QChar('0')) {
+ if (key == 9 && numChr == numberCharacterBoundToKey(key)) {
item->setText(numChr, HbInputButton::ButtonTextIndexPrimary);
item->setIcon(HbIcon(HbInputButtonIconSpace2), HbInputButton::ButtonIconIndexSecondaryFirstRow);
// Set space as secondaty text so that the layout is correct if icon is not found. This can be removed when
--- a/src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -170,12 +170,12 @@
return false;
}
mDownKey = 0;
- if (mLongPressHappened){
+ if ( mLongPressHappened ){
mLongPressHappened = false;
return false;
}
- if (mTimer->isActive() && mLastKey != buttonId) {
+ if(mTimer->isActive() && mLastKey != buttonId) {
mNumChr = 0;
// For QLineEdit it works fine. For HbLineEdit, need to set the state
@@ -198,7 +198,7 @@
return true;
} else if (buttonId == HbInputButton::ButtonKeyCodeShift) {
// single tap of shift key toggles prediction status in case insensitive languages
- // The Editor should not be Web or URL which allows only Latin Alphabet
+ // The Editor should not be Web or URL which allows only Latin Alphabet
if (!HbInputSettingProxy::instance()->globalInputLanguage().isCaseSensitiveLanguage() &&
((HbEditorConstraintLatinAlphabetOnly | HbEditorConstraintAutoCompletingField)!=focusObject->editorInterface().inputConstraints()) &&
// when the language does not support prediction in that case we should not update the state and prediction
@@ -218,7 +218,8 @@
// (the case was changed on the single tap)
updateTextCase();
// when the language does not support prediction in that case we should not update the state and prediction
- if(HbPredictionFactory::instance()->predictionEngineForLanguage(mInputMethod->inputState().language())) {
+ if(HbPredictionFactory::instance()->predictionEngineForLanguage(mInputMethod->inputState().language()) &&
+ mInputMethod->focusObject()->editorInterface().isPredictionAllowed()) {
q->togglePrediction();
}
} else {
--- a/src/hbplugins/inputmethods/touchinput/hbinputbasic12keythaihandler.cpp Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +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 HbPlugins 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 "virtual12key.h"
-#include <QTimer>
-#include <hbinputbutton.h>
-#include "hbinputbasic12keythaihandler.h"
-#include "hbinputbasic12keyhandler_p.h"
-
-class HbInputBasic12KeyThaiHandlerPrivate: public HbInputBasic12KeyHandlerPrivate
-{
- Q_DECLARE_PUBLIC(HbInputBasic12KeyThaiHandler)
-
-public:
- HbInputBasic12KeyThaiHandlerPrivate();
- ~HbInputBasic12KeyThaiHandlerPrivate();
-
- void showThaiSpecialCharacters();
- bool buttonPressed(const QKeyEvent *keyEvent);
- bool buttonReleased(const QKeyEvent *keyEvent);
-};
-
-HbInputBasic12KeyThaiHandlerPrivate::HbInputBasic12KeyThaiHandlerPrivate()
-{
-
-}
-
-HbInputBasic12KeyThaiHandlerPrivate::~HbInputBasic12KeyThaiHandlerPrivate()
-{
-
-}
-
-/*!
-Handles the key press events from the VKB.
-*/
-bool HbInputBasic12KeyThaiHandlerPrivate::buttonPressed(const QKeyEvent *keyEvent)
-{
- if (keyEvent->isAutoRepeat() && mDownKey == keyEvent->key() &&
- mDownKey == HbInputButton::ButtonKeyCodeAsterisk) {
- //For Thai Language Launch Special Characters popup
- mInputMethod->showThaiSpecialCharacters(mDownKey);
- mTimer->stop();
- mLongPressHappened = true;
- mDownKey = 0;
- return true;
- } else {
- return HbInputBasic12KeyHandlerPrivate::buttonPressed(keyEvent);
- }
- return false;
-}
-
-/*!
-Handles the key release events from the VKB. Launches Thai special popup with key release event of
-asterisk and shift key.
-*/
-bool HbInputBasic12KeyThaiHandlerPrivate::buttonReleased(const QKeyEvent *keyEvent)
-{
- Q_UNUSED(keyEvent);
- HbInputVkbWidget::HbFlickDirection flickDir = static_cast<HbVirtual12Key*>(mInputMethod)->flickDirection();
- if (mInputMethod && flickDir!=HbInputVkbWidget::HbFlickDirectionDown) {
- int buttonId = keyEvent->key();
- HbInputFocusObject *focusObject = 0;
- focusObject = mInputMethod->focusObject();
- if (!focusObject || !mDownKey) {
- return false;
- }
- if (mLongPressHappened) {
- mLongPressHappened = false;
- return false;
- }
- //Handle if Shift and Asterisk key release happen or else let's pass it to base class to handle
- if (buttonId == Qt::Key_Shift) {
- //For Thai Language Launch Special Characters popup
- mInputMethod->showThaiSpecialCharacters(buttonId);
- mLastKey = buttonId;
- mCurrentChar = 0;
- mDownKey = 0;
- return true;
- } else if (buttonId == Qt::Key_Asterisk && !mInputMethod->isSctModeActive()) {
- //For Thai Language Launch Special Characters popup
- mInputMethod->showThaiSpecialCharacters(buttonId);
- mLastKey = buttonId;
- mCurrentChar = 0;
- mDownKey = 0;
- return true;
- } else {
- HbInputBasic12KeyHandlerPrivate::buttonReleased(keyEvent);
- }
- }
- return false;
-}
-
-HbInputBasic12KeyThaiHandler::HbInputBasic12KeyThaiHandler(HbInputAbstractMethod* inputMethod)
-:HbInputBasic12KeyHandler(*new HbInputBasic12KeyThaiHandlerPrivate, inputMethod)
-{
- Q_D(HbInputBasic12KeyThaiHandler);
- d->q_ptr = this;
-}
-
-HbInputBasic12KeyThaiHandler::~HbInputBasic12KeyThaiHandler()
-{
-}
-
-/*!
- filterEvent function for handling different keyevents.
-*/
-bool HbInputBasic12KeyThaiHandler::filterEvent(const QKeyEvent * event)
-{
- Q_D(HbInputBasic12KeyThaiHandler);
-
- if (event->type() == QEvent::KeyRelease) {
- return d->buttonReleased(event);
- } else {
- return d->buttonPressed(event);
- }
-}
-
-//End of file
-
--- a/src/hbplugins/inputmethods/touchinput/hbinputbasic12keythaihandler.h Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +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 HbPlugins 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_BASIC_12KEY_THAI_HANDLER
-#define HB_INPUT_BASIC_12KEY_THAI_HANDLER
-
-#include "hbinputbasic12keyhandler.h"
-
-class HbInputBasic12KeyThaiHandlerPrivate;
-class HbInputBasic12KeyThaiHandler: public HbInputBasic12KeyHandler
-{
- Q_OBJECT
-public:
- HbInputBasic12KeyThaiHandler(HbInputAbstractMethod* inputMethod);
- ~HbInputBasic12KeyThaiHandler();
-
- bool filterEvent(const QKeyEvent * event);
-
-private:
- Q_DECLARE_PRIVATE_D(d_ptr, HbInputBasic12KeyThaiHandler)
- Q_DISABLE_COPY(HbInputBasic12KeyThaiHandler)
-};
-
-#endif //HB_INPUT_BASIC_12KEY_THAI_HANDLER
-
--- a/src/hbplugins/inputmethods/touchinput/hbinputbasicqwertyhandler.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputbasicqwertyhandler.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -210,7 +210,8 @@
return true;
}
- if (event->key() == HbInputButton::ButtonKeyCodeDelete || event->key() == Qt::Key_Backspace) {
+ if (event->key() == HbInputButton::ButtonKeyCodeDelete || event->key() == Qt::Key_Backspace ||
+ event->key() == HbInputButton::ButtonKeyCodeCustom) {
return false;
}
--- a/src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -47,169 +47,22 @@
#define HbDeltaHeight 3.0
#define MAXUDBWORDSIZE 64
-HbInputSpellQuery::HbInputSpellQuery(HbInputPrediction12KeyHandlerPrivate *owner) : mOwner(owner), mPrimaryAction(0)
-{
-}
-
-void HbInputSpellQuery::launch(QString editorText)
-{
- HbInputFocusObject *focusObject = mOwner->mInputMethod->focusObject();
- if (!focusObject) {
- return;
- }
- mSavedState = mOwner->mInputMethod->inputState();
- mOwner->mEngine->clear();
- mOwner->mCanContinuePrediction = true;
- // close the keypad before showing the spell dialog
- HbVkbHost *vkbHost = focusObject->editorInterface().vkbHost();
- if (vkbHost && vkbHost->keypadStatus() != HbVkbHost::HbVkbStatusClosed) {
- vkbHost->closeKeypad();
- }
- setInputMode(HbInputDialog::TextInput);
- setPromptText(tr("Spell:"));
- setValue(QVariant(editorText));
-
- //set the spell dialog position
- QSizeF newSize;
- QPointF newPos;
- QRectF newGeometry;
- getPositionAndSize(newPos, newSize, newGeometry);
- newGeometry.setHeight(newSize.height());
- newGeometry.setWidth(newSize.width());
- setGeometry(newGeometry);
- setPos(newPos);
-
- // change the focus to spell dialog editor
- HbLineEdit *spellEdit = lineEdit();
- if (spellEdit) {
- spellEdit->setMaxLength(MAXUDBWORDSIZE);
- spellEdit->setSmileysEnabled(false);
- HbEditorInterface eInt(spellEdit);
- // we don't want prediction and automatic textcase in spell query dialog
- spellEdit->setInputMethodHints(spellEdit->inputMethodHints() | Qt::ImhNoPredictiveText | Qt::ImhNoAutoUppercase);
- eInt.setLastFocusedState(mSavedState);
- spellEdit->setFocus();
- }
-
- // execute the spell dialog
- mSavedFocusObject = focusObject->object();
- mSavedEditorText = editorText;
- //setAttribute(Qt::WA_DeleteOnClose);
- mDidHandleFinish = false;
- open(this,SLOT(dialogClosed(HbAction*)));
- mPrimaryAction = qobject_cast<HbAction*>(actions().first());
-}
-
-void HbInputSpellQuery::dialogClosed(HbAction* action)
-{
- //There are multiple dialog closed event received. This will make sure we handle finish
- //only once
- if(mDidHandleFinish) {
- return;
- } else {
- mDidHandleFinish = true;
- }
-
- bool isOk = false;
- bool isCancel = false;
- bool isExternalClose = false;
- // action is null when input query is closed externally , for example by calling
- // HbDialog::close() function.
- if (action) {
- isOk = mPrimaryAction == action ? true : false;
- isCancel = mPrimaryAction != action ? true : false;
- } else {
- isExternalClose = true;
- }
-
- //Need to disable effects as asynchronous hide will commit the word otherwise.
- HbEffect::disable(this);
- hide();
- HbEffect::enable(this);
-
- HbInputFocusObject *newFocusObject = new HbInputFocusObject(mSavedFocusObject);
- newFocusObject->releaseFocus();
- newFocusObject->setFocus();
-
- HbAbstractEdit *abstractEdit = qobject_cast<HbAbstractEdit*>(mSavedFocusObject);
-
- if(abstractEdit) {
- abstractEdit->setCursorPosition(abstractEdit->cursorPosition());
- }
-
- mOwner->mInputMethod->setFocusObject(newFocusObject);
- mOwner->mInputMethod->focusObject()->editorInterface().setTextCase(mSavedState.textCase());
-
- if (isOk) {
- mOwner->commit(value().toString(), true, true);
- } else if (isCancel) {
- //update the editor with pre-edit text
- mOwner->mEngine->setWord(mSavedEditorText);
- bool used = false;
- mOwner->mEngine->updateCandidates(mOwner->mBestGuessLocation, used);
- mOwner->mShowTail = false;
- mOwner->updateEditor();
- } else if (isExternalClose) {
- mOwner->commit(mSavedEditorText, true, true);
- }
-
- mSavedEditorText.clear();
-}
-
-void HbInputSpellQuery::getPositionAndSize(QPointF &pos,QSizeF &size, QRectF &geom)
-{
- pos = HbInputDialog::pos();
- size = HbInputDialog::size();
- geom = HbInputDialog::geometry();
-
- QRectF cursorRect = mOwner->mInputMethod->focusObject()->microFocus(); // from the top of the screen
- pos = QPointF(cursorRect.bottomLeft().x(),cursorRect.bottomLeft().y());
- qreal heightOfTitlebar = 80.0; // Using magic number for now...
- qreal screenHeight = (qreal)HbDeviceProfile::current().logicalSize().height();
-
- if( ((screenHeight - cursorRect.bottomLeft().y()) > (cursorRect.y() - heightOfTitlebar))
- || ((screenHeight - cursorRect.bottomLeft().y() + HbDeltaHeight ) > geom.height()) ) {
- // this means there is amore space below inline text than at the top or we can fit spell Dialog
- // below inline text
- pos.setY(cursorRect.bottomLeft().y() + HbDeltaHeight);
- size.setHeight(screenHeight - pos.y());
- } else {
- // this means there is amore space above inline text than below it
- pos.setY(cursorRect.y() - geom.height() - HbDeltaHeight);
- if (pos.y() < heightOfTitlebar) {
- // this means that spell dialog can not be fit in from top of inline text, we need to trim it
- pos.setY(heightOfTitlebar);
- }
- size.setHeight(cursorRect.y() - heightOfTitlebar - HbDeltaHeight);
- }
- if ( size.height() > geom.height()) {
- size.setHeight(geom.height());
- }
- if ((pos.x() + size.width()) > (qreal)HbDeviceProfile::current().logicalSize().width()) {
- // can not fit spell dialog to the right side of inline edit text.
- pos.setX((qreal)HbDeviceProfile::current().logicalSize().width()- size.width());
- }
-}
-
HbInputPrediction12KeyHandlerPrivate::HbInputPrediction12KeyHandlerPrivate()
:mLastKey(0),
mButtonDown(false),
mCurrentChar(0),
mLongPressHappened(false),
-mShiftKeyDoubleTap(false),
-mInputSpellQuery(NULL)
+mShiftKeyDoubleTap(false)
{
}
HbInputPrediction12KeyHandlerPrivate::~HbInputPrediction12KeyHandlerPrivate()
{
- delete mInputSpellQuery;
- mInputSpellQuery = 0;
}
void HbInputPrediction12KeyHandlerPrivate::chopQMarkAndUpdateEditor()
{
- if(!mCanContinuePrediction && (*mCandidates)[mBestGuessLocation].endsWith('?')) {
+ if(!mCanContinuePrediction && (*mCandidates)[mBestGuessLocation].endsWith('?')) {
(*mCandidates)[mBestGuessLocation].chop(1);
updateEditor();
mCanContinuePrediction = true;
@@ -230,13 +83,10 @@
if (keyEvent->isAutoRepeat() && mLastKey == buttonId) {
if (buttonId == HbInputButton::ButtonKeyCodeAsterisk) {
- if (!mCanContinuePrediction) {
- mInputMethod->switchMode(buttonId);
- } else {
- //Remove the "?" mark if present
- chopQMarkAndUpdateEditor();
- mInputMethod->selectSpecialCharacterTableMode();
- }
+ //Remove the "?" mark if present
+ chopQMarkAndUpdateEditor();
+ q->actionHandler(HbInputModeHandler::HbInputModeActionCommit);
+ mInputMethod->selectSpecialCharacterTableMode();
mLongPressHappened = true;
} else if (buttonId == HbInputButton::ButtonKeyCodeShift) {
mInputMethod->switchMode(HbInputButton::ButtonKeyCodeShift);
@@ -257,10 +107,10 @@
deleteOneCharacter();
mLongPressHappened = true;
}
- if (buttonId != HbInputButton::ButtonKeyCodeDelete) {
- q->commitFirstMappedNumber(buttonId, mInputMethod->currentKeyboardType());
+ if (buttonId != HbInputButton::ButtonKeyCodeDelete) {
+ q->commitFirstMappedNumber(buttonId, mInputMethod->currentKeyboardType());
mLongPressHappened = true;
- }
+ }
}
if (mLongPressHappened) {
@@ -269,7 +119,7 @@
}
}
- if (buttonId == HbInputButton::ButtonKeyCodeShift) {
+ if (buttonId == HbInputButton::ButtonKeyCodeShift) {
// if we get a second consequtive shift key press,
// we want to handle it in buttonRelease
if (mTimer->isActive() && (mLastKey == buttonId)){
@@ -309,23 +159,23 @@
return true;
}
/* Behavior of Short Press of Asterisk Key when in inline editing state
- - Should launch Candidate List if we can continue with prediction i.e. "?" is not displayed
- - Should launch Spell Query Dialog if we cannot continue with prediction
- - Behavior of Short Press of Asterisk Key when not in inline editing state
- - Should launch SCT
- */
+ - Should launch Candidate List if we can continue with prediction i.e. "?" is not displayed
+ - Should launch Spell Query Dialog if we cannot continue with prediction
+ - Behavior of Short Press of Asterisk Key when not in inline editing state
+ - Should launch SCT
+ */
else if (buttonId == HbInputButton::ButtonKeyCodeAsterisk ) {
- if(!mCanContinuePrediction && (*mCandidates)[mBestGuessLocation].endsWith('?')) {
+ if(!mCanContinuePrediction && (*mCandidates)[mBestGuessLocation].endsWith('?')) {
//Remove the "?" mark
(*mCandidates)[mBestGuessLocation].chop(1);
updateEditor();
- q->processCustomWord((*mCandidates)[mBestGuessLocation]);
+ q->launchSpellQueryDialog();
mCanContinuePrediction = true;
- }
- else
- mInputMethod->starKeySelected();
+ } else {
+ mInputMethod->starKeySelected();
+ }
return true;
- }
+ }
else if (buttonId == HbInputButton::ButtonKeyCodeEnter) {
mInputMethod->closeKeypad();
return true;
@@ -336,14 +186,14 @@
HbInputSettingProxy::instance()->togglePrediction();
} else {
if (mShiftKeyDoubleTap) {
- mTimer->stop();
- mShiftKeyDoubleTap = false;
- //mShowTail = false;
+ mTimer->stop();
+ mShiftKeyDoubleTap = false;
+ //mShowTail = false;
if (HbInputSettingProxy::instance()->globalInputLanguage()== mInputMethod->inputState().language()) {
// 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();
+ updateTextCase();
q->togglePrediction();
} else {
// if the global language is different from the input mode language, we should
@@ -352,7 +202,7 @@
// to chinese input mode from latin input mode
HbInputState rootState;
mInputMethod->editorRootState(rootState);
- mInputMethod->activateState(rootState);
+ mInputMethod->activateState(rootState);
}
} else {
updateTextCase();
@@ -370,7 +220,7 @@
return true;
}
- // text input happens on button release
+ // text input happens on button release
if (q->HbInputPredictionHandler::filterEvent(keyEvent)) {
return true;
}
@@ -419,7 +269,7 @@
if(!d->mCanContinuePrediction) {
int eventKey = event->key();
switch(eventKey) {
- case Qt::Key_0:
+ case Qt::Key_0:
case HbInputButton::ButtonKeyCodeSpace: {
if(d->mCandidates->size() && focusObject) {
//Remove the "?" mark
@@ -439,11 +289,9 @@
case Qt::Key_Backspace:
case HbInputButton::ButtonKeyCodeDelete:
case HbInputButton::ButtonKeyCodeEnter:
- case HbInputButton::ButtonKeyCodeAsterisk:
+ case HbInputButton::ButtonKeyCodeAsterisk:
case HbInputButton::ButtonKeyCodeControl:
- break;
- /* Behavior for other keys i.e. from key1 to key9 -
- To start the long press timer as we need to handle long press functionality i.e Enter corresponding number mapped to a key */
+ case HbInputButton::ButtonKeyCodeSymbol:
case Qt::Key_1:
case Qt::Key_2:
case Qt::Key_3:
@@ -452,15 +300,8 @@
case Qt::Key_6:
case Qt::Key_7:
case Qt::Key_8:
- case Qt::Key_9: {
- if (event->type() == QEvent::KeyRelease) {
- d->mButtonDown = false;
- } else {
- d->mButtonDown = true;
- d->mLastKey = event->key();
- }
- return true;
- }
+ case Qt::Key_9:
+ break;
//The default behavior for any other key press is just to consume the key event and
//not to do anything.
default: {
@@ -511,11 +352,6 @@
HbInputPredictionHandler::actionHandler(HbInputModeActionSetKeypad);
d->mTimer->stop();
break;
- case HbInputModeActionCloseSpellQuery:
- if (d->mInputSpellQuery) {
- d->mInputSpellQuery->close();
- }
- break;
default:
ret = HbInputPredictionHandler::actionHandler(action);
break;
@@ -545,15 +381,4 @@
return d->mEngine != 0;
}
-void HbInputPrediction12KeyHandler::processCustomWord(QString customWord)
-{
- Q_D(HbInputPrediction12KeyHandler);
- if (customWord.size()) {
- if(!d->mInputSpellQuery) {
- d->mInputSpellQuery = new HbInputSpellQuery(d);
- }
- d->mInputSpellQuery->launch(customWord);
- }
- return;
-}
//EOF
--- a/src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler.h Fri Jun 11 13:58:22 2010 +0300
@@ -38,8 +38,7 @@
bool actionHandler(HbInputModeAction action);
bool filterEvent(const QKeyEvent * event);
bool isActive() const;
- void processCustomWord(QString customWord);
- void mouseHandler(int cursorPosition, QMouseEvent* mouseEvent);
+ void mouseHandler(int cursorPosition, QMouseEvent* mouseEvent);
protected:
HbInputPrediction12KeyHandler(HbInputPrediction12KeyHandlerPrivate &dd, HbInputAbstractMethod* inputMethod);
private:
--- a/src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -32,7 +32,6 @@
#include "hbinputprediction12keyhandler.h"
class HbAction;
-class HbInputSpellQuery;
class HbInputPrediction12KeyHandlerPrivate: public HbInputPredictionHandlerPrivate
{
@@ -52,24 +51,6 @@
QChar mCurrentChar;
bool mLongPressHappened;
bool mShiftKeyDoubleTap;
- HbInputSpellQuery *mInputSpellQuery;
};
-class HbInputSpellQuery : public HbInputDialog
-{
-Q_OBJECT
-public:
- HbInputSpellQuery(HbInputPrediction12KeyHandlerPrivate *owner);
- void getPositionAndSize(QPointF & pos,QSizeF & size, QRectF &geom);
- void launch(QString editorText);
-public slots:
- void dialogClosed(HbAction* action);
-private:
- HbInputState mSavedState;
- bool mDidHandleFinish;
- QPointer<QObject> mSavedFocusObject;
- HbInputPrediction12KeyHandlerPrivate* mOwner;
- QString mSavedEditorText;
- HbAction *mPrimaryAction;
-};
#endif //HB_INPUT_PREDICTION_12KEY_HANDLER_PRIVATE
--- a/src/hbplugins/inputmethods/touchinput/hbinputprediction12keythaihandler.cpp Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,205 +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 HbPlugins 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 <QTimer>
-
-#include <hbinputsettingproxy.h>
-#include <hbinputkeymapfactory.h>
-#include <hbinputpredictionengine.h>
-#include <hbinputbutton.h>
-
-#include "virtual12key.h"
-
-#include "hbinputprediction12keyhandler_p.h"
-#include "hbinputprediction12keythaihandler.h"
-
-class HbInputPrediction12KeyThaiHandlerPrivate: public HbInputPrediction12KeyHandlerPrivate
-{
- Q_DECLARE_PUBLIC(HbInputPrediction12KeyThaiHandler)
-
-public:
- HbInputPrediction12KeyThaiHandlerPrivate();
- ~HbInputPrediction12KeyThaiHandlerPrivate();
-
- bool buttonReleased(const QKeyEvent *keyEvent);
- bool buttonPressed(const QKeyEvent *keyEvent);
-};
-
-HbInputPrediction12KeyThaiHandlerPrivate::HbInputPrediction12KeyThaiHandlerPrivate()
-{
-}
-
-HbInputPrediction12KeyThaiHandlerPrivate::~HbInputPrediction12KeyThaiHandlerPrivate()
-{
-
-}
-
-bool HbInputPrediction12KeyThaiHandlerPrivate::buttonPressed(const QKeyEvent *keyEvent)
-{
- Q_Q(HbInputPrediction12KeyThaiHandler);
-
- mLongPressHappened = false;
- HbInputFocusObject *focusObject = 0;
- focusObject = mInputMethod->focusObject();
- if (!focusObject) {
- return false;
- }
-
- int buttonId = keyEvent->key();
-
- if (keyEvent->isAutoRepeat() && mLastKey == buttonId) {
- if (buttonId == Qt::Key_0) {
- q->actionHandler(HbInputModeHandler::HbInputModeActionCommit);
- q->commitFirstMappedNumber(buttonId, mInputMethod->currentKeyboardType());
- mLongPressHappened = true;
- } else if (buttonId != HbInputButton::ButtonKeyCodeAsterisk) {
- return HbInputPrediction12KeyHandlerPrivate::buttonPressed(keyEvent);
- }
- if (mLongPressHappened) {
- mLastKey = 0;
- return true;
- }
- }
-
- //Pass the event to base class except Shift key
- if (buttonId == Qt::Key_Shift) {
- mLastKey = buttonId;
- mButtonDown = true;
- } else {
- return HbInputPrediction12KeyHandlerPrivate::buttonPressed(keyEvent);
- }
- return false;
-}
-
-/*!
-Handles the key release events from the VKB. Launches the SCT with key release event of
-asterisk.
-*/
-bool HbInputPrediction12KeyThaiHandlerPrivate::buttonReleased(const QKeyEvent *keyEvent)
-{
- Q_Q(HbInputPrediction12KeyHandler);
-
- if(!mButtonDown || mLongPressHappened){
- mLongPressHappened = false;
- return false;
- }
-
- int buttonId = keyEvent->key();
-
- if (buttonId == HbInputButton::ButtonKeyCodeAsterisk && !mInputMethod->isSctModeActive()) {
- //Handle if key Asterisk pressed and SCT is not launched or else pass it to base handlers
- if (q->HbInputPredictionHandler::filterEvent(keyEvent)) {
- mButtonDown = false;
- return true;
- }
- } else if ( buttonId == HbInputButton::ButtonKeyCodeShift ) {
- //As we can't map charatcers to Shift key in keymapping, making use of "#" key i.e. Qt::Key_NumberSign
- //in keymapping and manipulating event to Qt::Key_NumberSign when shift key is pressed
- const QKeyEvent *event = new QKeyEvent(QEvent::KeyPress, Qt::Key_NumberSign, Qt::NoModifier);
- if (q->HbInputPredictionHandler::filterEvent(event)) {
- mButtonDown = false;
- return true;
- }
- } else {
- HbInputPrediction12KeyHandlerPrivate::buttonReleased(keyEvent);
- }
- return false;
-}
-
-
-HbInputPrediction12KeyThaiHandler::HbInputPrediction12KeyThaiHandler(HbInputAbstractMethod *inputMethod)
- :HbInputPrediction12KeyHandler(* new HbInputPrediction12KeyThaiHandlerPrivate, inputMethod)
-{
- Q_D(HbInputPrediction12KeyThaiHandler);
- d->q_ptr = this;
-}
-
-HbInputPrediction12KeyThaiHandler::~HbInputPrediction12KeyThaiHandler()
-{
-}
-/*!
- filterEvent to handler keypress/release events.
-*/
-
-bool HbInputPrediction12KeyThaiHandler::filterEvent(const QKeyEvent * event)
-{
- Q_D(HbInputPrediction12KeyThaiHandler);
- HbInputFocusObject *focusObject = 0;
- focusObject = d->mInputMethod->focusObject();
-
- //If there was a handling for empty candidate-list, i.e. the engine did not predict
- //any meaningful word for the input sequence.
-
- if(!d->mCanContinuePrediction) {
- int eventKey = event->key();
- //let's us return If engine did not predict any meaningful word for the input sequence
- //for Shift,Asterisk and Control
- if(eventKey == Qt::Key_Control || eventKey == Qt::Key_0) {
- if(d->mCandidates->size() && focusObject ) {
- //Remove the "?" mark
- (*d->mCandidates)[d->mBestGuessLocation].chop(1);
- d->updateEditor();
- d->mCanContinuePrediction = true;
- }
- } else if (eventKey != Qt::Key_Shift && eventKey != Qt::Key_Asterisk){
- // For Shift key and Asterisk key Will handle it in button release Since we have character mapped to Shift and Asterisk
- // or else pass it to Prediction12KeyHandler handler
- HbInputPrediction12KeyHandler::filterEvent(event);
- }
- }
-
- // If the word is in inline edit First tap of Qt::Key_0 should commit the word in the editor
- // For successive tap prediction mode can't handle Qt::Key_0, so we will emit a passFilterEvent
- // this signal must be connected to by the plugin to a modehandler.
- // which can handle it.
-
- if (event->key() == Qt::Key_0 && d->mEngine->inputLength() >= 1 ) {
- if(event->type() == QEvent::KeyPress) {
- d->mButtonDown = true;
- } else if(event->type() == QEvent::KeyRelease) {
- d->mTimer->stop();
- d->mButtonDown = false;
- actionHandler(HbInputModeHandler::HbInputModeActionCommit);
- }
- d->mLastKey = Qt::Key_0;
- return true;
- } else if (event->key() == Qt::Key_0) {
- emit passFilterEvent(event);
- d->mLastKey = Qt::Key_0;
- return true;
- } else {
- if (d->mLastKey == Qt::Key_0) {
- emit passActionHandler(HbInputModeActionCommit);
- }
- if (event->type() == QEvent::KeyRelease) {
- return d->buttonReleased(event);
- } else {
- return d->buttonPressed(event);
- }
- }
-}
-
-
-//EOF
-
--- a/src/hbplugins/inputmethods/touchinput/hbinputprediction12keythaihandler.h Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +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 HbPlugins 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_PREDICTION_12KEY_THAI_HANDLER
-#define HB_INPUT_PREDICTION_12KEY_THAI_HANDLER
-
-#include "hbinputprediction12keyhandler.h"
-
-class HbInputPrediction12KeyThaiHandlerPrivate;
-class HbInputPrediction12KeyThaiHandler: public HbInputPrediction12KeyHandler
-{
- Q_OBJECT
-public:
- HbInputPrediction12KeyThaiHandler(HbInputAbstractMethod *inputMethod);
- ~HbInputPrediction12KeyThaiHandler();
-
- bool filterEvent(const QKeyEvent * event);
-
-private:
- Q_DECLARE_PRIVATE_D(d_ptr, HbInputPrediction12KeyThaiHandler)
- Q_DISABLE_COPY(HbInputPrediction12KeyThaiHandler)
-};
-
-
-#endif //HB_INPUT_PREDICTION_12KEY_THAI_HANDLER
-
-
--- a/src/hbplugins/inputmethods/touchinput/hbinputpredictionqwertyhandler.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputpredictionqwertyhandler.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -48,15 +48,13 @@
public:
int mButton;
HbFnState mFnState;
- bool mExactPopupLaunched;
- bool mLongPressHappened;
+ bool mExactPopupLaunched;
};
HbInputPredictionQwertyHandlerPrivate::HbInputPredictionQwertyHandlerPrivate()
:mButton(0),
mFnState(HbFnOff),
- mExactPopupLaunched(false),
- mLongPressHappened(false)
+ mExactPopupLaunched(false)
{
}
@@ -78,10 +76,6 @@
return false;
}
- if (mLongPressHappened) {
- mLongPressHappened = false;
- return false;
- }
int key = event->key();
@@ -97,39 +91,42 @@
}
break;
case HbInputButton::ButtonKeyCodeShift: {
- HbTextCase currentTextCase = (HbTextCase)focusObject->editorInterface().textCase();
- HbInputLanguage language = mInputMethod->inputState().language();
+ HbTextCase currentTextCase = (HbTextCase)focusObject->editorInterface().textCase();
+ HbInputLanguage language = mInputMethod->inputState().language();
- // Update the Case Information in HbInputState, it internally updates in HbEditorInterface as well
- switch(currentTextCase) {
- case HbTextCaseLower:
- // For Case-insensitive languages, Shift Key is used to switch between character sets (i.e lower case characters and shifted characters)
- if(!language.isCaseSensitiveLanguage()){
- currentTextCase = HbTextCaseUpper;
- }
- else {
- currentTextCase = HbTextCaseAutomatic;
- }
- break;
- case HbTextCaseUpper:
- currentTextCase = HbTextCaseLower;
- break;
+ // Update the Case Information in HbInputState, it internally updates in HbEditorInterface as well
+ switch(currentTextCase) {
+ case HbTextCaseLower:
+ // For Case-insensitive languages, Shift Key is used to switch between character sets (i.e lower case characters and shifted characters)
+ if(!language.isCaseSensitiveLanguage()){
+ currentTextCase = HbTextCaseUpper;
+ }
+ else {
+ currentTextCase = HbTextCaseAutomatic;
+ }
+ break;
+ case HbTextCaseUpper:
+ currentTextCase = HbTextCaseLower;
+ break;
case HbTextCaseAutomatic:
- currentTextCase = HbTextCaseUpper;
+ currentTextCase = HbTextCaseUpper;
break;
default:
break;
}
- HbInputState state = mInputMethod->inputState();
- state.setTextCase(currentTextCase);
- mInputMethod->activateState(state);
+ HbInputState state = mInputMethod->inputState();
+ state.setTextCase(currentTextCase);
+ mInputMethod->activateState(state);
}
break;
case HbInputButton::ButtonKeyCodeSymbol: { // Ctrl/Chr
case HbInputButton::ButtonKeyCodeAlphabet:
- mInputMethod->switchSpecialCharacterTable();
- }
+ mInputMethod->switchSpecialCharacterTable();
+ }
break;
+ case HbInputButton::ButtonKeyCodeSettings:
+ mInputMethod->closeExactWordPopup();
+ break;
default: {
HbTextCase currentTextCase = focusObject->editorInterface().textCase();
Qt::KeyboardModifiers modifiers = Qt::NoModifier;
@@ -166,9 +163,6 @@
if (event->isAutoRepeat() && mButton == event->key()) {
if (mButton == HbInputButton::ButtonKeyCodeSymbol) {
mInputMethod->selectSpecialCharacterTableMode();
- mLongPressHappened = true;
- }
- if (mLongPressHappened) {
mButton = 0;
return true;
}
@@ -200,7 +194,6 @@
bool ret = true;
switch (action) {
case HbInputModeActionCancelButtonPress:
- case HbInputModeActionReset:
break;
case HbInputModeActionFocusRecieved:
HbInputPredictionHandler::actionHandler(HbInputModeActionSetCandidateList);
@@ -220,10 +213,8 @@
// close exactword popup.
d->mInputMethod->closeExactWordPopup();
break;
- case HbInputModeActionCommit: {
- d->commit();
- }
- default: ret = HbInputPredictionHandler::actionHandler(action);
+ default:
+ ret = HbInputPredictionHandler::actionHandler(action);
}
return ret;
}
@@ -251,7 +242,7 @@
HbInputModeHandler::commitAndUpdate(string, replaceFrom, replaceLength);
d->mInputMethod->closeExactWordPopup();
d->mExactPopupLaunched = false;
- d->mTailShowing = false;
+ d->mTailShowing = false;
}
/*!
@@ -322,35 +313,35 @@
//some word getting predicted as a result to that.
mCanContinuePrediction = true;
- if(false == mTailShowing && true == mExactPopupLaunched) {
- mEngine->deleteKeyPress();
- mEngine->updateCandidates(mBestGuessLocation);
- }
- if (true == mExactPopupLaunched) {
- mBestGuessLocation = 0 ;
- }
+ if(false == mTailShowing && true == mExactPopupLaunched) {
+ mEngine->deleteKeyPress();
+ mEngine->updateCandidates(mBestGuessLocation);
+ }
+ if (true == mExactPopupLaunched) {
+ mBestGuessLocation = 0 ;
+ }
//When there is a deletion of key press, no need to update the candidate list
//This is because deletion should not cause reprediction.
- if(mCandidates->count() && (mCandidates->count()>mBestGuessLocation) && false == mTailShowing && false == mExactPopupLaunched) {
- QString currentWord = mCandidates->at(mBestGuessLocation);
- if(currentWord.length() > mEngine->inputLength()) {
- //chop off the autocompletion part
- currentWord = currentWord.left(mEngine->inputLength());
- }
- if(currentWord.length()) {
+ if(mCandidates->count() && (mCandidates->count()>mBestGuessLocation) && false == mTailShowing && false == mExactPopupLaunched) {
+ QString currentWord = mCandidates->at(mBestGuessLocation);
+ if(currentWord.length() > mEngine->inputLength()) {
+ //chop off the autocompletion part
+ currentWord = currentWord.left(mEngine->inputLength());
+ }
+ if(currentWord.length()) {
currentWord.chop(1);
- mEngine->deleteKeyPress();
- //We are not supposed to re-construct the candidate list as deletion
- //does not cause reprediction. Also, candidate list construction is the
- //heaviest operation out of all engine operations.
- (*mCandidates)[mBestGuessLocation] = currentWord;
- } else {
- commit(QString(""),false);
- }
-
- } else if(!mCandidates->count() && mEngine->inputLength() >= 1) {
+ mEngine->deleteKeyPress();
+ //We are not supposed to re-construct the candidate list as deletion
+ //does not cause reprediction. Also, candidate list construction is the
+ //heaviest operation out of all engine operations.
+ (*mCandidates)[mBestGuessLocation] = currentWord;
+ } else {
+ commit(QString(""),false);
+ }
+
+ } else if(!mCandidates->count() && mEngine->inputLength() >= 1) {
//If Input length greater or equal to one then Append the current word to candidate
- mCandidates->append(mEngine->currentWord());
+ mCandidates->append(mEngine->currentWord());
}
// update the editor with the new preedit text.
updateEditor();
--- a/src/hbplugins/inputmethods/touchinput/hbinputqwertynumerictouchkeyboard.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputqwertynumerictouchkeyboard.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -152,15 +152,20 @@
HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
if (buttonGroup) {
int key = 0;
+ int charKeyCount = 0;
+
QList<HbInputButton*> buttons = buttonGroup->buttons();
for (int i = 0; i < buttons.count(); ++i) {
if (keyCode(i) == HbInputButton::ButtonKeyCodeCharacter) {
HbInputButton *item = buttons.at(i);
-
- if (key < characters.count()) {
+ // digits always comes in the first row
+ if (charKeyCount < 10) {
+ item->setKeyCode(numberCharacterBoundToKey((charKeyCount + 1) % 10).unicode());
+ charKeyCount++;
+ } else if (key < characters.count()) {
item->setKeyCode(characters.at(key).unicode());
+ ++key;
}
- ++key;
}
}
}
@@ -176,17 +181,24 @@
HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
if (buttonGroup) {
int key = 0;
+ int charKeyCount = 0;
+
QList<HbInputButton*> buttons = buttonGroup->buttons();
for (int i = 0; i < buttons.count(); ++i) {
if (keyCode(i) == HbInputButton::ButtonKeyCodeCharacter) {
HbInputButton *item = buttons.at(i);
-
- if (key < characters.count()) {
- item->setText(characters.at(key), HbInputButton::ButtonTextIndexPrimary);
+ if (charKeyCount < 10) {
+ item->setText(numberCharacterBoundToKey((charKeyCount + 1) % 10),
+ HbInputButton::ButtonTextIndexPrimary);
+ charKeyCount++;
} else {
- item->setText(QString(), HbInputButton::ButtonTextIndexPrimary);
- }
- ++key;
+ if (key < characters.count()) {
+ item->setText(characters.at(key), HbInputButton::ButtonTextIndexPrimary);
+ } else {
+ item->setText(QString(), HbInputButton::ButtonTextIndexPrimary);
+ }
+ ++key;
+ }
}
}
buttonGroup->setButtons(buttons);
@@ -195,32 +207,36 @@
void HbQwertyNumericKeyboardPrivate::getCharacters(QString &characters)
{
- characters = QString("1234567890");
-
if (mKeymap) {
const HbKeyboardMap* keyboardMap = mKeymap->keyboard(HbKeyboardSctLandscape);
if (!keyboardMap) {
return;
}
-
+ QString chars;
+
foreach (const HbMappedKey* mappedKey, keyboardMap->keys) {
- QString chars = mappedKey->characters(HbModifierNone);
-
+ chars.append(mappedKey->characters(HbModifierNone));
+ }
HbInputFocusObject *focusedObject = mOwner->focusObject();
QString allowedChars;
if (focusedObject) {
focusedObject->filterStringWithEditorFilter(chars, allowedChars);
}
-
+ // 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);
}
}
- }
+
}
}
+
/*!
Constructs the object. owner is the owning input method implementation. Keymap
is key mapping data to be used to display button texts. Key mapping data can be
--- a/src/hbplugins/inputmethods/touchinput/hbinputthaispecialpopup.cpp Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,534 +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 HbPlugins 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 <QGraphicsGridLayout>
-#include <QGraphicsWidget>
-#include <QString>
-#include <QSignalMapper>
-
-#include <HbMainWindow>
-#include <hbgridview.h>
-#include <hbwidget.h>
-#include <hbdialog_p.h>
-#include <HbPopup>
-
-#include "hbinputtouchkeypadbutton.h"
-#include "hbinputthaispecialpopup.h"
-
-const QString HbAbcButtonObjName = "Popup abc";
-
-const int HbPopupAsteriskColumns = 5;
-const int HbPopupAsteriskRows = 4;
-const int HbPopupShiftColumns = 4;
-const int HbPopupShiftRows = 3;
-
-
-const int HBPopupEmptyButtonSeven = 7;
-const int HBPopupEmptyButtonEight = 8;
-const int HBPopupEmptyButtonNine = 9;
-
-const QString HbPopupPortraitButtonTextLayout = "_hb_sctp_button_text_layout";
-const QString HbPopupPortraitButtonIconLayout = "_hb_sctp_button_icon_layout";
-
-/*!
-@proto
-@hbtouchinput
-\class HbInputThaiSpecialPopup
-\brief Implementation of Thai Special Popup.
-
-Implementation of Thai Special Popup.
-
-*/
-
-/// @cond
-
-class HbInputThaiSpecialPopupPrivate: public HbDialogPrivate
-{
- Q_DECLARE_PUBLIC(HbInputThaiSpecialPopup)
-
-public:
- //Character classes
- enum ThaiGlyphTypes {
- HbThaiCharNon = 0, //Not a Thai letter
- HbThaiCharCons, //Thai consonant
- HbThaiCharLV, //Leading vowel
- HbThaiCharFV1, //Following vowel, type 1
- HbThaiCharFV2, //Following vowel, type 2
- HbThaiCharFV3, //Following vowel, type 3
- HbThaiCharBV1, //Below vowel, type 1
- HbThaiCharBV2, //Below vowel, type 2
- HbThaiCharBD, //Below diacritic
- HbThaiCharTone, //Tone mark
- HbThaiCharAD1, //Above diacritic, type 1
- HbThaiCharAD2, //Above diacritic, type 2
- HbThaiCharAD3, //Above diacritic, type 3
- HbThaiCharAV1, //Above vowel, type 1
- HbThaiCharAV2, //Above vowel, type 2
- HbThaiCharAV3, //Above vowel, type 3
- HbThaiCharNonThai //Not a Thai letter
- };
- QGraphicsGridLayout* mButtonLayout;
- QGraphicsWidget* mButtonWidget;
- QList<HbTouchKeypadButton *> mPopupButtons;
- QSignalMapper *mActionMapper;
- QSignalMapper *mClickMapper;
- QString mSpecialCharacterSet;
- const HbKeymap *mKeymap;
- QSizeF mSize;
- int mButtonId;
- int mPopupGridColumns;
- int mPopupGridRows;
- int mNumPopupButtons;
- int mAbcButtonId;
- uint mPrevChar;
-
-
-public:
- HbInputThaiSpecialPopupPrivate();
- ~HbInputThaiSpecialPopupPrivate();
- void setNumberOfKeys();
- void createPopupButtons(int screenWidth, int screenHeight);
- void setLayoutDimensions(QSizeF dimensions);
- void getSpecialCharacters();
- void setPopupButtons(const QString &aCharSet);
- void applyEditorConstraints();
- int thaiGlyphType(uint prevChar);
- void initializeAbcButton();
- void handleStandardButtonClick(int buttonId);
- void _q_mappedKeyClick(int buttonid);
-};
-
-HbInputThaiSpecialPopupPrivate::HbInputThaiSpecialPopupPrivate()
-{
- // we should make sure that it comes above vkb
- setPriority(HbPopupPrivate::VirtualKeyboard + 1);
- mClickMapper = 0;
- mSize = QSizeF();
-}
-
-HbInputThaiSpecialPopupPrivate::~HbInputThaiSpecialPopupPrivate()
-{
-}
-
-/*!
-Sets number of keys to layout
-*/
-void HbInputThaiSpecialPopupPrivate::setNumberOfKeys()
-{
- //Manipulate number of keys on the layout depending on the Key_Asterisk and Qt::Key_Shift
- if(Qt::Key_Asterisk == mButtonId) {
- mPopupGridColumns = HbPopupAsteriskColumns;
- mPopupGridRows = HbPopupAsteriskRows;
- }else if (Qt::Key_Shift == mButtonId) {
- mPopupGridColumns = HbPopupShiftColumns;
- mPopupGridRows = HbPopupShiftRows;
- }
- mNumPopupButtons = mPopupGridColumns * mPopupGridRows;
- mAbcButtonId = mPopupGridColumns*mPopupGridRows-1;
-}
-
-
-/*!
-Create Popup Buttons
-*/
-void HbInputThaiSpecialPopupPrivate::createPopupButtons(int screenWidth, int screenHeight)
-{
- Q_Q(HbInputThaiSpecialPopup);
- Q_UNUSED(q)
- if (mPopupButtons.size() == 0) {
- for (int i = 0; i < mNumPopupButtons; ++i) {
- HbTouchKeypadButton *button = new HbTouchKeypadButton(0,QString(""),0);
- q->connect(button, SIGNAL(clicked()), mClickMapper, SLOT(map()));
- mClickMapper->setMapping(button, i);
- mPopupButtons.append(button);
- button->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, HbPopupPortraitButtonTextLayout);
- }
-
- for (int i = 0; i < mNumPopupButtons; ++i) {
- if(Qt::Key_Asterisk == mButtonId) {
- //This check is for logical separation between Above below vowels , Diacritics and Tone marks
- //In Thai Language we have 7 Above and Below Vowels, 5 Diacritics and 4 Tone marks
- if(!(i == HBPopupEmptyButtonSeven || i== HBPopupEmptyButtonEight || i == HBPopupEmptyButtonNine)) {
- mButtonLayout->addItem(mPopupButtons.at(i), i/mPopupGridColumns, i%mPopupGridColumns);
- }
- } else if (Qt::Key_Shift == mButtonId) {
- mButtonLayout->addItem(mPopupButtons.at(i), i/mPopupGridColumns, i%mPopupGridColumns);
- }
- }
- }
- //Set the Layout Dimensions
- setLayoutDimensions(QSizeF(screenWidth/mPopupGridColumns, screenHeight/mPopupGridRows));
- //Assign button layout to widget
- mButtonWidget->setLayout(mButtonLayout);
-}
-
-/*!
-This function defines the layout porperties for popup.
-*/
-void HbInputThaiSpecialPopupPrivate::setLayoutDimensions(QSizeF dimensions)
-{
- // only update the dimensions if they are not previously set
- if (mSize == dimensions) {
- return;
- }
- mSize = dimensions;
-
- mButtonLayout->setContentsMargins(0.0, 0.0, 0.0, 0.0);
-
- for (int i = 0; i < mPopupGridColumns; i++) {
- mButtonLayout->setColumnFixedWidth(i, dimensions.width());
- }
- for (int i = 0; i < mPopupGridRows; i++) {
- mButtonLayout->setRowFixedHeight(i, dimensions.height());
- }
-
- mButtonLayout->setHorizontalSpacing(0.0);
- mButtonLayout->setVerticalSpacing(0.0);
- foreach (HbTouchKeypadButton* button, mPopupButtons) {
- if (button) {
- button->setInitialSize(dimensions);
- }
- }
-}
-
-
-/*!
-Gets the special character sets from set keymapping.
-*/
-void HbInputThaiSpecialPopupPrivate::getSpecialCharacters()
-{
- mSpecialCharacterSet.clear();
- if (mKeymap) {
- const HbKeyboardMap* keyboardMap = 0;
- //Set keyboard map depending on Key_Asterisk and Key_Shift
- if(Qt::Key_Asterisk == mButtonId) {
- keyboardMap = mKeymap->keyboard(HbKeyboardThaiStarSctPortrait);
- } else if(Qt::Key_Shift == mButtonId) {
- keyboardMap = mKeymap->keyboard(HbKeyboardThaiHashSctPortrait);
- }
- if (keyboardMap) {
- foreach (const HbMappedKey* mappedKey, keyboardMap->keys) {
- //Creats character set through keyboard map
- mSpecialCharacterSet.append(mappedKey->characters(HbModifierNone));
- }
- }
- }
-}
-
-/*!
-Let's set Thai Special Character to Buttons
-*/
-void HbInputThaiSpecialPopupPrivate::setPopupButtons(const QString &aCharSet)
-{
- int i = 0;
- int j = 0;
- for (; i < mPopupButtons.size()-1 && j < aCharSet.size(); ++i) {
- if(Qt::Key_Asterisk == mButtonId) {
- //This check is for logical separation between Above below Vowels , Diacritics and Tone marks
- //In Thai Language we have 7 Above and Below Vowels, 5 Diacritics and 4 Tone marks
- if(!(i == HBPopupEmptyButtonSeven || i== HBPopupEmptyButtonEight || i == HBPopupEmptyButtonNine)) {
- const QChar &character = aCharSet[j];
- mPopupButtons.at(i)->setText(character);
- mPopupButtons.at(i)->setObjectName("Thai Sct portrait " + QString(character));
- j++;
- }
- } else if (Qt::Key_Shift == mButtonId) {
- const QChar &character = aCharSet[j];
- mPopupButtons.at(i)->setText(character);
- mPopupButtons.at(i)->setObjectName("Thai Sct portrait " + QString(character));
- j++;
- }
- }
-
- for (; i < mPopupButtons.size()-1; ++i) {
- mPopupButtons.at(i)->setText("");
- }
- applyEditorConstraints();
- initializeAbcButton();
-}
-
-/*!
-Apply editor constraints on buttons
-*/
-void HbInputThaiSpecialPopupPrivate::applyEditorConstraints()
-{
- if (Qt::Key_Asterisk == mButtonId) {
- //Get Character class
- int glyphType = thaiGlyphType(mPrevChar);
- //Set the rules to the editor to allow or disallow characters
- switch(glyphType) {
- case HbThaiCharNonThai:
- case HbThaiCharNon:
- case HbThaiCharLV:
- case HbThaiCharFV1:
- case HbThaiCharFV2:
- case HbThaiCharFV3:
- case HbThaiCharBD:
- case HbThaiCharTone:
- case HbThaiCharAD1:
- case HbThaiCharAD2:
- case HbThaiCharAD3:
- for (int i=0; i < mPopupButtons.size()-1; ++i) {
- mPopupButtons.at(i)->setFade(true);
- }
- break;
- case HbThaiCharCons:
- for (int i=0; i < mPopupButtons.size()-1; ++i) {
- mPopupButtons.at(i)->setFade(false);
- }
- break;
- case HbThaiCharAV1:
- case HbThaiCharBV1: {
- static const QChar data[6] = { 0x0e48, 0x0e49, 0x0e4a, 0x0e4b, 0x0e4c, 0x0e4d };
- QString allowChar(data, 6);
-
- for (int i=0; i < mPopupButtons.size()-1; ++i) {
- QString buttonText = mPopupButtons.at(i)->text();
-
- if(buttonText.isEmpty()) {
- mPopupButtons.at(i)->setFade(true);
- } else {
- if (allowChar.contains(buttonText)) {
- mPopupButtons.at(i)->setFade(false);
- } else {
- mPopupButtons.at(i)->setFade(true);
- }
- }
- }
- }
- break;
- case HbThaiCharAV2:
- case HbThaiCharBV2: {
- static const QChar data[4] = { 0x0e48, 0x0e49, 0x0e4a, 0x0e4b };
- QString allowChar(data, 4);
-
- for (int i=0; i < mPopupButtons.size()-1; ++i) {
- QString buttonText = mPopupButtons.at(i)->text();
-
- if(buttonText.isEmpty()) {
- mPopupButtons.at(i)->setFade(true);
- } else {
- if (allowChar.contains(buttonText)) {
- mPopupButtons.at(i)->setFade(false);
- } else {
- mPopupButtons.at(i)->setFade(true);
- }
- }
-
- }
-
- }
- break;
-
- case HbThaiCharAV3: {
- static const QChar data[5] = { 0x0e48, 0x0e49, 0x0e4a, 0x0e4b, 0x0e47 };
- QString allowChar(data, 5);
-
- for (int i=0; i < mPopupButtons.size()-1; ++i) {
- QString buttonText = mPopupButtons.at(i)->text();
-
- if(buttonText.isEmpty()) {
- mPopupButtons.at(i)->setFade(true);
- } else {
- if (allowChar.contains(buttonText)) {
- mPopupButtons.at(i)->setFade(false);
- } else {
- mPopupButtons.at(i)->setFade(true);
- }
- }
- }
-
- }
- break;
- default:
- break;
-
- }
- }
-
-}
-/*!
-Returns Character classes depending on the previous entered character
-*/
-int HbInputThaiSpecialPopupPrivate::thaiGlyphType(uint prevChar)
-{
- if (prevChar >= 0x0E01 && prevChar <= 0x0E2E && prevChar != 0x0E24 && prevChar != 0x0E26 ) {
- return(HbThaiCharCons);
- } else if (prevChar >= 0x0E40 && prevChar <= 0x0E44) {
- return(HbThaiCharLV);
- } else if (prevChar == 0x0E30 || prevChar == 0x0E32 || prevChar == 0x0E33) {
- return(HbThaiCharFV1);
- } else if (prevChar == 0x0E45) {
- return(HbThaiCharFV2);
- } else if (prevChar == 0x0E24 || prevChar == 0x0E26) {
- return(HbThaiCharFV3);
- } else if (prevChar == 0x0E38) {
- return(HbThaiCharBV1);
- } else if (prevChar == 0x0E39) {
- return(HbThaiCharBV2);
- } else if (prevChar == 0x0E3A) {
- return(HbThaiCharBD);
- } else if (prevChar >= 0x0E48 && prevChar <= 0x0E4B) {
- return(HbThaiCharTone);
- } else if (prevChar == 0x0E4C || prevChar == 0x0E4D) {
- return(HbThaiCharAD1);
- } else if (prevChar == 0x0E47) {
- return(HbThaiCharAD2);
- } else if (prevChar == 0x0E4E) {
- return(HbThaiCharAD3);
- } else if (prevChar == 0x0E34) {
- return(HbThaiCharAV1);
- } else if (prevChar == 0x0E31 || prevChar == 0x0E36) {
- return(HbThaiCharAV2);
- } else if (prevChar == 0x0E35 || prevChar == 0x0E37) {
- return(HbThaiCharAV3);
- } else {
- return(HbThaiCharNonThai);
- }
-}
-
-/*!
-Initialize ABC button
-*/
-void HbInputThaiSpecialPopupPrivate::initializeAbcButton()
-{
- mPopupButtons.at(mAbcButtonId)->setIcon(HbIcon("qtg_mono_alpha_mode"));
- mPopupButtons.at(mAbcButtonId)->setObjectName(HbAbcButtonObjName);
- mPopupButtons.at(mAbcButtonId)->setObjectName(HbAbcButtonObjName);
- mPopupButtons.at(mAbcButtonId)->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, HbPopupPortraitButtonIconLayout);
- mPopupButtons.at(mAbcButtonId)->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
- mPopupButtons.at(mAbcButtonId)->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
-}
-
-
-/*!
-Handles button clicks.
-*/
-void HbInputThaiSpecialPopupPrivate::handleStandardButtonClick(int buttonId)
-{
- Q_Q(HbInputThaiSpecialPopup);
-
- if (buttonId >= 0 && buttonId < mNumPopupButtons-1 ) {
- QString buttonText = mPopupButtons.at(buttonId)->text();
- //Emit the signal when button is not faded and it has some text
- if (!mPopupButtons.at(buttonId)->isFaded() && buttonText.length() > 0) {
- emit q->chrSelected(buttonText.at(0));
- }
- }
- //It will hide popup for any click event
- q->hide();
-
-}
-
-/*!
-Handles virtual key clicks
-*/
-void HbInputThaiSpecialPopupPrivate::_q_mappedKeyClick(int buttonid)
-{
- handleStandardButtonClick(buttonid);
-}
-
-/// @endcond
-
-
-/*!
-Constructs the object.
-*/
-
-HbInputThaiSpecialPopup::HbInputThaiSpecialPopup(int buttonId, uint prevChar, QGraphicsItem* parent)
- : HbDialog(*new HbInputThaiSpecialPopupPrivate(), parent)
-{
- Q_D(HbInputThaiSpecialPopup);
- //Initialize member variable
- d->mPrevChar = prevChar;
- d->mButtonId = buttonId;
-#if QT_VERSION >= 0x040600
- // Make sure the Thai special popup never steals focus.
- setFlag(QGraphicsItem::ItemIsPanel, true);
- setActive(false);
-#endif
- // set dialog properties
- setFocusPolicy(Qt::ClickFocus);
- setBackgroundFaded(false);
- setDismissPolicy(TapAnywhere);
- setTimeout(NoTimeout);
-
- d->mButtonLayout = new QGraphicsGridLayout();
- d->mButtonLayout->setSpacing(0.0);
- d->mButtonLayout->setContentsMargins(0.0, 0.0, 0.0, 0.0);
-
- d->mButtonWidget = new QGraphicsWidget();
- //Create Signal mapper
- d->mClickMapper = new QSignalMapper(this);
-
- // let's connect buttons to handle click events
- connect(d->mClickMapper, SIGNAL(mapped(int)), this, SLOT(_q_mappedKeyClick(int)));
-}
-
-/*!
-Destructs the object.
-*/
-HbInputThaiSpecialPopup::~HbInputThaiSpecialPopup()
-{
-}
-
-/*!
-This function should be called when ever there is a Key_Asterisk and Key_Shift click happens.
-This create buttons, Set the layout dimensions and gets the special characters from the given keymappings and set it accordingly.
-*/
-void HbInputThaiSpecialPopup::setPopupLayout(const HbKeymap* keymap, uint prevChar, int buttonId, int screenWidth, int screenHeight)
-{
- Q_D(HbInputThaiSpecialPopup);
- if(d->mButtonId != buttonId) {
- d->mButtonId = buttonId;
- while (!d->mPopupButtons.isEmpty())
- delete d->mPopupButtons.takeFirst();
- }
- d->mKeymap = keymap;
- d->mPrevChar = prevChar;
- //Initialize Number of keys dependent on Key_Asterisk and Key_Shift
- d->setNumberOfKeys();
- //Create buttons.
- d->createPopupButtons(screenWidth,screenHeight);
- //Gets the special character sets from set keymapping.
- d->getSpecialCharacters();
- //Let's set Special Character Table Buttons
- d->setPopupButtons(d->mSpecialCharacterSet);
- setContentWidget(d->mButtonWidget);
-}
-
-/*!
-This a virtual functions in QGraphicsWidget. It is called whenever the Thai popup is shown.
-
-*/
-void HbInputThaiSpecialPopup::showEvent( QShowEvent * event )
-{
- HbDialog::showEvent(event);
-}
-
-#include "moc_hbinputthaispecialpopup.cpp"
-
-//End of file
-
--- a/src/hbplugins/inputmethods/touchinput/hbinputthaispecialpopup.h Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +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 HbPlugins 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_THAISPECIALPOPUP_H
-#define HB_INPUT_THAISPECIALPOPUP_H
-
-#include <QGraphicsItem>
-
-#include <hbinputdef.h>
-#include <hbdialog.h>
-#include <HbInputMethod>
-#include <HbKeymap>
-
-
-class HbInputThaiSpecialPopupPrivate;
-
-class HbInputThaiSpecialPopup : public HbDialog
-{
- Q_OBJECT
-public:
- HbInputThaiSpecialPopup(int buttonId, uint prevChar, QGraphicsItem* parent = 0);
- ~HbInputThaiSpecialPopup();
-
- void showEvent( QShowEvent *event);
- void setPopupLayout(const HbKeymap* keymap,uint prevChar,int buttonId, int screenWidth, int screenHeight );
-
-signals:
- void chrSelected(QString sctText);
-private:
- Q_DECLARE_PRIVATE_D(d_ptr, HbInputThaiSpecialPopup)
- Q_DISABLE_COPY(HbInputThaiSpecialPopup)
- Q_PRIVATE_SLOT(d_func(), void _q_mappedKeyClick(int ))
-};
-
-#endif // HB_INPUT_THAISPECIALPOPUP_H
-
-// End of file
-
-
--- a/src/hbplugins/inputmethods/touchinput/hbinputtouchkeypadbutton.cpp Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,454 +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 HbPlugins 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 <QGraphicsScene>
-#include <QGraphicsSceneMouseEvent>
-
-#include <hbframedrawer.h>
-#include <hbframedrawerpool_p.h>
-#include <hbframeitem.h>
-#include <QGraphicsSceneResizeEvent>
-#include <hbtextitem.h>
-#include <hbiconitem.h>
-#include <hbevent.h>
-#ifdef HB_EFFECTS
-#include <hbeffect.h>
-#endif
-#include <hbtapgesture.h>
-
-#include "hbinputtouchkeypadbutton.h"
-#include "hbinputvkbwidget.h"
-#include "hbinputvkbwidget_p.h"
-
-/// @cond
-
-/*!
-@proto
-@hbinput
-\class HbTouchKeypadButton
-\brief A button widget to be used in touch keypads.
-
-Expands HbPushButton functionality to suit touch keypad purposes. It handles virtual keyboard closing gesture
-that is initiated from within the button area and knows how to act as a sticky input button. Sticky buttons propagate
-mouse press state to neighboring button when a drag event crosses widget boundary. This is needed for example in virtual qwerty where
-user must be able to slide finger across the keyboard.
-*/
-
-const QString HbNormalBackground("qtg_fr_input_btn_keypad_normal");
-const QString HbNormalPressedBackground("qtg_fr_input_btn_keypad_pressed");
-const QString HbNormalInActiveBackground("qtg_fr_input_btn_keypad_disabled");
-const QString HbNormalLatchedBackground("qtg_fr_input_btn_keypad_latched");
-
-const QString HbFunctionBackground("qtg_fr_input_btn_function_normal");
-const QString HbFunctionPressedBackground("qtg_fr_input_btn_function_pressed");
-const QString HbFuncInActiveBackground("qtg_fr_input_btn_function_disabled");
-const QString HbFunctionLatchedBackground("qtg_fr_input_btn_function_latched");
-
-inline HbTouchKeypadButton* hbtouchkeypadbutton_cast(QGraphicsItem *item)
-{
- if( item->isWidget() && qobject_cast<HbTouchKeypadButton *>(static_cast<QGraphicsWidget*>(item)) ) {
- return static_cast<HbTouchKeypadButton *>(item);
- }
- return 0;
-}
-
-class HbTouchKeypadButtonPrivate
-{
-public:
- HbTouchKeypadButtonPrivate(HbInputVkbWidget* owner)
- : mOwner(owner),
- mFaded(false),
- mButtonType(HbTouchKeypadButton::HbTouchButtonNormal),
- mFrameIcon(0),
- mStickyKey(false),
- mLatch(false)
- {}
-
-public:
- HbInputVkbWidget* mOwner;
- bool mFaded;
- HbTouchKeypadButton::HbTouchButtonType mButtonType;
- HbFrameItem *mFrameIcon;
- bool mStickyKey;
- bool mLatch;
- int mKeyCode;
-};
-
-HbTouchKeypadButton::HbTouchKeypadButton(HbInputVkbWidget *owner,
- const QString &text,
- QGraphicsWidget *parent)
- : HbPushButton(text, parent), d_ptr(new HbTouchKeypadButtonPrivate(owner))
-{
- #ifdef HB_EFFECTS
- HbEffect::disable(this);
- #endif
-
- this->setToolTip(QString());
- setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- setProperty("buttonType", "normal");
-}
-
-HbTouchKeypadButton::HbTouchKeypadButton(HbInputVkbWidget *owner,
- const HbIcon &icon,
- const QString &text,
- QGraphicsItem *parent)
- : HbPushButton(icon, text, parent), d_ptr(new HbTouchKeypadButtonPrivate(owner))
-{
- #ifdef HB_EFFECTS
- HbEffect::disable(this);
- #endif
-
- this->setToolTip(QString());
- setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- setProperty("buttonType", "normal");
-}
-
-HbTouchKeypadButton::~HbTouchKeypadButton()
-{
- delete d_ptr;
-}
-
-void HbTouchKeypadButton::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
- Q_UNUSED(event)
-}
-
-void HbTouchKeypadButton::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
- Q_UNUSED(event)
-}
-
-void HbTouchKeypadButton::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
- Q_UNUSED(event)
-}
-
-void HbTouchKeypadButton::gestureEvent(QGestureEvent *event)
-{
- Q_D(HbTouchKeypadButton);
- if (HbTapGesture *tap = qobject_cast<HbTapGesture*>(event->gesture(Qt::TapGesture))) {
- switch(tap->state()) {
- case Qt::GestureStarted:
- if (d->mOwner && d->mOwner->d_func()) {
- d->mOwner->d_func()->updateMouseHitItem(this, tap->scenePosition());
- }
- if (!(d->mButtonType == HbTouchButtonNormalInActive && text().isEmpty())) {
- setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonPressed);
- }
- break;
- case Qt::GestureUpdated:
- // Handle tap-and-hold?
- break;
- case Qt::GestureFinished:
- if (!(d->mButtonType == HbTouchButtonNormalInActive && text().isEmpty())) {
- if (d->mLatch) {
- setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonLatched);
- } else {
- setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- }
- break;
- case Qt::GestureCanceled:
- setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- break;
- default:
- break;
- }
- }
- }
- HbPushButton::gestureEvent(event);
-}
-
-void HbTouchKeypadButton::resizeEvent(QGraphicsSceneResizeEvent *event)
-{
- Q_D(HbTouchKeypadButton);
-
- HbPushButton::resizeEvent(event);
-
- // setting the draw rect for the frameitem in this button
- // get the new size, and use the new size to the frameitem
- if (d->mFrameIcon ) {
- QSizeF mySize = event->newSize();
- QRectF rect = QRectF(mySize.width()*0.1, mySize.height()*0.3, mySize.width()*0.8, mySize.height());
- d->mFrameIcon->setGeometry( rect );
- }
-}
-
-bool HbTouchKeypadButton::isFaded()
-{
- Q_D(HbTouchKeypadButton);
- return d->mFaded;
-}
-
-void HbTouchKeypadButton::setFade(bool fade)
-{
- Q_D(HbTouchKeypadButton);
- if (d->mFaded == fade) {
- return;
- }
-
- d->mFaded = fade;
-
- // now set button's text, type and background attributes based on d->mFaded value
- if(d->mFaded) {
- if (d->mFrameIcon) {
- d->mFrameIcon->setOpacity(0.2);
- }
- if(HbTouchButtonNormal == getButtonType() ){
- setButtonType(HbTouchKeypadButton::HbTouchButtonNormalInActive);
- } else if(HbTouchButtonFunction == getButtonType()) {
- setButtonType(HbTouchKeypadButton::HbTouchButtonFnInActive);
- }
- } else {
- if (d->mFrameIcon) {
- d->mFrameIcon->setOpacity(1.0);
- }
- if(HbTouchButtonNormalInActive == getButtonType()){
- setButtonType(HbTouchKeypadButton::HbTouchButtonNormal);
- } else if(HbTouchButtonFnInActive == getButtonType()) {
- setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
- }
- }
- setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
-}
-
-void HbTouchKeypadButton::setButtonType(HbTouchButtonType buttonType)
-{
- Q_D(HbTouchKeypadButton);
- d->mButtonType = buttonType;
- if (buttonType == HbTouchButtonNormal ||
- buttonType == HbTouchButtonNormalInActive) {
- setProperty("buttonType", "normal");
- } else if (buttonType == HbTouchButtonFunction ||
- buttonType == HbTouchButtonFnInActive){
- setProperty("buttonType", "function");
- }
-}
-
-int HbTouchKeypadButton::getButtonType()
-{
- Q_D(HbTouchKeypadButton);
- return d->mButtonType;
-}
-
-HbFrameItem * HbTouchKeypadButton::getFrameIcon()
-{
- Q_D(HbTouchKeypadButton);
- return d->mFrameIcon;
-}
-
-void HbTouchKeypadButton::setBackgroundAttributes(HbTouchButtonState buttonState)
-{
- Q_D(HbTouchKeypadButton);
-
- if(d->mButtonType == HbTouchButtonNormal) {
- if(buttonState == HbTouchKeypadButton::HbTouchButtonPressed) {
- setBackground(HbNormalPressedBackground);
- } else if (buttonState == HbTouchKeypadButton::HbTouchButtonLatched) {
- setBackground(HbNormalLatchedBackground);
- } else {
- setBackground(HbNormalBackground);
- }
- } else if(d->mButtonType == HbTouchButtonFunction) {
- if(buttonState == HbTouchKeypadButton::HbTouchButtonPressed) {
- setBackground(HbFunctionPressedBackground);
- } else if (buttonState == HbTouchKeypadButton::HbTouchButtonLatched) {
- setBackground(HbFunctionLatchedBackground);
- } else{
- setBackground(HbFunctionBackground);
- }
- } else if(d->mButtonType == HbTouchButtonFnInActive){
- setBackground(HbFuncInActiveBackground);
- } else if(d->mButtonType == HbTouchButtonNormalInActive) {
- setBackground(HbNormalInActiveBackground);
- } else {
- setBackground(HbFuncInActiveBackground);
- }
-}
-
-void HbTouchKeypadButton::setBackground(const QString& backgroundFrameFilename)
-{
- HbFrameDrawer* drawer = frameBackground();
- if (!drawer || drawer->frameGraphicsName() != backgroundFrameFilename) {
- setFrameBackground(HbFrameDrawerPool::get(backgroundFrameFilename, HbFrameDrawer::NinePieces, size()));
- update();
- }
-}
-
-void HbTouchKeypadButton::setFrameIcon(const QString& frameIconFileName )
-{
- Q_D(HbTouchKeypadButton);
-
- if (!d->mFrameIcon ) {
- d->mFrameIcon = new HbFrameItem(this);
- HbFrameDrawer *framedrawer = new HbFrameDrawer(frameIconFileName, HbFrameDrawer::ThreePiecesHorizontal);
- d->mFrameIcon->setFrameDrawer(framedrawer);
- } else {
- d->mFrameIcon->frameDrawer().setFrameGraphicsName(frameIconFileName);
- }
-}
-
-int HbTouchKeypadButton::type() const
-{
- Q_D(const HbTouchKeypadButton);
-
- if (d->mButtonType == HbTouchButtonFunction ||
- d->mButtonType == HbTouchButtonFnInActive) {
- return Hb::ItemType_InputFunctionButton;
- } else if (d->mButtonType == HbTouchButtonNormal ||
- d->mButtonType == HbTouchButtonNormalInActive) {
- return Hb::ItemType_InputCharacterButton;
- } else {
- return Hb::ItemType_InputCharacterButton;
- }
-}
-
-void HbTouchKeypadButton::setAsStickyButton(bool isSticky)
-{
- Q_D(HbTouchKeypadButton);
- d->mStickyKey = isSticky;
-}
-
-bool HbTouchKeypadButton::isStickyButton() const
-{
- Q_D(const HbTouchKeypadButton);
- return d->mStickyKey;
-}
-
-void HbTouchKeypadButton::setLatch(bool enable)
-{
- Q_D(HbTouchKeypadButton);
-
- d->mLatch = enable;
- if (d->mLatch) {
- setProperty("state", "latched");
- setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonLatched);
- } else {
- setProperty("state", "normal");
- setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- }
-}
-
-bool HbTouchKeypadButton::isLatched() const
-{
- Q_D(const HbTouchKeypadButton);
- return d->mLatch;
-}
-
-int HbTouchKeypadButton::keyCode() const
-{
- Q_D(const HbTouchKeypadButton);
- return d->mKeyCode;
-}
-
-void HbTouchKeypadButton::setKeyCode(int code)
-{
- Q_D(HbTouchKeypadButton);
- d->mKeyCode = code;
-}
-
-void HbTouchKeypadButton::setText(const QString &text)
-{
- // Workaround for pushbutton feature
- if (!text.isNull()) {
- HbPushButton::setText(text);
- } else {
- HbPushButton::setText(QString(""));
- }
-}
-
-void HbTouchKeypadButton::setAdditionalText(const QString &additionalText)
-{
- if (!additionalText.isNull()) {
- HbPushButton::setAdditionalText(additionalText);
- } else {
- HbPushButton::setAdditionalText(QString(""));
- }
-}
-
-void HbTouchKeypadButton::changeEvent( QEvent *event )
-{
- if ( event->type() == HbEvent::ThemeChanged ) {
- updatePrimitives();
- setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- }
- HbPushButton::changeEvent(event);
-}
-
-void HbTouchKeypadButton::updatePrimitives()
-{
- Q_D(HbTouchKeypadButton);
- HbPushButton::updatePrimitives();
-
- if (d->mFrameIcon && d->mFaded) {
- d->mFrameIcon->setOpacity(0.2);
- }
-}
-
-QSizeF HbTouchKeypadButton::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
-{
- QSizeF sh;
- switch (which) {
- case Qt::MinimumSize:
- sh = QSizeF(50, 50);
- break;
- case Qt::PreferredSize:
- sh = HbAbstractButton::sizeHint(which, constraint);
- break;
- case Qt::MaximumSize:
- sh = QSizeF(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
- break;
- default:
- sh = HbAbstractButton::sizeHint(which, constraint);
- break;
- }
- return sh;
-}
-
-QVariant HbTouchKeypadButton::itemChange( GraphicsItemChange change, const QVariant & value )
-{
- // If the button is being hidden and it has the press background,
- // need to set it to released background. This fix is needed for the error:
- // In ITU-T long press * key and then return back to alpha mode, the * key
- // has button pressed background.
- if (QGraphicsItem::ItemVisibleHasChanged == change && !value.toBool()) {
- if (isDown()) {
- setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- }
- }
- return HbPushButton::itemChange(change, value);
-}
-
-void HbTouchKeypadButton::setInitialSize(const QSizeF& initialSize)
-{
- setPreferredSize(initialSize);
- QGraphicsItem* backgroundPrimitive = primitive(HbStyle::P_PushButton_background);
- if (backgroundPrimitive) {
- HbIconItem *iconItem = static_cast<HbIconItem*>(backgroundPrimitive);
- iconItem->setSize(initialSize);
- }
-}
-
-/// @endcond
-
-// End of file
--- a/src/hbplugins/inputmethods/touchinput/hbinputtouchkeypadbutton.h Thu May 27 13:10:59 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +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 HbPlugins 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_TOUCH_KEYPAD_BUTTON_H
-#define HB_TOUCH_KEYPAD_BUTTON_H
-
-#include <hbinputdef.h> // For HB_INPUT_EXPORT
-#include <hbpushbutton.h>
-
-class HbInputVkbWidget;
-class HbTouchKeypadButtonPrivate;
-class HbStyleOptionLabel;
-class HbFrameItem;
-
-class HbTouchKeypadButton : public HbPushButton
-{
- Q_OBJECT
- Q_PROPERTY(int keyCode READ keyCode WRITE setKeyCode)
-
-public:
- enum HbTouchButtonType {
- HbTouchButtonNormal,
- HbTouchButtonFunction,
- HbTouchButtonNormalInActive,
- HbTouchButtonFnInActive
- };
-
- enum HbTouchButtonState {
- HbTouchButtonReleased,
- HbTouchButtonPressed,
- HbTouchButtonLatched
- };
-
-public:
- HbTouchKeypadButton(HbInputVkbWidget* owner, const QString &text, QGraphicsWidget *parent = 0);
- HbTouchKeypadButton(HbInputVkbWidget* owner, const HbIcon &icon, const QString &text, QGraphicsItem *parent = 0 );
- virtual ~HbTouchKeypadButton();
-
- int keyCode() const;
- void setKeyCode(int code);
- virtual void setText(const QString &text);
- virtual void setAdditionalText(const QString &additionalText);
- bool isFaded();
- void setFade(bool fade);
- void setButtonType(HbTouchButtonType buttonType);
- int getButtonType();
- HbFrameItem * getFrameIcon();
- void setBackgroundAttributes(HbTouchButtonState buttonState);
- int type() const;
- void setFrameIcon(const QString& frameIconFileName);
- void setAsStickyButton(bool isSticky);
- bool isStickyButton() const;
- void setLatch(bool enable);
- bool isLatched() const;
- void setInitialSize(const QSizeF& initialSize);
-
-signals:
- void enteredInNonStickyRegion();
-
-protected:
- void mousePressEvent(QGraphicsSceneMouseEvent *event);
- void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
- void resizeEvent(QGraphicsSceneResizeEvent *event);
- void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
- void gestureEvent(QGestureEvent *event);
- void setBackground(const QString& backgroundFrameFilename);
- virtual void changeEvent( QEvent *event );
- virtual void updatePrimitives();
- QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
- QVariant itemChange( GraphicsItemChange change, const QVariant & value );
-
-protected:
- HbTouchKeypadButtonPrivate * const d_ptr;
-
-private:
- Q_DECLARE_PRIVATE_D(d_ptr, HbTouchKeypadButton)
- Q_DISABLE_COPY(HbTouchKeypadButton)
-};
-
-#endif // HB_TOUCH_KEYPAD_BUTTON_H
-
-// End of file
-
--- a/src/hbplugins/inputmethods/touchinput/touchinput.pro Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/touchinput.pro Fri Jun 11 13:58:22 2010 +0300
@@ -54,9 +54,7 @@
HEADERS += ..\common\hbinputabstractbase.h
HEADERS += hbinputprediction12keyhandler_p.h
HEADERS += hbinputbasic12keyhandler_p.h
-HEADERS += hbinputbasic12keythaihandler.h
-HEADERS += hbinputprediction12keythaihandler.h
-HEADERS += hbinputthaispecialpopup.h
+HEADERS += ..\common\hbinputspellquerydialog.h
HEADERS += hbinput12keytouchkeyboard.h
HEADERS += hbinput12keytouchkeyboard_p.h
HEADERS += hbinputqwerty10x4touchkeyboard.h
@@ -65,7 +63,6 @@
HEADERS += hbinputqwerty11x4touchkeyboard_p.h
HEADERS += hbinputqwertynumerictouchkeyboard.h
HEADERS += hbinputqwertynumerictouchkeyboard_p.h
-HEADERS += hbinputtouchkeypadbutton.h
SOURCES = virtual12key.cpp
SOURCES += virtualqwerty.cpp
@@ -81,14 +78,11 @@
SOURCES += hbinputnumericqwertyhandler.cpp
SOURCES += hbinputnumeric12keyhandler.cpp
SOURCES += ..\common\hbinputabstractbase.cpp
-SOURCES += hbinputbasic12keythaihandler.cpp
-SOURCES += hbinputprediction12keythaihandler.cpp
-SOURCES += hbinputthaispecialpopup.cpp
SOURCES += hbinput12keytouchkeyboard.cpp
SOURCES += hbinputqwerty10x4touchkeyboard.cpp
SOURCES += hbinputqwerty11x4touchkeyboard.cpp
SOURCES += hbinputqwertynumerictouchkeyboard.cpp
-SOURCES += hbinputtouchkeypadbutton.cpp
+SOURCES += ..\common\hbinputspellquerydialog.cpp
symbian {
TARGET.EPOCALLOWDLLDATA = 1
--- a/src/hbplugins/inputmethods/touchinput/virtual12key.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/virtual12key.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -47,12 +47,9 @@
//User includes
#include "hbinput12keytouchkeyboard.h"
-#include "hbinputthaispecialpopup.h"
#include "hbinputbasic12keyhandler.h"
#include "hbinputprediction12keyhandler.h"
#include "hbinputnumeric12keyhandler.h"
-#include "hbinputbasic12keythaihandler.h"
-#include "hbinputprediction12keythaihandler.h"
const int HbSmileyNumberOfRows = 5;
const int HbSmileyNumberOfColumns = 5;
@@ -71,7 +68,6 @@
: mCurrentKeypad(0),
mItutKeypad(0),
mSctKeypad(0),
- mThaiSpecialChar(0),
mKeymap(0),
mOrientationAboutToChange(false),
mCandidatePopup(0),
@@ -87,14 +83,12 @@
mBasicModeHandler = new HbInputBasic12KeyHandler(this);
mPredictionModeHandler = new HbInputPrediction12KeyHandler(this);
mNumericModeHandler = new HbInputNumeric12KeyHandler(this);
- mBasic12keyThaiHandler = new HbInputBasic12KeyThaiHandler(this);
- mPrediction12keyThaiHandler = new HbInputPrediction12KeyThaiHandler(this);
+
mActiveModeHandler = mBasicModeHandler;
mBasicModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionInit);
mPredictionModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionInit);
mNumericModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionInit);
- mPrediction12keyThaiHandler->actionHandler(HbInputModeHandler::HbInputModeActionInit);
// let's connect prediction mode handler with latin basic mode handler. It is required incase we Qt::key_0 is pressed in prediction mode
// key
@@ -102,10 +96,6 @@
mBasicModeHandler, SLOT(filterEvent(const QKeyEvent *)));
connect(mPredictionModeHandler, SIGNAL(passActionHandler(HbInputModeAction )),
mBasicModeHandler, SLOT(actionHandler(HbInputModeAction )));
- connect(mPrediction12keyThaiHandler, SIGNAL(passFilterEvent(const QKeyEvent *)),
- mBasicModeHandler, SLOT(filterEvent(const QKeyEvent *)));
- connect(mPrediction12keyThaiHandler, SIGNAL(passActionHandler(HbInputModeAction )),
- mBasicModeHandler, SLOT(actionHandler(HbInputModeAction )));
connect(HbInputSettingProxy::instance(), SIGNAL(predictiveInputStateChanged(HbKeyboardSettingFlags,bool)), this, SLOT(predictiveInputStateChanged(HbKeyboardSettingFlags,bool)));
}
@@ -128,20 +118,14 @@
mSctKeypad = 0;
delete mCandidatePopup;
mCandidatePopup = 0;
- delete mThaiSpecialChar;
- mThaiSpecialChar = 0;
-
+
// free mode handlers
delete mBasicModeHandler;
mBasicModeHandler = 0;
delete mPredictionModeHandler;
mPredictionModeHandler = 0;
delete mNumericModeHandler;
- mNumericModeHandler = 0;
- delete mBasic12keyThaiHandler;
- mBasic12keyThaiHandler = 0;
- delete mPrediction12keyThaiHandler;
- mPrediction12keyThaiHandler = 0;
+ mNumericModeHandler = 0;
}
/*!
@@ -195,7 +179,6 @@
//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(chrSelected(QString)), this, SLOT(thaiSctCharacterSelected(QString)));
tempKeypad->setRockerVisible(true);
return tempKeypad;
}
@@ -255,6 +238,7 @@
connect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)),
mActiveModeHandler, SLOT(cursorPositionChanged(int, int)));
}
+ HbInputAbstractMethod::focusReceived();
}
/*!
@@ -262,8 +246,10 @@
*/
void HbVirtual12Key::focusLost(bool focusSwitch)
{
- // inform the active mode handler about the focus lost event.
- mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionFocusLost);
+ if(mActiveModeHandler) {
+ // inform the active mode handler about the focus lost event.
+ mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionFocusLost);
+ }
if (focusObject()) {
disconnect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)),
@@ -289,9 +275,6 @@
mVkbHost->closeKeypad(!stateChangeInProgress());
// set mCurrentKeypad to null.
mCurrentKeypad = 0;
- if (mThaiSpecialChar) {
- mThaiSpecialChar->hide();
- }
if (mCandidatePopup) {
mCandidatePopup->hide();
}
@@ -311,7 +294,7 @@
if(!keypadToOpen) {
return;
}
- bool wasKeypadOpen = false;
+ bool disableAnimation = false;
// see if we are trying to open a different keypad than what is already opened.
if (mCurrentKeypad != keypadToOpen) {
// close currently open keypad. We always close keypad without animation
@@ -321,13 +304,19 @@
mVkbHost->closeKeypad(false);
// when their is a keypad that needs to be closed before opening the new keypad, we don't
// want to animate the opening of new keypad.
- wasKeypadOpen = true;
+ disableAnimation = true;
}
}
// Close candidate popup if open
if (mCandidatePopup) {
mCandidatePopup->hide();
}
+
+ QObject::disconnect(mCurrentKeypad,SIGNAL(aboutToActivateCustomAction(HbAction*)),
+ this,SLOT(aboutToActivateCustomAction(HbAction*)));
+ QObject::connect(keypadToOpen,SIGNAL(aboutToActivateCustomAction(HbAction*)),
+ this,SLOT(aboutToActivateCustomAction(HbAction*)));
+
// assign new keypad to be opened to varable mCurrentKeypad
mCurrentKeypad = keypadToOpen;
@@ -338,7 +327,7 @@
if (inMinimizedMode) {
mVkbHost->openMinimizedKeypad(mCurrentKeypad, this);
} else {
- mVkbHost->openKeypad(mCurrentKeypad, this, (!stateChangeInProgress() && !wasKeypadOpen));
+ mVkbHost->openKeypad(mCurrentKeypad, this, (!stateChangeInProgress() && !disableAnimation));
}
connect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)),
mVkbHost, SLOT(ensureCursorVisibility()));
@@ -346,6 +335,15 @@
}
/*!
+vkb widget is about to call a custom action that is mapped to one of the keypad buttons.
+*/
+void HbVirtual12Key::aboutToActivateCustomAction(HbAction *custAction)
+{
+ Q_UNUSED(custAction);
+ mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionCommit);
+}
+
+/*!
The mouse event handler for the input method. Launches the candidate list if the mouse is clicked on the
pre-editing text.
*/
@@ -467,7 +465,7 @@
loadKeymap(newLanguage);
// inform all the mode handler about the language change.
mPredictionModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionPrimaryLanguageChanged);
- if (mCurrentKeypad) {
+ if (focusObject() && mCurrentKeypad) {
mCurrentKeypad->animKeyboardChange();
}
}
@@ -513,18 +511,7 @@
}
HbInputModeHandler *previousModeHandler = mActiveModeHandler;
- if (HbInputSettingProxy::instance()->globalInputLanguage() == QLocale::Thai &&
- usePrediction() && newState.inputMode() != HbInputModeNumeric) {
- mActiveModeHandler = mPrediction12keyThaiHandler;
- // by passing HbInputModeActionFocusRecieved we will be setting the candidate list and keypad
- mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionFocusRecieved);
- } else if (HbInputSettingProxy::instance()->globalInputLanguage() == QLocale::Thai &&
- !usePrediction() && newState.inputMode() != HbInputModeNumeric &&
- ((HbEditorConstraintLatinAlphabetOnly | HbEditorConstraintAutoCompletingField)!=focusObject()->editorInterface().inputConstraints())) {
- mActiveModeHandler = mBasic12keyThaiHandler;
- // by passing HbInputModeActionFocusRecieved we will be setting the candidate list and keypad
- mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionFocusRecieved);
- } else 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);
@@ -551,8 +538,7 @@
// Auto Completion part needs to be committed as well on mode change.
previousModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionCommit);
- if (mActiveModeHandler == mPredictionModeHandler ||
- mActiveModeHandler == mPrediction12keyThaiHandler) {
+ if (mActiveModeHandler == mPredictionModeHandler) {
// lets set candidate list and keypad type to the engine.
mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionSetCandidateList);
mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionSetKeypad);
@@ -586,15 +572,9 @@
if (mPredictionModeHandler) {
mPredictionModeHandler->setKeymap(mKeymap);
}
- if (mNumericModeHandler) {
+ if(mNumericModeHandler) {
mNumericModeHandler->setKeymap(mKeymap);
- }
- if (mBasic12keyThaiHandler) {
- mBasic12keyThaiHandler->setKeymap(mKeymap);
- }
- if (mPrediction12keyThaiHandler) {
- mPrediction12keyThaiHandler->setKeymap(mKeymap);
- }
+ }
}
}
}
@@ -655,46 +635,6 @@
switchToAlphaMode();
}
}
-/*!
-Returns previous character from editor
-*/
-uint HbVirtual12Key::previousChar()
-{
- if (focusObject()) {
- int cursorPosition = focusObject()->editorCursorPosition();
- if (cursorPosition) {
- QString editorText = focusObject()->editorSurroundingText();
- return((editorText.at(cursorPosition-1)).unicode());
- }
- }
- return 0;
-}
-/*!
-Shows the Thai specific special characters
-*/
-void HbVirtual12Key::showThaiSpecialCharacters(uint buttonId)
-{
- uint prevChar = previousChar();
- int screenWidth = 0;
- int screenHeight = 0;
- //Get the sceen size from device profile
- if (mCurrentKeypad) {
- screenWidth = HbDeviceProfile::profile(mCurrentKeypad).logicalSize().width();
- screenHeight = HbDeviceProfile::profile(mCurrentKeypad).logicalSize().height();
- }
- //Create Thai special popup if not created
- if( !mThaiSpecialChar) {
- mThaiSpecialChar = new HbInputThaiSpecialPopup(buttonId,prevChar,0);
- connect(mThaiSpecialChar, SIGNAL(chrSelected(QString)),
- this, SLOT(thaiSctCharacterSelected(QString)));
- }
- //Set Geometry and Layout for popup
- if (mThaiSpecialChar) {
- mThaiSpecialChar->setGeometry(QRectF(0,screenHeight/2,screenWidth,screenHeight/2));
- mThaiSpecialChar->setPopupLayout(mKeymap,prevChar,buttonId,screenWidth,screenHeight/2);
- mThaiSpecialChar->show();
- }
-}
/*!
Shows the special character table. Re-implements the same method from HbInputMethod.
@@ -751,8 +691,9 @@
if (!mCandidatePopup) {
mCandidatePopup = new HbCandidateList(this);
connect(mCandidatePopup, SIGNAL(candidateSelected(int,QString)), this, SLOT(candidatePopupClosed(int,QString)));
+ QObject::connect(mCandidatePopup,SIGNAL(launchSpellQueryDialog()),mPredictionModeHandler,SLOT(launchSpellQueryDialog()));
}
- mCandidatePopup->populateList(candidates);
+ mCandidatePopup->populateList(candidates,true);
mCandidatePopup->setModal(true);
QSizeF candListSize = mCandidatePopup->size();
@@ -802,14 +743,6 @@
mActiveModeHandler->smileySelected(smiley);
}
-void HbVirtual12Key::thaiSctCharacterSelected(QString sctChar)
-{
- mActiveModeHandler->sctCharacterSelected(sctChar);
- /* Update the text case */
- updateState();
-}
-
-
void HbVirtual12Key::selectSpecialCharacterTableMode()
{
if (mItutKeypad) {
@@ -843,6 +776,7 @@
if (!mCandidatePopup) {
mCandidatePopup = new HbCandidateList(this);
connect(mCandidatePopup, SIGNAL(candidateSelected(int,QString)), this, SLOT(candidatePopupClosed(int,QString)));
+ QObject::connect(mCandidatePopup,SIGNAL(launchSpellQueryDialog()),mPredictionModeHandler,SLOT(launchSpellQueryDialog()));
}
if (candidates.count() > 0) {
--- a/src/hbplugins/inputmethods/touchinput/virtual12key.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/virtual12key.h Fri Jun 11 13:58:22 2010 +0300
@@ -36,7 +36,6 @@
class HbInputVkbWidget;
class Hb12KeyTouchKeyboard;
class HbSctKeyboard;
-class HbInputThaiSpecialPopup;
class HbCandidateList;
class HbPredictionEngine;
class HbAction;
@@ -46,8 +45,6 @@
class HbInputPrediction12KeyHandler;
class HbInputBasic12KeyHandler;
class HbInputNumeric12KeyHandler;
-class HbInputBasic12KeyThaiHandler;
-class HbInputPrediction12KeyThaiHandler;
class HbVirtual12Key : public HbInputAbstractMethod
{
@@ -92,9 +89,7 @@
void launchAutoCompletionPopup(const QStringList &candidates);
void closeAutoCompletionPopup();
void switchMode(int keyCode);
- void showThaiSpecialCharacters(uint buttonId);
void starKeySelected();
- uint previousChar();
HbKeyboardType currentKeyboardType() const;
private:
void openKeypad(HbInputVkbWidget * keypadToOpen,bool inMinimizedMode = false);
@@ -115,7 +110,7 @@
void mouseMovedOutOfButton();
void smileySelected(QString smiley);
void predictiveInputStateChanged(HbKeyboardSettingFlags keyboardType, bool newState);
- void thaiSctCharacterSelected(QString sctChar);
+ void aboutToActivateCustomAction(HbAction *custAction);
private:
// mCurrentKeypad contains currently active keypad, we dont need to have
@@ -125,8 +120,6 @@
QPointer<Hb12KeyTouchKeyboard> mItutKeypad;
// contains sct keypad
QPointer<HbSctKeyboard> mSctKeypad;
- // contains Thai special characters
- QPointer<HbInputThaiSpecialPopup> mThaiSpecialChar;
//Owned by the keymap factory
const HbKeymap* mKeymap;
@@ -141,9 +134,7 @@
HbInputPrediction12KeyHandler *mPredictionModeHandler;
HbInputBasic12KeyHandler *mBasicModeHandler;
HbInputNumeric12KeyHandler *mNumericModeHandler;
- HbInputBasic12KeyThaiHandler *mBasic12keyThaiHandler;
- HbInputPrediction12KeyThaiHandler *mPrediction12keyThaiHandler;
-
+
QPointer<HbVkbHost> mVkbHost;
bool mKeyboardChangeAlreadyInprogress;
};
--- a/src/hbplugins/inputmethods/touchinput/virtualqwerty.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/virtualqwerty.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -158,7 +158,7 @@
else if (automaticTextCaseNeeded()) {
state.setTextCase(HbTextCaseAutomatic);
}
- state.inputMode() = HbInputModeDefault;
+ state.setInputMode(HbInputModeDefault);
activateState(state);
inputStateToEditor(state);
}
@@ -207,6 +207,7 @@
disconnect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)), mActiveModeHandler, SLOT(cursorPositionChanged(int, int)));
connect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)), mActiveModeHandler, SLOT(cursorPositionChanged(int, int)));
}
+ HbInputAbstractMethod::focusReceived();
}
void HbVirtualQwerty::focusLost(bool focusSwitch)
@@ -244,7 +245,7 @@
if(!keypadToOpen) {
return;
}
- bool wasKeypadOpen = false;
+ bool disableAnimation = false;
// see if we are trying to open a different keypad than what is already opened.
if (mCurrentKeypad != keypadToOpen) {
// close currently open keypad. We always close keypad without animation
@@ -254,13 +255,19 @@
mVkbHost->closeKeypad(false);
// when their is a keypad that needs to be closed before opening the new keypad, we don't
// want to animate the opening of new keypad.
- wasKeypadOpen = true;
+ disableAnimation = true;
}
}
// Close candidate popup if open
if (mCandidatePopup) {
mCandidatePopup->hide();
}
+
+ QObject::disconnect(mCurrentKeypad,SIGNAL(aboutToActivateCustomAction(HbAction*)),
+ this,SLOT(aboutToActivateCustomAction(HbAction*)));
+ QObject::connect(keypadToOpen,SIGNAL(aboutToActivateCustomAction(HbAction*)),
+ this,SLOT(aboutToActivateCustomAction(HbAction*)));
+
// assign new keypad to be opened to varable mCurrentKeypad
mCurrentKeypad = keypadToOpen;
@@ -269,26 +276,22 @@
if (inMinimizedMode) {
mVkbHost->openMinimizedKeypad(mCurrentKeypad, this);
} else {
- mVkbHost->openKeypad(mCurrentKeypad, this, !wasKeypadOpen);
+ mVkbHost->openKeypad(mCurrentKeypad, this, !disableAnimation);
}
- // If previous focused editor was numeric, prediction is disabled.
- // Enable prediction if prediction was set in alpha editor prior
- // to focusing numeric editor.
-/* if (mPrevKeypadMode == EModeAbc && HbInputModeLatinPredictive == mPreviousInputMode) {
- mMode = HbInputModeLatinPredictive;
- } else if (mPrevKeypadMode == EModeNumeric && HbInputModeLatinPredictive == mMode) {
- // If the previous focused editor was alpha and if prediction is
- // on, disable prediction. Store the previous state because if
- // any alpha editor is focused next, the previous prediction state
- // should be enabled.
- mMode = HbInputModeDefault;
- mPreviousInputMode = HbInputModeLatinPredictive;
- } */
connect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)), mVkbHost, SLOT(ensureCursorVisibility()));
}
}
+/*!
+vkb widget is about to call a custom action that is mapped to one of the keypad buttons.
+*/
+void HbVirtualQwerty::aboutToActivateCustomAction(HbAction *custAction)
+{
+ Q_UNUSED(custAction);
+ mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionCommit);
+}
+
HbInputVkbWidget* HbVirtualQwerty::constructKeyboard(HbKeypadMode currentInputType)
{
HbInputVkbWidget *keyboard = 0;
@@ -332,6 +335,9 @@
if (mOrientationAboutToChange) {
mOrientationAboutToChange = false;
}
+ if (mExactWordPopup && mExactWordPopup->isVisible()) {
+ mExactWordPopup->hide();
+ }
}
void HbVirtualQwerty::keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod vkbCloseMethod)
--- a/src/hbplugins/inputmethods/touchinput/virtualqwerty.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/virtualqwerty.h Fri Jun 11 13:58:22 2010 +0300
@@ -41,6 +41,7 @@
class HbCandidateList;
class HbExactWordPopup;
class HbSctKeyboard;
+class HbAction;
class HbInputModeHandler;
class HbInputBasicQwertyHandler;
@@ -74,6 +75,7 @@
void smileySelected(QString smiley);
void predictiveInputStateChanged(HbKeyboardSettingFlags keyboardType, bool newState);
void candidatePopupClosed(int closingKey, const QString& candidate);
+ void aboutToActivateCustomAction(HbAction *custAction);
public: // From HbInputMethod
void focusReceived();
--- a/src/hbservers/hbsplashgenerator/hbsplashblacklist_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/hbsplashblacklist_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -34,23 +34,23 @@
{
return QList<quint32>()
- // started on phone boot
- << 0x20022f35 // app/homescreen/homescreenapp/hsapplication
- << 0x100058b3 // app/phone/phoneapp/phoneui2
- << 0x2002e67a // app/phone/phoneengine/networkhandlingstarter
+ // started on phone boot
+ << 0x20022f35 // app/homescreen/homescreenapp/hsapplication
+ << 0x100058b3 // app/phone/phoneapp/phoneui2
+ << 0x2002e67a // app/phone/phoneengine/networkhandlingstarter
- // uses hbapplication but not hbmainwindow
- << 0x1028339d // app/devicecontrol/deviceupdateui/deviceupdateqtsp
- << 0x2001fe74 // app/messaging/messagingapp/msgnotifications/msgerrornotifier
- << 0xe0022e73 // mw/securitysrv/securitydialogs/autolocksrv (this uid cannot be the final one, can it...)
+ // uses hbapplication but not hbmainwindow
+ << 0x1028339d // app/devicecontrol/deviceupdateui/deviceupdateqtsp
+ << 0x2001fe74 // app/messaging/messagingapp/msgnotifications/msgerrornotifier
+ << 0xe0022e73 // mw/securitysrv/securitydialogs/autolocksrv (this uid cannot be the final one, can it...)
- // started to background and may not need splash anyway
- << 0x2002e669 // mw/webruntime/app/widget/wrtwidgetui
+ // started to background and may not need splash anyway
+ << 0x2002e669 // mw/webruntime/app/widget/wrtwidgetui
- // probably launched on first boot, including for now to prevent mess in startup sequence
- << 0x20026f95 // app/firsttimeuse/ftuapplication
+ // probably launched on first boot, including for now to prevent mess in startup sequence
+ << 0x20026f95 // app/firsttimeuse/ftuapplication
- ;
+ ;
}
#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbservers/hbsplashgenerator/hbsplashcompositor_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** 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 HbServers 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 HBSPLASHCOMPOSITOR_P_H
+#define HBSPLASHCOMPOSITOR_P_H
+
+#include <QObject>
+
+class HbSplashCompositorInterface
+{
+public:
+ virtual ~HbSplashCompositorInterface() { }
+ virtual void release() = 0;
+ virtual void composeToBitmap(void *bitmap,
+ Qt::Orientation orientation,
+ int splashExtraFlags) = 0;
+};
+
+#endif
--- a/src/hbservers/hbsplashgenerator/hbsplashdirs_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/hbsplashdirs_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -41,8 +41,7 @@
TInt drive;
TChar driveLetter;
if (DriveInfo::GetDefaultDrive(driveType, drive) == KErrNone
- && DriveInfo::GetDefaultDrive(driveType, driveLetter) == KErrNone)
- {
+ && DriveInfo::GetDefaultDrive(driveType, driveLetter) == KErrNone) {
bool driveUsable = true;
CCoeEnv *env = CCoeEnv::Static();
if (env) {
@@ -53,11 +52,10 @@
// 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)
- || !(driveStatus & DriveInfo::EDrivePresent)
- || !(driveStatus & DriveInfo::EDriveFormatted)
- || (driveStatus & DriveInfo::EDriveCorrupt)
- || (driveStatus & DriveInfo::EDriveInUse))
- {
+ || !(driveStatus & DriveInfo::EDrivePresent)
+ || !(driveStatus & DriveInfo::EDriveFormatted)
+ || (driveStatus & DriveInfo::EDriveCorrupt)
+ || (driveStatus & DriveInfo::EDriveInUse)) {
qDebug("[hbsplash] drive not usable, skipping");
driveUsable = false;
}
--- a/src/hbservers/hbsplashgenerator/hbsplashgen_server_symbian.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/hbsplashgen_server_symbian.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -29,6 +29,7 @@
#include "hbsplashdefs_p.h"
#include "hbsplashblacklist_p.h"
#include "hbsplash_direct_symbian_p.h"
+#include "hbsplashcompositor_p.h"
#include <e32base.h>
#include <f32file.h>
#include <fbs.h>
@@ -54,12 +55,12 @@
CEikAppUi *HbSplashGenDocument::CreateAppUiL()
{
qDebug() << PRE << "using custom appui";
- return new (ELeave) HbSplashGenAppUi;
+ return new(ELeave) HbSplashGenAppUi;
}
CApaDocument *HbSplashGenApplication::CreateDocumentL()
{
- return new (ELeave) HbSplashGenDocument(*this);
+ return new(ELeave) HbSplashGenDocument(*this);
}
class HbSplashGenServerSymbian : public CServer2
@@ -69,22 +70,39 @@
~HbSplashGenServerSymbian();
CSession2 *NewSessionL(const TVersion &version, const RMessage2 &message) const;
- void setSplashScreenDir(const QString &dir) { mSplashScreenDir = dir; }
- void setSplashScreenDirContents(const QStringList &entries) { mSplashScreenDirEntries = entries; }
- bool startupSuccess() const { return mStartupSuccess; }
+ void setSplashScreenDir(const QString &dir) {
+ mSplashScreenDir = dir;
+ }
+ void setSplashScreenDirContents(const QStringList &entries) {
+ mSplashScreenDirEntries = entries;
+ }
+ bool startupSuccess() const {
+ return mStartupSuccess;
+ }
void clearBitmapCache();
+ void addCompositor(HbSplashCompositorInterface *compositor) {
+ mCompositors.append(compositor);
+ }
bool processGetSplash(const RMessage2 &message);
private:
- bool completeGetSplash(const RMessage2 &message, const QString &fileName);
- CFbsBitmap *getCachedBitmap(const QString &fileName) const;
- void cacheBitmap(const QString &key, CFbsBitmap *bmp);
+ struct BitmapCacheData {
+ CFbsBitmap *mBitmap;
+ int mExtraSplashFlags;
+ Qt::Orientation mOrientation;
+ };
+
+ bool completeGetSplash(const RMessage2 &message, const QString &fileName, const QString &ori);
+ void completeWithBitmap(const RMessage2 &message, const BitmapCacheData &data);
+ const BitmapCacheData *getCachedBitmap(const QString &fileName) const;
+ void cacheBitmap(const QString &key, const BitmapCacheData &data);
bool mStartupSuccess;
RFs mFs;
QString mSplashScreenDir;
QStringList mSplashScreenDirEntries;
- QList< QPair<QString, CFbsBitmap *> > mBitmaps;
+ QList< QPair<QString, BitmapCacheData> > mBitmaps;
+ QList<HbSplashCompositorInterface *> mCompositors;
};
class HbSplashGenServerSession : public CSession2
@@ -116,7 +134,8 @@
delete mServer;
}
-void HbSplashGenServer::onOutputDirContentsUpdated(const QString &dir, const QStringList &entries)
+void HbSplashGenServer::onOutputDirContentsUpdated(const QString &dir,
+ const QStringList &entries)
{
qDebug() << PRE << "splash screen dir contents received" << dir;
qDebug() << PRE << entries;
@@ -134,6 +153,11 @@
return mServer->startupSuccess();
}
+void HbSplashGenServer::addCompositor(HbSplashCompositorInterface *compositor)
+{
+ mServer->addCompositor(compositor);
+}
+
HbSplashGenServerSymbian::HbSplashGenServerSymbian()
: CServer2(CActive::EPriorityHigh)
{
@@ -162,59 +186,66 @@
clearBitmapCache();
}
-CSession2 *HbSplashGenServerSymbian::NewSessionL(const TVersion &version, const RMessage2 &message) const
+CSession2 *HbSplashGenServerSymbian::NewSessionL(const TVersion &version,
+ const RMessage2 &message) const
{
Q_UNUSED(message);
TVersion v(hbsplash_version_major, hbsplash_version_minor, hbsplash_version_build);
if (!User::QueryVersionSupported(v, version)) {
User::Leave(KErrNotSupported);
}
- return new (ELeave) HbSplashGenServerSession(const_cast<HbSplashGenServerSymbian *>(this));
+ return new(ELeave) HbSplashGenServerSession(const_cast<HbSplashGenServerSymbian *>(this));
}
void HbSplashGenServerSymbian::clearBitmapCache()
{
for (int i = 0, ie = mBitmaps.count(); i != ie; ++i) {
- delete mBitmaps.at(i).second;
+ delete mBitmaps.at(i).second.mBitmap;
}
mBitmaps.clear();
}
-CFbsBitmap *HbSplashGenServerSymbian::getCachedBitmap(const QString &fileName) const
+const HbSplashGenServerSymbian::BitmapCacheData *HbSplashGenServerSymbian::getCachedBitmap(
+ const QString &fileName) const
{
for (int i = 0, ie = mBitmaps.count(); i != ie; ++i) {
if (!mBitmaps.at(i).first.compare(fileName, Qt::CaseInsensitive)) {
- return mBitmaps.at(i).second;
+ return &mBitmaps.at(i).second;
}
}
return 0;
}
-void HbSplashGenServerSymbian::cacheBitmap(const QString &key, CFbsBitmap *bmp)
+void HbSplashGenServerSymbian::cacheBitmap(const QString &key, const BitmapCacheData &data)
{
while (mBitmaps.count() >= bitmap_cache_limit) {
- delete mBitmaps.at(0).second;
+ delete mBitmaps.at(0).second.mBitmap;
mBitmaps.removeAt(0);
}
- QPair<QString, CFbsBitmap *> entry(key, bmp);
- mBitmaps.append(entry);
+ mBitmaps.append(QPair<QString, BitmapCacheData>(key, data));
}
-inline void completeWithBitmap(const RMessage2 &message, CFbsBitmap *bmp)
+void HbSplashGenServerSymbian::completeWithBitmap(const RMessage2 &message,
+ const BitmapCacheData &data)
{
- TPckg<TInt> bmpHandle(bmp->Handle());
+ foreach(HbSplashCompositorInterface * compositor, mCompositors) {
+ compositor->composeToBitmap(data.mBitmap, data.mOrientation, data.mExtraSplashFlags);
+ }
+ TPckg<TInt> bmpHandle(data.mBitmap->Handle());
message.Write(3, bmpHandle);
message.Complete(KErrNone);
}
-bool HbSplashGenServerSymbian::completeGetSplash(const RMessage2 &message, const QString &fileName)
+bool HbSplashGenServerSymbian::completeGetSplash(const RMessage2 &message,
+ const QString &fileName,
+ const QString &ori)
{
bool wantsBitmap = message.Function() == HbSplashSrvGetSplashData;
if (wantsBitmap) {
- CFbsBitmap *cachedBitmap = getCachedBitmap(fileName);
- if (cachedBitmap) {
+ const BitmapCacheData *cachedBitmapData = getCachedBitmap(fileName);
+ if (cachedBitmapData) {
qDebug() << PRE << "returning cached bitmap for" << fileName;
- completeWithBitmap(message, cachedBitmap);
+ completeWithBitmap(message, *cachedBitmapData);
return true;
}
}
@@ -225,11 +256,17 @@
RFile f;
if (f.Open(mFs, nativeNameDes, EFileRead | EFileShareReadersOrWriters) == KErrNone) {
if (wantsBitmap) {
- CFbsBitmap *bmp = static_cast<CFbsBitmap *>(HbSplashDirectSymbian::load(&f, 0));
+ BitmapCacheData data;
+ data.mBitmap = static_cast<CFbsBitmap *>(
+ HbSplashDirectSymbian::load(&f, &data.mExtraSplashFlags));
f.Close();
- if (bmp) {
- cacheBitmap(fileName, bmp);
- completeWithBitmap(message, bmp);
+ if (data.mBitmap) {
+ data.mOrientation = Qt::Vertical;
+ if (!ori.compare(QLatin1String("lsc"), Qt::CaseInsensitive)) {
+ data.mOrientation = Qt::Horizontal;
+ }
+ cacheBitmap(fileName, data);
+ completeWithBitmap(message, data);
} else {
qWarning() << PRE << "splash load failed";
return false;
@@ -329,14 +366,14 @@
usingAppSpecific = true;
}
- bool completed = completeGetSplash(message, name);
+ bool completed = completeGetSplash(message, name, orientation);
if (!completed) {
// If the screens are just being regenerated then there is a chance that
// the app-specific file is not yet ready but the generic one is already
// there (and the directory listing checked before is out-of-date). So
// try the generic file too.
if (usingAppSpecific) {
- completed = completeGetSplash(message, genericName);
+ completed = completeGetSplash(message, genericName, orientation);
}
if (!completed) {
qWarning() << PRE << "could not complete getSplash request";
--- a/src/hbservers/hbsplashgenerator/hbsplashgen_server_symbian_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/hbsplashgen_server_symbian_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -34,6 +34,7 @@
class HbSplashGenerator;
class HbSplashGenServerSymbian;
+class HbSplashCompositorInterface;
class HbSplashGenServer : public QObject
{
@@ -43,6 +44,7 @@
HbSplashGenServer(HbSplashGenerator *generator);
~HbSplashGenServer();
bool startupSuccess() const;
+ void addCompositor(HbSplashCompositorInterface *compositor);
private slots:
void onOutputDirContentsUpdated(const QString &dir, const QStringList &entries);
--- a/src/hbservers/hbsplashgenerator/hbsplashgenerator.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/hbsplashgenerator.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -62,12 +62,16 @@
const char *last_output_dir_key = "lastoutdir";
HbSplashGenerator::HbSplashGenerator()
- : mBusy(false), mForceRegen(false), mMainWindow(0), mFirstRegenerate(true)
+ : mMainWindowLocked(false),
+ mProcessQueuePending(false),
+ mForceRegen(false),
+ mMainWindow(0),
+ mFirstRegenerate(true)
{
#if defined(Q_OS_SYMBIAN)
CCoeEnv::Static()->FsSession().CreatePrivatePath(EDriveC);
QString iniFileName = QString("c:/private/%1/hbsplashgen.ini")
- .arg(QString::number(hbsplash_server_uid3.iUid, 16));
+ .arg(QString::number(hbsplash_server_uid3.iUid, 16));
mSettings = new QSettings(iniFileName, QSettings::IniFormat, this);
#else
mSettings = new QSettings("Nokia", "HbSplash", this);
@@ -131,7 +135,7 @@
// Watch also the directories containing splashml files. Files may
// be added/updated at any time.
connect(&mFsWatcher, SIGNAL(directoryChanged(QString)), SLOT(onDirectoryChanged(QString)));
- foreach (const QString &dir, hbsplash_splashml_dirs()) {
+ foreach(const QString & dir, hbsplash_splashml_dirs()) {
// Check for directory existence before calling addPath() to
// avoid printing warnings.
if (QDir(dir).exists()) {
@@ -154,11 +158,10 @@
qDebug() << PRE << "last regen:" << lastTheme << lastLang << lastFileCount << lastOutputDir
<< "current:" << currentTheme << currentLang << currentFileCount << currentOutputDir;
if (mForceRegen
- || currentTheme != lastTheme
- || currentLang != lastLang
- || currentFileCount != lastFileCount
- || currentOutputDir != lastOutputDir)
- {
+ || currentTheme != lastTheme
+ || currentLang != lastLang
+ || currentFileCount != lastFileCount
+ || currentOutputDir != lastOutputDir) {
QMetaObject::invokeMethod(this, "regenerate", Qt::QueuedConnection);
}
}
@@ -188,7 +191,7 @@
QDir outDir(hbsplash_output_dir());
if (outDir.exists()) {
QStringList names = outDir.entryList(QStringList() << "*", QDir::Files);
- foreach (const QString &name, names) {
+ foreach(const QString & name, names) {
outDir.remove(name);
}
}
@@ -273,13 +276,15 @@
qDebug() << PRE << "processQueue() over";
return;
}
- // If a previous splash generation is still in progress then do nothing.
- if (mBusy) {
+ // 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";
return;
}
try {
- mBusy = true;
+ mProcessQueuePending = false;
mItem = mQueue.dequeue();
mItemTime.start();
log("generating splash screen", mItem.mThemeName, mItem.mOrientation);
@@ -302,7 +307,7 @@
qDebug() << PRE << "processQueue() over";
}
-void HbSplashGenerator::ensureMainWindow()
+HbMainWindow *HbSplashGenerator::ensureMainWindow()
{
if (!mMainWindow) {
// The FixedVertical flag is used just to disable the sensor-based
@@ -312,6 +317,7 @@
// construction is done right now.
HbMainWindowPrivate::d_ptr(mMainWindow)->_q_delayedConstruction();
}
+ return mMainWindow;
}
void HbSplashGenerator::processWindow()
@@ -322,13 +328,13 @@
qDebug() << PRE << "total time for screen (ms):" << mItemTime.elapsed();
QList<HbView *> views = mMainWindow->views();
- foreach (HbView *view, views) {
+ foreach(HbView * view, views) {
mMainWindow->removeView(view);
delete view;
}
clearTranslators();
- mBusy = false;
+ unlockMainWindowInternal();
QMetaObject::invokeMethod(this, "processQueue", Qt::QueuedConnection);
log("processWindow() over", mItem.mThemeName, mItem.mOrientation);
}
@@ -386,12 +392,6 @@
return splashFile;
}
-// helper to avoid calling the non-const version of QImage::bits()
-inline const uchar *imageBits(const QImage &image)
-{
- return image.bits();
-}
-
bool HbSplashGenerator::saveSpl(const QString &nameWithoutExt, const QImage &image, quint32 extra)
{
QString fn(nameWithoutExt);
@@ -407,7 +407,7 @@
f.write((char *) &bpl, sizeof(quint32));
f.write((char *) &fmt, sizeof(qint32));
f.write((char *) &extra, sizeof(quint32));
- f.write((const char *) imageBits(image), bpl * h);
+ f.write((const char *) image.bits(), bpl * h);
f.close();
return true;
}
@@ -420,10 +420,11 @@
delete mMainWindow;
mMainWindow = 0;
clearTranslators();
- mBusy = false;
+ unlockMainWindowInternal();
+ mProcessQueuePending = false;
}
-QDebug operator<<(QDebug dbg, const HbSplashGenerator::QueueItem& item)
+QDebug operator<<(QDebug dbg, const HbSplashGenerator::QueueItem &item)
{
dbg << "["
<< item.mDocmlFileName
@@ -469,13 +470,13 @@
{
QSet<QString> processedFileNames;
QStringList dirNames(hbsplash_splashml_dirs());
- foreach (const QString &dirName, dirNames) {
+ foreach(const QString & dirName, dirNames) {
QDir dir(dirName);
if (!dir.exists()) {
continue;
}
QStringList entries = dir.entryList(QStringList() << "*.splashml", QDir::Files);
- foreach (const QString &entry, entries) {
+ foreach(const QString & entry, entries) {
// Skip if a file with the same name has already been processed from
// a different location.
if (processedFileNames.contains(entry)) {
@@ -496,10 +497,9 @@
QueueItem item(themeName, orientation);
bool ok = parseSplashml(fullName, item);
if (ok
- && !item.mAppId.isEmpty()
- && !item.mDocmlWidgetName.isEmpty()
- && !item.mDocmlFileName.isEmpty())
- {
+ && !item.mAppId.isEmpty()
+ && !item.mDocmlWidgetName.isEmpty()
+ && !item.mDocmlFileName.isEmpty()) {
// 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);
@@ -533,8 +533,7 @@
ok = false;
break;
} else if (token == QXmlStreamReader::StartElement
- && xml.name() == QLatin1String("hbsplash"))
- {
+ && xml.name() == QLatin1String("hbsplash")) {
docOk = true;
} else if (docOk) {
parseSplashmlElements(xml, item, fullFileName);
@@ -552,8 +551,8 @@
}
void HbSplashGenerator::parseSplashmlElements(QXmlStreamReader &xml,
- QueueItem &item,
- const QString &fullFileName)
+ QueueItem &item,
+ const QString &fullFileName)
{
if (xml.isStartElement()) {
QStringRef name = xml.name();
@@ -563,7 +562,7 @@
item.mDocmlWidgetName = xml.readElementText().trimmed();
} else if (name == QLatin1String("appid") || name == QLatin1String("appuid")) {
item.mAppId = xml.readElementText().trimmed();
- if (item.mAppId.startsWith("0x")) {
+ if (item.mAppId.startsWith(QLatin1String("0x"))) {
item.mAppId.remove(0, 2);
}
} else if (name == QLatin1String("screenid")) {
@@ -571,7 +570,7 @@
} else if (name == QLatin1String("tsappname")) {
item.mTsAppName = xml.readElementText().trimmed();
} else if (name == QLatin1String("view-flags")) {
- item.mViewFlags = xml.readElementText().split(",", QString::SkipEmptyParts);
+ item.mViewFlags = xml.readElementText().split(',', QString::SkipEmptyParts);
for (int i = 0, ie = item.mViewFlags.count(); i != ie; ++i) {
item.mViewFlags[i] = item.mViewFlags[i].trimmed().toLower();
}
@@ -617,7 +616,7 @@
req.mFrameGraphicsType = HbFrameDrawer::ThreePiecesVertical;
} else if (type == QLatin1String("9")) {
req.mFrameGraphicsType = HbFrameDrawer::NinePieces;
- }
+ }
QString z = xml.attributes().value("z").toString().trimmed();
if (z.isEmpty()) {
req.mZValue = -1;
@@ -690,10 +689,12 @@
CustomDocumentLoader loader(mMainWindow, mItem);
QStringList sections;
if (!mItem.mCondSections.isEmpty()) {
- if (mItem.mCondSections.contains("portrait") && mItem.mOrientation == Qt::Vertical) {
- sections << mItem.mCondSections.value("portrait");
- } else if (mItem.mCondSections.contains("landscape") && mItem.mOrientation == Qt::Horizontal) {
- sections << mItem.mCondSections.value("landscape");
+ QLatin1String prtKey("portrait");
+ QLatin1String lscKey("landscape");
+ if (mItem.mCondSections.contains(prtKey) && mItem.mOrientation == Qt::Vertical) {
+ sections << mItem.mCondSections.value(prtKey);
+ } else if (mItem.mCondSections.contains(lscKey) && mItem.mOrientation == Qt::Horizontal) {
+ sections << mItem.mCondSections.value(lscKey);
}
}
sections << mItem.mForcedSections;
@@ -701,7 +702,7 @@
bool ok;
loader.load(mItem.mDocmlFileName, &ok);
if (ok && !sections.isEmpty()) {
- foreach (const QString §ion, sections) {
+ foreach(const QString & section, sections) {
qDebug() << PRE << "loading" << mItem.mDocmlFileName << "section" << section;
loader.load(mItem.mDocmlFileName, section, &ok);
}
@@ -728,8 +729,7 @@
for (int i = 0, ie = mItem.mItemBgGraphics.count(); i != ie; ++i) {
QueueItem::ItemBgGraphicsRequest req = mItem.mItemBgGraphics.at(i);
if ((req.mOrientation == QLatin1String("portrait") && mItem.mOrientation != Qt::Vertical)
- || (req.mOrientation == QLatin1String("landscape") && mItem.mOrientation != Qt::Horizontal))
- {
+ || (req.mOrientation == QLatin1String("landscape") && mItem.mOrientation != Qt::Horizontal)) {
continue;
}
HbWidget *widget = qobject_cast<HbWidget *>(loader.findWidget(req.mTargetWidgetName));
@@ -756,35 +756,34 @@
// view-flags
HbView::HbViewFlags viewFlags = view->viewFlags();
- if (mItem.mViewFlags.contains("tb-minimizable")) {
+ if (mItem.mViewFlags.contains(QLatin1String("tb-minimizable"))) {
viewFlags |= HbView::ViewTitleBarMinimizable;
}
- if (mItem.mViewFlags.contains("tb-minimized")) {
+ if (mItem.mViewFlags.contains(QLatin1String("tb-minimized"))) {
viewFlags |= HbView::ViewTitleBarMinimized;
}
- if (mItem.mViewFlags.contains("tb-hidden")) {
+ if (mItem.mViewFlags.contains(QLatin1String("tb-hidden"))) {
viewFlags |= HbView::ViewTitleBarHidden;
}
- if (mItem.mViewFlags.contains("tb-transparent")) {
+ if (mItem.mViewFlags.contains(QLatin1String("tb-transparent"))) {
viewFlags |= HbView::ViewTitleBarTransparent;
}
- if (mItem.mViewFlags.contains("tb-floating")) {
+ if (mItem.mViewFlags.contains(QLatin1String("tb-floating"))) {
viewFlags |= HbView::ViewTitleBarFloating;
}
- if (mItem.mViewFlags.contains("sb-hidden")) {
+ if (mItem.mViewFlags.contains(QLatin1String("sb-hidden"))) {
viewFlags |= HbView::ViewStatusBarHidden;
}
- if (mItem.mViewFlags.contains("sb-transparent")) {
+ if (mItem.mViewFlags.contains(QLatin1String("sb-transparent"))) {
viewFlags |= HbView::ViewStatusBarTransparent;
}
- if (mItem.mViewFlags.contains("sb-floating")) {
+ if (mItem.mViewFlags.contains(QLatin1String("sb-floating"))) {
viewFlags |= HbView::ViewStatusBarFloating;
}
view->setViewFlags(viewFlags);
if (viewFlags.testFlag(HbView::ViewStatusBarHidden)
- || viewFlags.testFlag(HbView::ViewStatusBarTransparent))
- {
- mItem.mFlagsToStore |= 1;
+ || viewFlags.testFlag(HbView::ViewStatusBarTransparent)) {
+ mItem.mFlagsToStore |= HbSplashNonStandardStatusBar;
}
// navi-action-icon
@@ -812,7 +811,7 @@
HbBackgroundItem *bgItem = mwd->mBgItem;
if (bgItem) {
QString backgroundImageName = mItem.mBackgroundImageName.value(
- mItem.mOrientation == Qt::Vertical ? "portrait" : "landscape");
+ mItem.mOrientation == Qt::Vertical ? "portrait" : "landscape");
if (backgroundImageName.isEmpty()) {
backgroundImageName = mItem.mBackgroundImageName.value("always");
if (backgroundImageName.isEmpty()) {
@@ -824,15 +823,15 @@
}
// Hide dynamic content from status bar (clock, indicators).
- setStatusBarElementsVisible(false);
+ setStatusBarElementsVisible(mMainWindow, false);
}
-void HbSplashGenerator::setStatusBarElementsVisible(bool visible)
+void HbSplashGenerator::setStatusBarElementsVisible(HbMainWindow *mw, bool visible)
{
- HbMainWindowPrivate *mwd = HbMainWindowPrivate::d_ptr(mMainWindow);
+ HbMainWindowPrivate *mwd = HbMainWindowPrivate::d_ptr(mw);
HbStatusBar *statusBar = mwd->mStatusBar;
if (statusBar) {
- foreach (QGraphicsItem *item, statusBar->childItems()) {
+ foreach(QGraphicsItem * item, statusBar->childItems()) {
QString name = HbStyle::itemName(item);
bool knownItem =
name == QLatin1String("signal")
@@ -854,7 +853,7 @@
bool ok = false;
QStringList dirNames(hbsplash_translation_dirs());
dirNames.append(mItem.mCustomTrDirs);
- foreach (const QString &dirName, dirNames) {
+ foreach(const QString & dirName, dirNames) {
QDir dir(dirName);
QString fullName = dir.filePath(name + '_' + lang);
// fullName is not necessarily an existing file, however the translator
@@ -876,7 +875,7 @@
void HbSplashGenerator::clearTranslators()
{
- foreach (QTranslator *translator, mTranslators) {
+ foreach(QTranslator * translator, mTranslators) {
QCoreApplication::removeTranslator(translator);
}
qDeleteAll(mTranslators);
@@ -891,3 +890,27 @@
// directory-changed notifications.
QTimer::singleShot(1000, this, SLOT(regenerate()));
}
+
+bool HbSplashGenerator::lockMainWindow()
+{
+ if (!mMainWindowLocked) {
+ mMainWindowLocked = true;
+ return true;
+ }
+ return false;
+}
+
+void HbSplashGenerator::unlockMainWindowInternal()
+{
+ mMainWindowLocked = false;
+}
+
+void HbSplashGenerator::unlockMainWindow()
+{
+ // This version is used by the compositors. Besides resetting the flag it
+ // also queues a call to processQueue() if needed.
+ unlockMainWindowInternal();
+ if (mProcessQueuePending) {
+ QMetaObject::invokeMethod(this, "processQueue", Qt::QueuedConnection);
+ }
+}
--- a/src/hbservers/hbsplashgenerator/hbsplashgenerator.pro Thu May 27 13:10:59 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/hbsplashgenerator.pro Fri Jun 11 13:58:22 2010 +0300
@@ -30,12 +30,15 @@
SOURCES += $$PWD/main.cpp
SOURCES += $$PWD/hbsplashgenerator.cpp
+SOURCES += $$PWD/hbsplashindicompositor.cpp
symbian: SOURCES += $$PWD/hbsplashgen_server_symbian.cpp
HEADERS += $$PWD/hbsplashgenerator_p.h
HEADERS += $$PWD/hbsplashdirs_p.h
+HEADERS += $$PWD/hbsplashcompositor_p.h
+HEADERS += $$PWD/hbsplashindicompositor_p.h
+HEADERS += $$PWD/hbsplashblacklist_p.h
symbian: HEADERS += $$PWD/hbsplashgen_server_symbian_p.h
-HEADERS += $$PWD/hbsplashblacklist_p.h
symbian {
TARGET.CAPABILITY = CAP_APPLICATION
--- a/src/hbservers/hbsplashgenerator/hbsplashgenerator_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/hbsplashgenerator_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -56,6 +56,11 @@
void start(bool forceRegen);
+ HbMainWindow *ensureMainWindow();
+ bool lockMainWindow();
+ void unlockMainWindow();
+ static void setStatusBarElementsVisible(HbMainWindow *mw, bool visible);
+
signals:
void regenerateStarted();
void outputDirContentsUpdated(const QString &dir, const QStringList &entries);
@@ -106,7 +111,6 @@
};
private:
- void ensureMainWindow();
void takeScreenshot();
void cleanup();
QImage renderView();
@@ -119,12 +123,13 @@
void setupAppSpecificWindow();
void setupNameBasedWidgetProps(HbDocumentLoader &loader);
void finishWindow();
- void setStatusBarElementsVisible(bool visible);
void addTranslator(const QString &name);
void clearTranslators();
int updateOutputDirContents(const QString &outDir);
+ void unlockMainWindowInternal();
- bool mBusy;
+ bool mMainWindowLocked;
+ bool mProcessQueuePending;
bool mForceRegen;
HbMainWindow *mMainWindow;
QQueue<QueueItem> mQueue;
@@ -137,6 +142,6 @@
QFileSystemWatcher mFsWatcher;
};
-QDebug operator<<(QDebug dbg, const HbSplashGenerator::QueueItem& item);
+QDebug operator<<(QDebug dbg, const HbSplashGenerator::QueueItem &item);
#endif // HBSPLASHGENERATOR_P_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbservers/hbsplashgenerator/hbsplashindicompositor.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,160 @@
+/****************************************************************************
+**
+** 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 HbServers 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 "hbsplashindicompositor_p.h"
+#include "hbsplashgenerator_p.h"
+#include "hbsplashdefs_p.h"
+#include "hbmainwindow.h"
+#include "hbmainwindow_p.h"
+#include "hbstatusbar_p.h"
+#include "hbsleepmodelistener_p.h"
+#include "hbevent.h"
+#include <QTimer>
+#include <QApplication>
+#include <QDebug>
+
+#ifdef Q_OS_SYMBIAN
+#include <fbs.h>
+#endif
+
+// The indicator compositor renders a part of the mainwindow (the
+// statusbar) into an image from time to time. This pixel data is then
+// copied over to the splash screen bitmap whenever a client requests
+// a screen (except if the screen is marked having a non-standard
+// (hidden or transparent) statusbar).
+//
+// This ensures that there will be relatively up-to-date indicators in
+// the splash screens.
+
+#define PRE "[hbsplashgenerator] [indicompositor]"
+
+HbSplashIndicatorCompositor::HbSplashIndicatorCompositor(HbSplashGenerator *gen)
+ : mGenerator(gen)
+{
+#ifdef HB_SPLASH_STATUSBAR_ENABLED
+ // When the splash screens are regenerated the statusbar must be rendered
+ // again too because the theme or the splashml files may have changed.
+ connect(mGenerator, SIGNAL(finished()), SLOT(renderStatusBar()), Qt::QueuedConnection);
+
+ // Regenerate every minute to have an up-to-date clock.
+ // ### replace with notifications from indicator fw
+ mRenderTimer = new QTimer(this);
+ connect(mRenderTimer, SIGNAL(timeout()), SLOT(renderStatusBar()));
+ mRenderTimer->setInterval(60000); // 1 min
+ mRenderTimer->start();
+
+ // There must be no activity while the device is sleeping so listen to sleep
+ // mode events too.
+ HbSleepModeListener::instance(); // just to make sure it is created
+ QApplication::instance()->installEventFilter(this);
+#endif
+}
+
+void HbSplashIndicatorCompositor::release()
+{
+ delete this;
+}
+
+void HbSplashIndicatorCompositor::renderStatusBar()
+{
+ // Try again later if a screen is just being generated. We share the same
+ // mainwindow and our changes done here (orientation, statusbar visibility)
+ // could possibly ruin the output.
+ if (!mGenerator->lockMainWindow()) {
+ QTimer::singleShot(1000, this, SLOT(renderStatusBar()));
+ return;
+ }
+ try {
+ HbMainWindow *mw = mGenerator->ensureMainWindow();
+ HbSplashGenerator::setStatusBarElementsVisible(mw, true);
+ mw->setOrientation(Qt::Vertical, false);
+ doRender(mw, &mStatusBarImagePrt, &mStatusBarRectPrt);
+ mw->setOrientation(Qt::Horizontal, false);
+ doRender(mw, &mStatusBarImageLsc, &mStatusBarRectLsc);
+ } catch (const std::bad_alloc &) {
+ mStatusBarImagePrt = mStatusBarImageLsc = QImage();
+ }
+ mGenerator->unlockMainWindow();
+}
+
+void HbSplashIndicatorCompositor::doRender(HbMainWindow *mw,
+ QImage *statusBarImage,
+ QRect *statusBarRect)
+{
+ *statusBarRect = mw->mapFromScene(HbMainWindowPrivate::d_ptr(mw)->mStatusBar->geometry())
+ .boundingRect().intersected(QRect(QPoint(0, 0), mw->size()));
+ qDebug() << PRE << "rendering status bar" << *statusBarRect;
+ *statusBarImage = QImage(statusBarRect->size(), QImage::Format_ARGB32_Premultiplied);
+ statusBarImage->fill(QColor(Qt::transparent).rgba());
+ QPainter painter(statusBarImage);
+ mw->render(&painter, statusBarImage->rect(), *statusBarRect);
+}
+
+void HbSplashIndicatorCompositor::composeToBitmap(void *bitmap,
+ Qt::Orientation orientation,
+ int splashExtraFlags)
+{
+#ifdef Q_OS_SYMBIAN
+ if (!(splashExtraFlags & HbSplashNonStandardStatusBar)) {
+ const QImage *srcImg = orientation == Qt::Horizontal ? &mStatusBarImageLsc
+ : &mStatusBarImagePrt;
+ const QRect *sbRect = orientation == Qt::Horizontal ? &mStatusBarRectLsc
+ : &mStatusBarRectPrt;
+ if (!srcImg->isNull()) {
+ qDebug() << PRE << "composeToBitmap" << bitmap << orientation << splashExtraFlags;
+ CFbsBitmap *bmp = static_cast<CFbsBitmap *>(bitmap);
+ uchar *dst = reinterpret_cast<uchar *>(bmp->DataAddress());
+ const int dstBpl = CFbsBitmap::ScanLineLength(bmp->SizeInPixels().iWidth,
+ bmp->DisplayMode());
+ const uchar *src = srcImg->bits();
+ const int srcBpl = srcImg->bytesPerLine();
+ const int dstLineStartOffset = sbRect->left() * 4;
+ const int y0 = sbRect->top();
+ const int y1 = sbRect->bottom();
+ for (int y = y0; y <= y1; ++y) {
+ int dstOffset = y * dstBpl + dstLineStartOffset;
+ int srcOffset = (y - y0) * srcBpl;
+ qMemCopy(dst + dstOffset, src + srcOffset, srcBpl);
+ }
+ }
+ }
+#else
+ Q_UNUSED(bitmap);
+ Q_UNUSED(orientation);
+ Q_UNUSED(splashExtraFlags);
+#endif
+}
+
+bool HbSplashIndicatorCompositor::eventFilter(QObject *obj, QEvent *event)
+{
+ if (event->type() == HbEvent::SleepModeEnter && mRenderTimer->isActive()) {
+ qDebug() << PRE << "entering sleep mode";
+ mRenderTimer->stop();
+ } else if (event->type() == HbEvent::SleepModeExit && !mRenderTimer->isActive()) {
+ qDebug() << PRE << "leaving sleep mode";
+ mRenderTimer->start();
+ }
+ return QObject::eventFilter(obj, event);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbservers/hbsplashgenerator/hbsplashindicompositor_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** 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 HbServers 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 HBSPLASHINDICOMPOSITOR_P_H
+#define HBSPLASHINDICOMPOSITOR_P_H
+
+#include "hbsplashcompositor_p.h"
+#include <QObject>
+#include <QImage>
+#include <QRect>
+
+class HbSplashGenerator;
+class HbMainWindow;
+
+QT_BEGIN_NAMESPACE
+class QTimer;
+QT_END_NAMESPACE
+
+class HbSplashIndicatorCompositor : public QObject, public HbSplashCompositorInterface
+{
+ Q_OBJECT
+
+public:
+ HbSplashIndicatorCompositor(HbSplashGenerator *gen);
+ void release();
+ void composeToBitmap(void *bitmap, Qt::Orientation orientation, int splashExtraFlags);
+
+private slots:
+ void renderStatusBar();
+
+private:
+ void doRender(HbMainWindow *mw, QImage *statusBarImage, QRect *statusBarRect);
+ bool eventFilter(QObject *obj, QEvent *event);
+
+ HbSplashGenerator *mGenerator;
+ QImage mStatusBarImagePrt;
+ QImage mStatusBarImageLsc;
+ QRect mStatusBarRectPrt;
+ QRect mStatusBarRectLsc;
+ QTimer *mRenderTimer;
+};
+
+#endif
--- a/src/hbservers/hbsplashgenerator/main.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/main.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -28,10 +28,10 @@
#include <hbapplication.h>
#include "hbsplashgenerator_p.h"
#include "hbsplashdefs_p.h"
+#include "hbsplashindicompositor_p.h"
#if defined(Q_OS_SYMBIAN)
#include "hbsplashgen_server_symbian_p.h"
-#include "hbsplashdefs_p.h"
#include <e32std.h>
#include <eikenv.h>
#include <apgwgnam.h>
@@ -88,7 +88,7 @@
#endif
// The server must be initialized before calling HbSplashGenerator::start().
-#ifdef Q_OS_SYMBIAN
+#if defined(Q_OS_SYMBIAN)
qDebug("[hbsplashgenerator] starting server");
HbSplashGenServer server(&gen);
// If there was an error then exit right away.
@@ -101,7 +101,10 @@
qDebug("[hbsplashgenerator] starting generator");
gen.start(forceRegen);
+ HbSplashIndicatorCompositor indiCompositor(&gen);
+
#if defined(Q_OS_SYMBIAN)
+ server.addCompositor(&indiCompositor);
if (mutexToSignal) {
qDebug("[hbsplashgenerator] signaling mutex");
static_cast<RMutex *>(mutexToSignal)->Signal();
--- a/src/hbservers/hbthemeserver/hbicondatacache_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbicondatacache_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -657,6 +657,9 @@
int freedMemory = 0;
while (itemCost > freedMemory) {
HbIconCacheItem *itemToRemove = gpuLruList.removeFront();
+ if ( itemToRemove == 0 ){
+ return ;
+ }
// Decrement the Size by the cost of the removed icon's data cost
#ifdef HB_SGIMAGE_ICON
#ifdef HB_ICON_CACHE_DEBUG
@@ -781,7 +784,7 @@
goodMemory = true;
}
-void HbIconDataCache::freeGpuRam(int bytes)
+void HbIconDataCache::freeGpuRam(int bytes, bool useSwRendering)
{
goodMemory = false;
if (bytes <= gpuLruListSize) {
@@ -790,6 +793,7 @@
createGpuCacheSpace(gpuLruListSize);
}
+ if (useSwRendering) {
// Iterate through the cache and remove any active SgImages, before the context
// is destroyed.
QHash<HbIconKey, HbIconCacheItem*>::const_iterator itEnd(cache->constEnd());
@@ -803,11 +807,12 @@
HbSgImageRenderer::removeSgImageFromHash(temp->rasterIconData.sgImageData.id);
#endif
temp->rasterIconData.type = INVALID_FORMAT;
- temp->gpuLink.setNext(0);
- temp->gpuLink.setPrev(0);
currentGpuCacheSize -= temp->rasterIconDataCost;
}
}
+ gpuLruList.removeAll();
+ gpuLruListSize = 0;
+ }
}
/*!
--- a/src/hbservers/hbthemeserver/hbicondatacache_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbicondatacache_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -49,7 +49,7 @@
bool isItemCachableInGpu(const HbIconCacheItem *item)const;
bool isItemCachableInCpu(const HbIconCacheItem *item)const;
void memoryGood();
- void freeGpuRam(int bytes);
+ void freeGpuRam(int bytes, bool useSwRendering);
void freeUnusedGpuResources();
QVector<const HbIconKey *> getKeys(const QString &filename) const;
--- a/src/hbservers/hbthemeserver/hbsgimageiconprocessor_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbsgimageiconprocessor_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -274,6 +274,7 @@
}
int iconCount = multiPieceIconParams.multiPartIconList.count();
+ GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
for (int i = 0; i < iconCount; i++) {
HbIconFormatType type = multiPieceIconInfo[i].type;
bool success = false;
@@ -285,14 +286,10 @@
int pieceTopRight = position.x() + multiPieceIconParams.multiPartIconData.targets[i].width();
position.setX(consolidatedIconWidth - pieceTopRight);
}
-
-
- HbIconSource *source = HbThemeServerUtils::getIconSource(multiPieceIconParams.multiPartIconList[i]);
- QByteArray *sourceByteArray = source->byteArray();
- if( !sourceByteArray ) {
- return false;
- }
- byteArray = *sourceByteArray;
+
+ byteArray = QByteArray::fromRawData((char*)manager->base() + multiPieceIconInfo[i].nvgData.offset,
+ multiPieceIconInfo[i].nvgData.dataSize);
+
success = renderNvg(byteArray, QRect(position,
multiPieceIconParams.multiPartIconData.pixmapSizes[i]), (Qt::AspectRatioMode)multiPieceIconParams.aspectRatioMode,
mirrored);
--- a/src/hbservers/hbthemeserver/hbthemeserver_generic.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver_generic.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -30,7 +30,6 @@
#include <QLocalServer>
#include <QLocalSocket>
#include <QSharedMemory>
-#include <QSettings>
#include <QDebug>
#include <QList>
#include <QIcon>
@@ -56,6 +55,7 @@
#include "hbthemesystemeffect_p.h"
#include "hbsharedmemorymanager_p.h"
#include "hbtypefaceinfodatabase_p.h"
+#include "hbthemeutils_p.h"
static const int CLOSE_TIMEOUT = 3000;
@@ -85,7 +85,6 @@
HbThemeServerPrivate::HbThemeServerPrivate(): server(new QLocalServer(this))
#endif
{
- iThemeSelectionClient = 0;
sessionList.clear();
#ifdef QT_DEBUG
setWindowTitle("Theme Server");
@@ -99,7 +98,46 @@
setMaxGpuCacheSize(GPU_CACHE_SIZE);
setMaxCpuCacheSize(CPU_CACHE_SIZE);
+ // Store the active theme name in a member string
+ iCurrentThemeName = HbThemeUtils::getThemeSetting(HbThemeUtils::CurrentThemeSetting);
+
+ if (iCurrentThemeName.isEmpty()) {
+ iCurrentThemeName = HbThemeUtils::defaultTheme().name;
+ }
+
+ // Resolve the path of the current theme
+ QDir path(iCurrentThemeName);
+ if (!path.isAbsolute()) {
+ // Resolve the path of the current theme
+ resolveThemePath(iCurrentThemeName, iCurrentThemePath);
+ } else {
+ iCurrentThemeName = path.dirName();
+ iCurrentThemePath = path.absolutePath();
+ }
+ // Process base theme index, it is used as parent index also when the current theme is something else
+ QString basePath;
+ resolveThemePath(HbThemeUtils::getThemeSetting(HbThemeUtils::BaseThemeSetting), basePath);
+ HbThemeServerUtils::createThemeIndex(basePath, BaseTheme);
+ // Process operator theme indexes
+ QString operatorName = HbThemeUtils::getThemeSetting(HbThemeUtils::OperatorNameSetting);
+ if (!operatorName.isEmpty()) {
+ QString operatorPath( HbThemeUtils::baseTheme().rootDir + '/' +
+ QLatin1String(HbThemeUtils::operatorHierarchy) + '/' +
+ QLatin1String(HbThemeUtils::iconsResourceFolder) + '/' +
+ operatorName );
+
+ HbThemeServerUtils::createThemeIndex(operatorPath, OperatorC);
+ // Operator Z not used in generic themeserver.
+ }
+ // Process current theme index
+ HbThemeServerUtils::createThemeIndex(iCurrentThemePath, ActiveTheme);
+
+ // Register theme system effects in construction
+ // TODO: fix parameter
+ HbThemeSystemEffect::handleThemeChange(iCurrentThemeName);
+
connect(server, SIGNAL(newConnection()), this, SLOT(newClientConnected()));
+ HbThemeUtils::setThemeSetting(HbThemeUtils::CurrentThemeSetting, iCurrentThemePath);
}
/*!
@@ -273,8 +311,6 @@
#ifdef THEME_SERVER_TRACES
qDebug() << Q_FUNC_INFO << " theme=" << newTheme;
#endif
- // Modify the QSettings to store the applied theme
- QSettings settings(QLatin1String(ORGANIZATION), QLatin1String(THEME_COMPONENT));
// Clear cached icons and session data
clearIconCache();
@@ -283,23 +319,64 @@
session->clearSessionIconData();
}
- QString cleanThemeName = newTheme.trimmed();
- settings.remove("currenttheme"); //temporary
- settings.setValue(CURRENT_THEME_KEY, cleanThemeName);
- settings.sync();
+ iCurrentThemeName = newTheme.trimmed();
+
+ // Resolve the path of the current theme
+ QDir path(iCurrentThemeName);
+ if (!path.isAbsolute()) {
+ // Resolve the path of the current theme
+ resolveThemePath(iCurrentThemeName, iCurrentThemePath);
+ } else {
+ iCurrentThemeName = path.dirName();
+ iCurrentThemePath = path.absolutePath();
+ }
+
+ // Set the new theme in theme settings
+ HbThemeUtils::setThemeSetting(HbThemeUtils::CurrentThemeSetting, iCurrentThemeName);
+
+ // Process operator Drive C theme index
+ QString operatorName = HbThemeUtils::getThemeSetting(HbThemeUtils::OperatorNameSetting);
+ if (!operatorName.isEmpty()) {
+ QString operatorPath( HbThemeUtils::baseTheme().rootDir + '/' +
+ QLatin1String(HbThemeUtils::operatorHierarchy) + '/' +
+ QLatin1String(HbThemeUtils::iconsResourceFolder) + '/' +
+ operatorName );
+
+ HbThemeServerUtils::createThemeIndex(operatorPath, OperatorC);
+ }
+ // Process current theme index
+ HbThemeServerUtils::createThemeIndex(iCurrentThemePath, ActiveTheme);
// Register new system effects
- HbThemeSystemEffect::handleThemeChange(cleanThemeName);
+ HbThemeSystemEffect::handleThemeChange(iCurrentThemeName);
HbThemeServerRequest requestType;
requestType = EThemeSelection;
QByteArray block;
QDataStream out(&block, QIODevice::WriteOnly);
out << (int)requestType;
- out << cleanThemeName;
+ out << iCurrentThemeName;
writeToClients(block);
}
+bool HbThemeServerPrivate::resolveThemePath(const QString &themeName, QString &themePath)
+{
+ static QString mainThemesDir = QDir::fromNativeSeparators(qgetenv("HB_THEMES_DIR"));
+
+ if (themeName == "hbdefault") {
+ themePath = ":/themes/icons/hbdefault";
+ return true;
+ } else {
+ QString themeLookupPath = mainThemesDir + "/themes/icons/" + themeName;
+ if (QFile::exists(themeLookupPath + "/index.theme")) {
+ themePath = themeLookupPath;
+ return true;
+ }
+ }
+
+ return false;
+}
+
void HbThemeServerPrivate::handleContentUpdate(const QStringList &fileNames)
{
// If list is empty clear all themed content
@@ -374,23 +451,11 @@
#endif
foreach(session, sessionList) {
QLocalSocket * curSocket = session->clientConnection();
- if (iThemeSelectionClient != curSocket) {
- curSocket->write(block);
- }
+ curSocket->write(block);
}
}
/*!
- \fn HbThemeServerPrivate::setThemeSelectionClient()
- Set the theme selection client
- \a socket
-*/
-void HbThemeServerPrivate::setThemeSelectionClient(QLocalSocket *socket)
-{
- iThemeSelectionClient = socket;
-}
-
-/*!
\fn HbThemeServerPrivate::newClientConnected()
Creates a new session with the server.
*/
@@ -701,9 +766,7 @@
}
case EThemeSelection: {
QString themename;
- QLocalSocket *themeSelectionClient = static_cast<QLocalSocket *>(sender());
inputDataStream >> themename;
- iServer->setThemeSelectionClient(themeSelectionClient);
iServer->handleThemeSelection(themename);
break;
}
@@ -763,8 +826,6 @@
static_cast<QLocalSocket *>(sender())->write(output);
break;
}
- case EIconDefaultSize:
- break; //todo
case EMultiPieceIcon: {
HbMultiIconParams frameItemParams;
inputDataStream >> frameItemParams.multiPartIconList;
--- a/src/hbservers/hbthemeserver/hbthemeserver_generic_p_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver_generic_p_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -70,7 +70,6 @@
QByteArray handleSharedWidgetMLLookup(const QString &fileName,
const QString &layout, const QString §ion);
void writeToClients(QByteArray &block);
- void setThemeSelectionClient(QLocalSocket *socket);
bool insertCssCacheItem(const QString &key, HbCacheItem *item);
HbCacheItem *cssCacheItem(const QString &key);
@@ -86,6 +85,8 @@
HbRenderingMode currentRenderingMode() const;
void setCurrentRenderingMode(HbRenderingMode currentMode);
+ bool resolveThemePath(const QString &themeName, QString &themePath);
+
//Debug Code for Test Purpose
#ifdef HB_ICON_CACHE_DEBUG
int cacheIconCount() const;
@@ -120,11 +121,13 @@
QLabel statusLabel;
#endif
QLocalServer *server;
- QLocalSocket *iThemeSelectionClient;
QList<HbThemeServerSession *> sessionList;
HbIconDataCache *iconCache;
HbCache *cssCache;
HbRenderingMode renderMode;
+
+ QString iCurrentThemeName;
+ QString iCurrentThemePath;
};
class HbThemeServerSession : public QObject
--- a/src/hbservers/hbthemeserver/hbthemeserver_symbian.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver_symbian.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -63,8 +63,8 @@
static const TInt KThemeName = 0;
-const QString KOperatorCPath = "C:/resource/hb/operatorTheme/icons/";
-const QString KOperatorZPath = "Z:/resource/hb/operatorTheme/icons/";
+const QString KOperatorCPath = "C:/resource/hb/prioritytheme/icons/";
+const QString KOperatorZPath = "Z:/resource/hb/prioritytheme/icons/";
bool HbThemeServerPrivate::gpuGoodMemoryState = true;
// This is used as parent theme always regardless of the active theme
@@ -108,22 +108,23 @@
if (iCurrentThemeName.isEmpty()) {
iCurrentThemeName = HbThemeUtils::defaultTheme().name;
- // Set the current theme also in the cenrep key that is used to notify clients.
- HbThemeUtils::setThemeSetting(HbThemeUtils::CurrentThemeSetting, iCurrentThemeName);
}
// Cache ROM theme(name)s
QString romPath = "Z:\\resource\\hb\\themes\\icons\\";
QDir dir(romPath);
romThemeNames = dir.entryList(QDir::Dirs);
-
+
// Resolve the path of the current theme
- resolveThemePath(iCurrentThemeName, iCurrentThemePath);
+ QDir path(iCurrentThemeName);
+ if (!path.isAbsolute()) {
+ // Resolve the path of the current theme
+ resolveThemePath(iCurrentThemeName, iCurrentThemePath);
+ } else {
+ iCurrentThemeName = path.dirName();
+ iCurrentThemePath = path.absolutePath();
+ }
- // Register theme system effects in construction
- // TODO: fix parameter
- HbThemeSystemEffect::handleThemeChange(iCurrentThemeName);
-
// Open index file to prevent uninstallation of the active theme
if (!openCurrentIndexFile()) {
// theme doesn't exist activate default theme
@@ -154,23 +155,31 @@
// Process base theme index, it is used as parent index also when the current theme is something else
QString basePath;
resolveThemePath(HbThemeUtils::getThemeSetting(HbThemeUtils::BaseThemeSetting), basePath);
- createThemeIndex(basePath, BaseTheme);
+
+ HbThemeServerUtils::createThemeIndex(basePath, BaseTheme);
// Process operator theme indexes
QString operatorName = HbThemeUtils::getThemeSetting(HbThemeUtils::OperatorNameSetting);
if (!operatorName.isEmpty()) {
QString operatorPath;
operatorPath.append(KOperatorCPath);
operatorPath.append(operatorName);
- createThemeIndex(operatorPath, OperatorC);
+ HbThemeServerUtils::createThemeIndex(operatorPath, OperatorC);
// Process operator Drive Z theme index
QString operatorROMPath;
operatorROMPath.append(KOperatorZPath);
operatorROMPath.append(operatorName);
- createThemeIndex(operatorROMPath, OperatorROM);
+ HbThemeServerUtils::createThemeIndex(operatorROMPath, OperatorROM);
}
// Process current theme index
- createThemeIndex(iCurrentThemePath, ActiveTheme);
-
+ HbThemeServerUtils::createThemeIndex(iCurrentThemePath, ActiveTheme);
+
+ // Register theme system effects in construction
+ // TODO: fix parameter
+ HbThemeSystemEffect::handleThemeChange(iCurrentThemeName);
+
+ // Set the current theme also in the cenrep key that is used to notify clients.
+ HbThemeUtils::setThemeSetting(HbThemeUtils::CurrentThemeSetting, iCurrentThemePath);
+
// Temporary hack for pre-loading app. background graphics in server startup to give more realistic
// results in performance tests. (Normally these graphics get loaded anyway when the first hb app is started.)
#ifndef HB_NVG_CS_ICON
@@ -260,7 +269,7 @@
bool HbThemeServerPrivate::resolveThemePath(const QString &themeName, QString &themePath)
{
- if(themeName == "hbdefault") {
+ if (themeName == "hbdefault") {
themePath = ":\\themes\\icons\\hbdefault";
return true;
}
@@ -329,6 +338,9 @@
if (!path.isAbsolute()) {
// Resolve the path of the current theme
resolveThemePath(iCurrentThemeName, iCurrentThemePath);
+ } else {
+ iCurrentThemeName = path.dirName();
+ iCurrentThemePath = path.absolutePath();
}
#ifdef THEME_INDEX_TRACES
@@ -349,10 +361,10 @@
QString operatorPath;
operatorPath.append(KOperatorCPath);
operatorPath.append(operatorName);
- createThemeIndex(operatorPath, OperatorC);
+ HbThemeServerUtils::createThemeIndex(operatorPath, OperatorC);
}
// Process current theme index
- createThemeIndex(iCurrentThemePath, ActiveTheme);
+ HbThemeServerUtils::createThemeIndex(iCurrentThemePath, ActiveTheme);
// Clear cached icons and session data
clearIconCache();
@@ -364,10 +376,10 @@
}
// TODO: fix parameter
- HbThemeSystemEffect::handleThemeChange(cleanThemeName);
+ HbThemeSystemEffect::handleThemeChange(iCurrentThemeName);
// Update settings and notify clients
- HbThemeUtils::setThemeSetting(HbThemeUtils::CurrentThemeSetting,iCurrentThemeName);
+ HbThemeUtils::setThemeSetting(HbThemeUtils::CurrentThemeSetting,iCurrentThemePath);
}
/**
@@ -436,16 +448,6 @@
return(cssCache->cacheItem(key));
}
-void HbThemeServerPrivate::insertIconDefaultSizeCacheItem(const QString &key, const QSizeF &item)
-{
- iconDefaultSizes.insert(key, item);
-}
-
-QSizeF HbThemeServerPrivate::iconDefaultSizeCacheItem(const QString &key)
-{
- return iconDefaultSizes.value(key);
-}
-
/**
* HbThemeServerPrivate::clearIconCache
*
@@ -539,12 +541,14 @@
cache->memoryGood();
}
-void HbThemeServerPrivate::FreeGpuRam(int bytes)
+void HbThemeServerPrivate::FreeGpuRam(int bytes, bool useSwRendering )
{
gpuGoodMemoryState = false;
- cache->freeGpuRam(bytes);
+ cache->freeGpuRam(bytes, useSwRendering);
#ifdef HB_SGIMAGE_ICON
+ if (useSwRendering) {
HbSgImageRenderer::global()->terminate();
+ }
#endif
}
@@ -727,151 +731,6 @@
{
HbThemeServerUtils::cleanupUnusedCss(cssCache);
}
-
-void HbThemeServerPrivate::createThemeIndex(const QString &themePath, const HbThemeType &themetype)
-{
- #ifdef THEME_INDEX_TRACES
- qDebug() << "ThemeIndex: createThemeIndex" << themePath.toUtf8();
- #endif
- QDir themeBasePath(themePath);
- // Path is like "C:/resource/hb/themes/icons/sfwhitetheme"
- QString themeName = themeBasePath.dirName();
-
- QString filename(themeBasePath.absolutePath());
- int cutindex = filename.lastIndexOf("/",filename.lastIndexOf("/")-1)+1;
- filename = filename.left(cutindex);
- themeBasePath.setPath(filename);
- filename.append(themeName);
- filename.append(".themeindex");
-
- if (themePath == ":\\themes\\icons\\hbdefault") {
- themeBasePath.setPath(":/themes");
- filename = ":/themes/hbdefault.themeindex";
- themeName = "hbdefault";
- }
-
- QFile indexFile(filename);
-
- bool indexOK = false;
-
- if (indexFile.open(QIODevice::ReadOnly)) {
-
- indexOK = true;
-
- GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
-
- HbSharedChunkHeader *chunkHeader = (HbSharedChunkHeader*) manager->base();
-
- qint64 byteSize = indexFile.size();
-
- #ifdef THEME_INDEX_TRACES
- qDebug() << "ThemeIndex: " << themeName.toUtf8() << " index file size:" << byteSize;
- #endif
-
- int offset = manager->alloc(byteSize);
- if (offset >= 0) {
- #ifdef THEME_INDEX_TRACES
- qDebug() << "ThemeIndex: memory allocated for theme: " << themeName.toUtf8();
- #endif
-
- // Read the theme index in the shared chunk
- char *address = HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory, offset);
-
- indexFile.read(address, byteSize);
- indexFile.close();
-
- #ifdef THEME_INDEX_TRACES
- qDebug() << "ThemeIndex: Reading themeindex for theme" << themeName.toUtf8() << "... Done!";
- #endif
-
- // Verify theme index contents if it is not located in ROM,
- // so that it does not have over-indexing offsets which might
- // crash all the clients trying to read from it.
-
- if (themePath[0] != 'z' && themePath[0] != 'Z') {
- #ifdef THEME_INDEX_TRACES
- qDebug() << "ThemeIndex: Validating themeindex for theme" << themeName.toUtf8();
- #endif
-
- HbThemeIndex index(address);
- indexOK = index.validateItems(byteSize);
-
- #ifdef THEME_INDEX_TRACES
- qDebug() << "ThemeIndex: Validating themeindex for theme" << themeName.toUtf8() << " done! Result: " << indexOK;
- #endif
- }
-
- if (indexOK) {
- // Allocate theme path string from shared memory
- QByteArray themePathArray = themeBasePath.absolutePath().toLatin1();
- quint32 themePathOffset = manager->alloc(themePathArray.size()+1);
- memcpy(HbMemoryUtils::getAddress<char>(
- HbMemoryManager::SharedMemory,
- themePathOffset),
- themePathArray.data(),
- themePathArray.size()+1); // +1 for '/0'
-
- // Allocate theme name string from shared memory
- QByteArray themeNameArray = themeName.toLatin1();
- quint32 themeNameOffset = manager->alloc(themeNameArray.size()+1);
- memcpy(HbMemoryUtils::getAddress<char>(
- HbMemoryManager::SharedMemory,
- themeNameOffset),
- themeNameArray.data(),
- themeNameArray.size()+1); // +1 for '/0'
-
- // Store offset to the index in chunk
- switch (themetype) {
- case BaseTheme:
- // Release previously allocated content
- manager->free(chunkHeader->baseThemePathOffset);
- manager->free(chunkHeader->baseThemeNameOffset);
- manager->free(chunkHeader->baseThemeIndexOffset);
- // Base theme offsets
- chunkHeader->baseThemePathOffset = themePathOffset;
- chunkHeader->baseThemeNameOffset = themeNameOffset;
- chunkHeader->baseThemeIndexOffset = offset;
- break;
- case OperatorC:
- // Release previously allocated content
- manager->free(chunkHeader->operatorThemeDriveCPathOffset);
- manager->free(chunkHeader->operatorThemeDriveCNameOffset);
- manager->free(chunkHeader->operatorThemeDriveCIndexOffset);
- // Operator theme in C-drive offsets
- chunkHeader->operatorThemeDriveCPathOffset = themePathOffset;
- chunkHeader->operatorThemeDriveCNameOffset = themeNameOffset;
- chunkHeader->operatorThemeDriveCIndexOffset = offset;
- break;
- case OperatorROM:
- // Release previously allocated content
- manager->free(chunkHeader->operatorThemeRomPathOffset);
- manager->free(chunkHeader->operatorThemeRomNameOffset);
- manager->free(chunkHeader->operatorThemeRomIndexOffset);
- // Operator theme in ROM offsets
- chunkHeader->operatorThemeRomPathOffset = themePathOffset;
- chunkHeader->operatorThemeRomNameOffset = themeNameOffset;
- chunkHeader->operatorThemeRomIndexOffset = offset;
- break;
- case ActiveTheme:
- // Release previously allocated content
- manager->free(chunkHeader->activeThemePathOffset);
- manager->free(chunkHeader->activeThemeNameOffset);
- manager->free(chunkHeader->activeThemeIndexOffset);
- // Active theme offsets
- chunkHeader->activeThemePathOffset = themePathOffset;
- chunkHeader->activeThemeNameOffset = themeNameOffset;
- chunkHeader->activeThemeIndexOffset = offset;
- break;
- default:
- break;
- }
- } else {
- // If the index contents were not OK, remove the index from the chunk
- manager->free(offset);
- }
- }
- }
-}
//**********************************
//HbThemeServerSession
@@ -975,10 +834,6 @@
GetSharedIconInfoL(aMessage);
break;
- case EIconDefaultSize:
- GetSharedIconDefaultSizeInfoL(aMessage);
- break;
-
case EThemeSelection:
HandleThemeSelectionL(aMessage);
break;
@@ -1177,7 +1032,7 @@
if(params.useSwRendering){
iServer->setCurrentRenderingMode(ESWRendering );
}
- iServer->FreeGpuRam(params.bytesToFree);
+ iServer->FreeGpuRam(params.bytesToFree, params.useSwRendering);
break;
}
@@ -1370,55 +1225,6 @@
aMessage.WriteL(1, data);
}
-void HbThemeServerSession::GetSharedIconDefaultSizeInfoL(const RMessage2 &aMessage)
-{
- TIconParams params = ReadMessageAndRetrieveParams(aMessage);
-
- // Need to be allocated from heap or the leave in the end causes a crash
- QScopedPointer<QString> filenamePtr(new QString((QChar*)params.fileName.Ptr(), params.fileName.Length()));
-
- // See if the icon's default size has been queried already earlier and
- // can be found stored in the hash.
-
- QSizeF defSize = iServer->iconDefaultSizeCacheItem(*filenamePtr.data());
-
- if (!defSize.isValid()) {
- defSize = RetrieveIconDefaultSize(*filenamePtr.data());
-
- // If the default size was retrieved, insert it in the hash for further lookups
- if (defSize.isValid()) {
- iServer->insertIconDefaultSizeCacheItem(*filenamePtr.data(), defSize);
- }
- }
-
- // Return the default size back to the client if it was resolved
- if (defSize.isValid()) {
- TPckg<QSizeF> returnData(defSize);
- aMessage.WriteL(1, returnData);
-#ifdef THEME_SERVER_TRACES
- qDebug() << "Completed aMessage.WriteL";
-#endif
- }
- // Otherwise leave with error code
- else {
- User::Leave(KErrNotFound);
- }
-}
-
-QSizeF HbThemeServerSession::RetrieveIconDefaultSize(const QString &filename)
-{
- QSizeF ret;
-
- // Get icon source, previous icons sources are cached so if accessed again,
- // they don't need to be loaded and parsed from a file always.
- HbIconSource *source = HbThemeServerUtils::getIconSource(filename);
- if (source) {
- ret = source->defaultSize();
- }
-
- return ret;
-}
-
/**
* GetSharedIconInfoL
*/
--- a/src/hbservers/hbthemeserver/hbthemeserver_symbian_p_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver_symbian_p_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -96,12 +96,9 @@
void CleanupSessionCssItem(QString key);
void clearCssCache();
void MemoryGood();
- void FreeGpuRam(int bytes);
+ void FreeGpuRam(int bytes, bool useSwRendering);
void freeUnusedGpuResources();
- void insertIconDefaultSizeCacheItem(const QString &key, const QSizeF &item);
- QSizeF iconDefaultSizeCacheItem(const QString &key);
-
void doCleanup();
static bool gpuMemoryState();
@@ -142,23 +139,19 @@
#endif
-private:
- void createThemeIndex(const QString &themePath, const HbThemeType &themetype);
-
public:
RProperty iThemeProperty;
QString iCurrentThemeName;
QString iCurrentThemePath;
+ QStringList romThemeNames;
private:
void ConstructL();
HbIconDataCache * cache;
HbCache* cssCache;
- QHash<QString, QSizeF> iconDefaultSizes;
static bool gpuGoodMemoryState;
HbRenderingMode renderMode;
- QStringList romThemeNames;
CHbThemeChangeNotificationListener * iListener;
CHbThemeWatcher *iWatcher;
};
@@ -178,8 +171,6 @@
void ServiceL(const RMessage2 & aMessage);
void DispatchMessageL(const RMessage2 & aMessage);
void GetSharedIconInfoL(const RMessage2 & aMessage);
- void GetSharedIconDefaultSizeInfoL(const RMessage2 &aMessage);
- QSizeF RetrieveIconDefaultSize(const QString &filename);
void HandleStyleSheetLookupL(const RMessage2 & aMessage);
void HandleWidgetMLLookupL(const RMessage2& aMessage);
void HandleDeviceProfilesReqL(const RMessage2& aMessage);
--- a/src/hbservers/hbthemeserver/hbthemeserverutils.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserverutils.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -27,6 +27,7 @@
#include <QHash>
#include <QString>
+#include <QStringList>
#include <QFile>
#include <QDebug>
@@ -40,6 +41,7 @@
#include "hbiconsource_p.h"
#include "hbwidgetloader_p.h"
#include "hbwidgetloaderactions_p.h"
+#include "hbthemeindex_p.h"
//Hash of fileName-offset
typedef QHash<QString, int> HbServerCache;
@@ -186,12 +188,29 @@
Returns of the offset for the given filename,layout and section name.
*/
-int HbThemeServerUtils::getSharedLayoutDefinition(const QString & fileName, const QString &layout,
+int HbThemeServerUtils::getSharedLayoutDefinition(const QString &fileName, const QString &layout,
const QString §ion)
{
int layoutDefOffset = -1;
+ QStringRef nameKey(&fileName);
+ if (nameKey.at(0) == ':') {
+ //use only filename as a key.
+ int index = fileName.lastIndexOf('/');
+ if (index >= 0) {
+ nameKey = fileName.rightRef((fileName.size() - 1) - index);
+ }
+ }
// check in the cache.
- QString key(fileName + layout + section);
+ QString key;
+ QChar separator('\0');
+ key.reserve(nameKey.length() + 2 //separators
+ + layout.length() + section.length());
+ key.append(nameKey)
+ .append(separator)
+ .append(layout)
+ .append(separator)
+ .append(section);
+
if (layoutDefsCache()->contains(key)) {
layoutDefOffset = layoutDefsCache()->value(key);
return layoutDefOffset;
@@ -228,7 +247,8 @@
// no need to check if this item is already present in the
// cache as the parsing of the file happens only once
// in the server side.
- HbSharedCache::instance()->add(HbSharedCache::LayoutDefinition, key, layoutDefOffset);
+ HbSharedCache::instance()->addLayoutDefinition(fileName, layout, section,
+ layoutDefOffset);
} else {
// load failed
layoutDef->~LayoutDefinition();
@@ -387,3 +407,152 @@
}
}
+void HbThemeServerUtils::createThemeIndex(const QString &themePath, const HbThemeType &themetype)
+{
+ #ifdef THEME_INDEX_TRACES
+ qDebug() << "ThemeIndex: createThemeIndex" << themePath.toUtf8();
+ #endif
+ QDir themeBasePath(themePath);
+ // Path is like "C:/resource/hb/themes/icons/sfwhitetheme"
+ QString themeName = themeBasePath.dirName();
+
+ QString filename(themeBasePath.absolutePath());
+ int cutindex = filename.lastIndexOf("/",filename.lastIndexOf("/")-1)+1;
+ filename = filename.left(cutindex);
+ themeBasePath.setPath(filename);
+ filename.append(themeName);
+ filename.append(".themeindex");
+
+ if (themePath == ":\\themes\\icons\\hbdefault") {
+ themeBasePath.setPath(":/themes");
+ filename = ":/themes/hbdefault.themeindex";
+ themeName = "hbdefault";
+ }
+
+ QFile indexFile(filename);
+
+ bool indexOK = false;
+
+ if (indexFile.open(QIODevice::ReadOnly)) {
+
+ indexOK = true;
+
+ GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
+
+ HbSharedChunkHeader *chunkHeader = (HbSharedChunkHeader*) manager->base();
+
+ qint64 byteSize = indexFile.size();
+
+ #ifdef THEME_INDEX_TRACES
+ qDebug() << "ThemeIndex: " << themeName.toUtf8() << " index file size:" << byteSize;
+ #endif
+
+ int offset = manager->alloc(byteSize);
+ if (offset >= 0) {
+ #ifdef THEME_INDEX_TRACES
+ qDebug() << "ThemeIndex: memory allocated for theme: " << themeName.toUtf8();
+ #endif
+
+ // Read the theme index in the shared chunk
+ char *address = HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory, offset);
+
+ indexFile.read(address, byteSize);
+ indexFile.close();
+
+ #ifdef THEME_INDEX_TRACES
+ qDebug() << "ThemeIndex: Reading themeindex for theme" << themeName.toUtf8() << "... Done!";
+ #endif
+
+ // Verify theme index contents if it is not located in ROM,
+ // so that it does not have over-indexing offsets which might
+ // crash all the clients trying to read from it.
+
+#ifdef Q_OS_SYMBIAN // ROM check only for Symbian - verify always in other platforms.
+ if (themePath[0] != 'z' && themePath[0] != 'Z') {
+#endif
+ #ifdef THEME_INDEX_TRACES
+ qDebug() << "ThemeIndex: Validating themeindex for theme" << themeName.toUtf8();
+ #endif
+
+ HbThemeIndex index(address);
+ indexOK = index.validateItems(byteSize);
+
+ #ifdef THEME_INDEX_TRACES
+ qDebug() << "ThemeIndex: Validating themeindex for theme" << themeName.toUtf8() << " done! Result: " << indexOK;
+ #endif
+#ifdef Q_OS_SYMBIAN
+ }
+#endif
+ if (indexOK) {
+ // Allocate theme path string from shared memory
+ QByteArray themePathArray = themeBasePath.absolutePath().toLatin1();
+ quint32 themePathOffset = manager->alloc(themePathArray.size()+1);
+ memcpy(HbMemoryUtils::getAddress<char>(
+ HbMemoryManager::SharedMemory,
+ themePathOffset),
+ themePathArray.data(),
+ themePathArray.size()+1); // +1 for '/0'
+
+ // Allocate theme name string from shared memory
+ QByteArray themeNameArray = themeName.toLatin1();
+ quint32 themeNameOffset = manager->alloc(themeNameArray.size()+1);
+ memcpy(HbMemoryUtils::getAddress<char>(
+ HbMemoryManager::SharedMemory,
+ themeNameOffset),
+ themeNameArray.data(),
+ themeNameArray.size()+1); // +1 for '/0'
+
+ // Store offset to the index in chunk
+ switch (themetype) {
+ case BaseTheme:
+ // Release previously allocated content
+ manager->free(chunkHeader->baseThemePathOffset);
+ manager->free(chunkHeader->baseThemeNameOffset);
+ manager->free(chunkHeader->baseThemeIndexOffset);
+ // Base theme offsets
+ chunkHeader->baseThemePathOffset = themePathOffset;
+ chunkHeader->baseThemeNameOffset = themeNameOffset;
+ chunkHeader->baseThemeIndexOffset = offset;
+ break;
+ case OperatorC:
+ // Release previously allocated content
+ manager->free(chunkHeader->operatorThemeDriveCPathOffset);
+ manager->free(chunkHeader->operatorThemeDriveCNameOffset);
+ manager->free(chunkHeader->operatorThemeDriveCIndexOffset);
+ // Operator theme in C-drive offsets
+ chunkHeader->operatorThemeDriveCPathOffset = themePathOffset;
+ chunkHeader->operatorThemeDriveCNameOffset = themeNameOffset;
+ chunkHeader->operatorThemeDriveCIndexOffset = offset;
+ break;
+ case OperatorROM:
+ // Release previously allocated content
+ manager->free(chunkHeader->operatorThemeRomPathOffset);
+ manager->free(chunkHeader->operatorThemeRomNameOffset);
+ manager->free(chunkHeader->operatorThemeRomIndexOffset);
+ // Operator theme in ROM offsets
+ chunkHeader->operatorThemeRomPathOffset = themePathOffset;
+ chunkHeader->operatorThemeRomNameOffset = themeNameOffset;
+ chunkHeader->operatorThemeRomIndexOffset = offset;
+ break;
+ case ActiveTheme:
+ // Release previously allocated content
+ manager->free(chunkHeader->activeThemePathOffset);
+ manager->free(chunkHeader->activeThemeNameOffset);
+ manager->free(chunkHeader->activeThemeIndexOffset);
+ // Active theme offsets
+ chunkHeader->activeThemePathOffset = themePathOffset;
+ chunkHeader->activeThemeNameOffset = themeNameOffset;
+ chunkHeader->activeThemeIndexOffset = offset;
+ break;
+ default:
+ break;
+ }
+ } else {
+ // If the index contents were not OK, remove the index from the chunk
+ manager->free(offset);
+ }
+ }
+ }
+}
+
+
--- a/src/hbservers/hbthemeserver/hbthemeserverutils_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserverutils_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -58,6 +58,8 @@
static bool removeSharedEffect(const QString &fileName);
static void clearSharedEffects();
+ static void createThemeIndex(const QString &themePath, const HbThemeType &themetype);
+
private:
};
--- a/src/hbservers/hbthemeserver/main.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbservers/hbthemeserver/main.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -26,6 +26,7 @@
#include "hbthemeserverapplication_p.h"
#include <QTextStream>
#include <cstdlib>
+#include <QDebug>
void showHelp(const QString &argv0, const QString &error = QString())
{
--- a/src/hbtools/docml2bin/main.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbtools/docml2bin/main.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -23,11 +23,15 @@
**
****************************************************************************/
+#include <QCoreApplication>
+#include <QStringList>
+#include <QFile>
#include <hbdocumentloader.h>
-#include <QtGui>
#include <assert.h>
#include <iostream>
+#include <QDebug>
+
void showHelp() {
std::cout << "docml2bin.exe usage:\n\n";
@@ -50,11 +54,15 @@
int main(int argc, char *argv[])
{
- QApplication app(argc, argv, false); // GUIenabled=false
+
+ qDebug() << "docml2bin, 1";
+
+ QCoreApplication app(argc, argv);
if (argc <= 2) {
showHelp();
} else {
+ qDebug() << "docml2bin, 2";
//bool backup = false;
QString source, target;
//QStringList restore;
@@ -79,6 +87,7 @@
*/
}
}
+ qDebug() << "docml2bin, 3";
/*
if (restore.count()) {
for (int i = 0; i < restore.count(); i++) {
@@ -106,19 +115,24 @@
source = orig;
}
*/
+ qDebug() << "docml2bin, 4";
if (!QFile::exists(source)) {
std::cout << "Error: file " << source.toStdString() << " does not exist.\n";
} else {
+ qDebug() << "docml2bin, 5";
// Open file and parse lines. Each line should have three value separated with:
QFile sourceFile(source);
if (sourceFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ qDebug() << "docml2bin, 6";
if (!target.length()) {
target = source + ".bin";
}
QFile targetFile(target);
if (targetFile.open(QIODevice::WriteOnly)) {
+ qDebug() << "docml2bin, 7";
HbDocumentLoader loader;
loader.createBinary( &sourceFile, &targetFile );
+ qDebug() << "docml2bin, 8";
targetFile.close();
}
sourceFile.close();
@@ -126,6 +140,7 @@
}
}
}
+ qDebug() << "docml2bin, 9";
return 0;
}
--- a/src/hbtools/hbbincssmaker/hbbincssmaker.pro Thu May 27 13:10:59 2010 +0300
+++ b/src/hbtools/hbbincssmaker/hbbincssmaker.pro Fri Jun 11 13:58:22 2010 +0300
@@ -39,6 +39,7 @@
DEPENDPATH += $${HB_SOURCE_DIR}/src/hbcore/image
DEPENDPATH += $${HB_SOURCE_DIR}/src/hbcore/style
DEPENDPATH += $${HB_SOURCE_DIR}/src/hbcore/feedback
+DEPENDPATH += $${HB_SOURCE_DIR}/src/hbcore/layouts
INCLUDEPATH += .
INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/core
@@ -49,6 +50,7 @@
INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/image
INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/style
INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/feedback
+INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/layouts
QT = core gui svg
QT += network
@@ -91,6 +93,15 @@
SOURCES += $${HB_SOURCE_DIR}/src/hbcore/cssparser/hbwidgetstyleloader_p.cpp
SOURCES += $${HB_SOURCE_DIR}/src/hbcore/cssparser/hbstyleselector_p.cpp
+# widgetml parsing.
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/utils/hbwidgetloader.cpp
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/utils/hbwidgetloaderactions_p.cpp
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/utils/hbwidgetloadersyntax_p.cpp
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/utils/hbxmlloaderbaseactions_p.cpp
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/utils/hbxmlloaderabstractsyntax_p.cpp
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/utils/hbxmlloaderbasesyntax_p.cpp
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/utils/hbxmlloaderabstractactions_p.cpp
+
DEFINES += HB_BOOTSTRAPPED
DEFINES += HB_BIN_CSS
DEFINES -= HB_GESTURE_FW
@@ -100,9 +111,12 @@
DEFINES += HB_PLUGINS_DIR=\"\\\"$${HB_PLUGINS_DIR}\\\"\"
# Input
+HEADERS += hbcssconverterutils_p.h
+HEADERS += hboffsetmapbuilder_p.h
+
SOURCES += main.cpp
-HEADERS += hbcssconverterutils_p.h
SOURCES += hbcssconverterutils.cpp
+SOURCES += hboffsetmapbuilder.cpp
# installation
!local {
--- a/src/hbtools/hbbincssmaker/hbcssconverterutils.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbtools/hbbincssmaker/hbcssconverterutils.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -55,10 +55,16 @@
registered.remove(offset);
}
-
-QList<int *> HbCssConverterUtils::registeredOffsetHolders()
+QMultiHash<int, int *> HbCssConverterUtils::registeredOffsetHolders()
{
- return registered.keys();
+ QMultiHash<int, int *> holders;
+ holders.reserve(registered.size());
+ QMap<int *, int>::const_iterator end = registered.constEnd();
+ for (QMap<int *, int>::const_iterator i = registered.constBegin(); i != end; ++i) {
+ int *holder = i.key();
+ holders.insertMulti(*holder, holder);
+ }
+ return holders;
}
void HbCssConverterUtils::unregisterAll()
@@ -84,13 +90,14 @@
GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
HbSharedMemoryManager *shared = static_cast<HbSharedMemoryManager*>(manager);
const char *chunkBase = static_cast<const char *>(shared->base());
+ const char *freedEnd = chunkBase + offset + size;
+ const int *freedStart = reinterpret_cast<const int *>(chunkBase + offset);
- QList<int *> offsetHolders = HbCssConverterUtils::registeredOffsetHolders();
- for (int i = 0; i<offsetHolders.count(); ++i) {
- int *holder = offsetHolders.at(i);
- if ((char*)holder >= chunkBase + offset && (char*)holder < chunkBase + offset + size) {
- HbCssConverterUtils::unregisterOffsetHolder(holder);
- }
+ QMap<int *, int>::iterator freedHolders =
+ registered.lowerBound(const_cast<int *>(freedStart));
+ while(freedHolders != registered.end()
+ && reinterpret_cast<char*>(freedHolders.key()) < freedEnd) {
+ freedHolders = registered.erase(freedHolders);
}
}
}
@@ -102,19 +109,23 @@
if (size > 0) {
// Check if there were registered offset holders in the old cell
// and register corresponding ones in the reallocated cell.
- QList<int *> holders = HbCssConverterUtils::registeredOffsetHolders();
-
GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
HbSharedMemoryManager *shared = static_cast<HbSharedMemoryManager*>(manager);
- const char *chunkBase = static_cast<const char *>(shared->base());
-
- for (int i=0; i<holders.count(); i++) {
- int *holder = holders.at(i);
- char *holderC = (char*)holder;
- if (holderC >= chunkBase + offset && holderC < chunkBase + offset + size) {
- HbCssConverterUtils::unregisterOffsetHolder(holder);
- HbCssConverterUtils::registerOffsetHolder((int*)(holderC + newOffset - offset));
- }
+ const char *chunkBase = static_cast<const char *>(shared->base());
+ const char *freedEnd = chunkBase + offset + size;
+ const int *freedStart = reinterpret_cast<const int *>(chunkBase + offset);
+
+ QMap<int *, int>::iterator freedHolders =
+ registered.lowerBound(const_cast<int *>(freedStart));
+ QList<int *> newHolders;
+ while(freedHolders != registered.end()
+ && reinterpret_cast<char*>(freedHolders.key()) < freedEnd) {
+ char *holderC = reinterpret_cast<char*>(freedHolders.key());
+ newHolders.append(reinterpret_cast<int*>(holderC + newOffset - offset));
+ freedHolders = registered.erase(freedHolders);
+ }
+ for (int i = 0; i < newHolders.size(); ++i) {
+ registerOffsetHolder(newHolders.at(i));
}
}
}
@@ -129,62 +140,56 @@
GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
HbSharedMemoryManager *shared = static_cast<HbSharedMemoryManager*>(manager);
- // Register shared cache pointer in chunk header as shared cache may also be moved in defragmentation
- HbSharedChunkHeader *chunkHeader = static_cast<HbSharedChunkHeader*>(shared->base());
- HbCssConverterUtils::registerOffsetHolder(reinterpret_cast<int *>(&chunkHeader->sharedCacheOffset));
+ // Register shared cache pointer in chunk header
+ //as shared cache may also be moved in defragmentation
+ HbSharedChunkHeader *chunkHeader = static_cast<HbSharedChunkHeader*>(shared->base());
+ registerOffsetHolder(reinterpret_cast<int *>(&chunkHeader->sharedCacheOffset));
- QList<int *> offsetHolders = HbCssConverterUtils::registeredOffsetHolders();
+ QMultiHash<int, int *> offsetHolders = registeredOffsetHolders();
// Create new buffer where the current chunk contents are defragmented
- void *buffer = ::malloc(shared->size());
+ char *buffer = static_cast<char*>(::malloc(shared->size()));
int newCurrentOffset = 0;
// Create new cell order and update offset holders
- QMap<int,int>::const_iterator i = cells.constBegin();
+ QMap<int,int>::const_iterator end = cells.constEnd();
- while (i != cells.constEnd()) {
+ for (QMap<int,int>::const_iterator i = cells.constBegin(); i != end; ++i) {
// Get the old cell
int offset = i.key();
int size = i.value();
// Update registered offset holders
-
- // TODO: optimize this, now there's linear search for each cell!
- for (int j=0; j<offsetHolders.count(); ++j) {
- int *holder = offsetHolders.at(j);
- if (*holder == offset) {
- // Change stored offset value
- *holder = newCurrentOffset + sizeof(HbSharedChunkHeader);
- }
- }
-
+ QList<int *> values = offsetHolders.values(offset);
+ offsetHolders.remove(offset);
+ int newOffset = newCurrentOffset + sizeof(HbSharedChunkHeader);
+ for (int j = 0; j < values.size(); ++j) {
+ int *holder = values[j];
+ *holder = newOffset;
+ offsetHolders.insertMulti(*holder, holder);
+ }
newCurrentOffset += size;
- i++;
}
- i = cells.constBegin();
newCurrentOffset = 0;
-
// Move allocated cells to a linear buffer
- while (i != cells.constEnd()) {
+ for (QMap<int, int>::const_iterator i = cells.constBegin(); i != end; ++i) {
// Get the old cell
int offset = i.key();
int size = i.value();
// Copy to new chunk
- memcpy((char*)buffer + newCurrentOffset, (char*)shared->base() + offset, size);
-
+ memcpy(buffer + newCurrentOffset, static_cast<char*>(shared->base()) + offset, size);
newCurrentOffset += size;
- i++;
}
// Free all cells from the shared chunk and move the defragmented buffer in the beginning of the chunk.
// Note that chunk memory management is screwed up after this point, so no more allocations should be
// done in it after this.
- HbCssConverterUtils::unregisterAll();
+ unregisterAll();
QList<int> keys = cells.keys();
- for (int j=0; j<keys.count(); ++j) {
+ for (int j = 0; j < keys.count(); ++j) {
shared->free(keys.at(j));
}
--- a/src/hbtools/hbbincssmaker/hbcssconverterutils_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbtools/hbbincssmaker/hbcssconverterutils_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -27,6 +27,7 @@
#define HBCSSCONVERTERUTILS_P_H
#include <QList>
+#include <QMultiHash>
class HbCssConverterUtils
{
@@ -34,7 +35,7 @@
// Shared chunk offset management
static void registerOffsetHolder(int *offset);
static void unregisterOffsetHolder(int *offset);
- static QList<int *> registeredOffsetHolders();
+ static QMultiHash<int, int *> registeredOffsetHolders();
static void unregisterAll();
// Shared chunk allocation management
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbtools/hbbincssmaker/hboffsetmapbuilder.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,133 @@
+/****************************************************************************
+**
+** 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 HbTools 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 "hboffsetmapbuilder_p.h"
+
+#include <QFileInfo>
+
+extern QTextStream err;
+
+/*!
+ Adds \a offsets for a \a className. \a fileInfo points to the layout css file.
+ \a offsets are indexed using CSSFileType - enum value.
+*/
+bool HbOffsetMapBuilder::addWidgetOffsets(const QString &className,
+ const QFileInfo *fileInfo,
+ int offsets[])
+{
+ bool retValue = true;
+ quint32 nameHash = HbSharedCache::hash(QStringRef(&className));
+ HbBinMakerOffsetItem mapItem = _mapItems.value(nameHash, HbBinMakerOffsetItem());
+ if (mapItem.isNull()) {
+ if (fileInfo) {
+ mapItem.name = fileInfo->absoluteFilePath();
+ }
+ mapItem.widgetHash = nameHash;
+ mapItem.offsetCSS = offsets[CSSFile];
+ mapItem.offsetColorCSS = offsets[ColorCSSFile];
+ _mapItems.insert(nameHash, mapItem);
+ } else {
+ err << "duplicate hash value found!" << endl;
+ retValue = false;
+ }
+ return retValue;
+}
+
+/*!
+ Adds \a widgetML layout offsets for a class, which hash is \a classNameHash.
+ Widget offsets for a class must already be added, before calling this method,
+ see \sa addWidgetOffsets.
+ Offsets for each layout is in \a layoutInfoList. \a filePath contains the path to the
+ widgetml file for the class.
+*/
+bool HbOffsetMapBuilder::addWidgetMLOffsets(const QString &filePath,
+ quint32 classNameHash,
+ const QList<LayoutItem> &layoutInfoList)
+{
+ bool retValue = true;
+ QMap<quint32, HbBinMakerOffsetItem>::iterator offsetItem = _mapItems.find(classNameHash);
+ if (offsetItem != _mapItems.end()) {
+ QSet<quint64> hashCheck;
+ QList<HbLayoutIndexItem> &layoutIndexTable = offsetItem.value().layoutIndexItemList;
+ Q_FOREACH(const LayoutItem &layoutInfo, layoutInfoList) {
+ HbLayoutIndexItem item;
+ item.layoutNameHash = HbSharedCache::hash(QStringRef(&layoutInfo.layout->layoutname));
+ item.sectionNameHash = HbSharedCache::hash(QStringRef(&layoutInfo.layout->section));
+ quint64 hash = (quint64(item.layoutNameHash) << 32) | item.sectionNameHash;
+ if (!hashCheck.contains(hash)) {
+ hashCheck.insert(hash);
+ } else {
+ err << "duplicate layout name hash found for: " << filePath << endl;
+ retValue = false;
+ break;
+ }
+ item.offset = layoutInfo.offset;
+ layoutIndexTable.append(item);
+ }
+ }
+ return retValue;
+}
+
+/*!
+ dumps the contents of the offset map to bytearray.
+
+*/
+QByteArray HbOffsetMapBuilder::result()
+{
+ QByteArray dataArray;
+
+ //first layoutindextable is locates after the offsetitem-array.
+ int currentLayoutIndexTableOffset = _mapItems.size() * sizeof(HbOffsetItem);
+
+ //store offsetitems, update layout index table offset
+ foreach(const HbBinMakerOffsetItem &mapItem, _mapItems) {
+ HbOffsetItem tmp(mapItem);
+ if (!mapItem.layoutIndexItemList.isEmpty()) {
+ tmp.offsetLayoutIndexTable = currentLayoutIndexTableOffset;
+ currentLayoutIndexTableOffset += sizeof(quint32) // space for the size of the layoutindex table
+ + mapItem.layoutIndexItemList.size()
+ * sizeof(HbLayoutIndexItem);
+ }
+ dataArray.append(reinterpret_cast<const char*>(&tmp), sizeof(HbOffsetItem));
+ }
+
+ //store layout index tables
+ QMap<quint32, HbBinMakerOffsetItem>::iterator end = _mapItems.end();
+ for(QMap<quint32, HbBinMakerOffsetItem>::iterator i = _mapItems.begin(); i != end; ++i) {
+ HbBinMakerOffsetItem &mapItem = i.value();
+ if (!mapItem.layoutIndexItemList.isEmpty()) {
+ qSort(mapItem.layoutIndexItemList); //sort for binary search.
+ //store the table size first.
+ quint32 size = mapItem.layoutIndexItemList.size();
+ dataArray.append(reinterpret_cast<const char*>(&size), sizeof(quint32));
+ //store the layout-index items.
+ foreach(const HbLayoutIndexItem &layoutIndexItem, mapItem.layoutIndexItemList) {
+ dataArray.append(reinterpret_cast<const char*>(&layoutIndexItem),
+ sizeof(HbLayoutIndexItem));
+ }
+ }
+ }
+ return dataArray;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbtools/hbbincssmaker/hboffsetmapbuilder_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** 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 HbTools 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 HBOFFSETMAPBUILDER_P_H
+#define HBOFFSETMAPBUILDER_P_H
+
+#include <hbsharedcache_p.h>
+
+#include <QString>
+#include <QMap>
+#include <QList>
+
+class QFileInfo;
+
+enum CSSFileType {
+ CSSFile = 0,
+ ColorCSSFile,
+ CSSFileTypeEnd
+};
+
+struct CSSLayoutInfo
+{
+ QString layoutname;
+ QString section;
+};
+
+struct LayoutItem
+{
+ LayoutItem(const CSSLayoutInfo* layout) : layout(layout), offset(-1)
+ {
+ Q_ASSERT(layout);
+ }
+
+ const CSSLayoutInfo* layout;
+ int offset;
+};
+
+struct HbBinMakerOffsetItem : public HbOffsetItem
+{
+ QString name;
+ QList<HbLayoutIndexItem> layoutIndexItemList;
+ bool isNull() const
+ {
+ return offsetCSS == -1
+ && offsetColorCSS == -1
+ && offsetLayoutIndexTable == -1;
+ }
+};
+
+class HbOffsetMapBuilder
+{
+public:
+ HbOffsetMapBuilder() {}
+
+ bool addWidgetOffsets(const QString &className,
+ const QFileInfo *fileInfo,
+ int offsets[]);
+ bool addWidgetMLOffsets(const QString &fileName,
+ quint32 classNameHash,
+ const QList<LayoutItem> &layoutInfoList);
+
+ QByteArray result();
+ int size() const { return _mapItems.count(); }
+
+ QList<HbBinMakerOffsetItem> items() const
+ {
+ return _mapItems.values();
+ }
+
+private:
+ QMap<quint32, HbBinMakerOffsetItem> _mapItems;
+};
+
+#endif // HBOFFSETMAPBUILDER_P_H
--- a/src/hbtools/hbbincssmaker/main.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbtools/hbbincssmaker/main.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -32,10 +32,17 @@
#include <hbsharedmemorymanager_p.h>
#include <hbsharedcache_p.h>
#include <hbcssconverterutils_p.h>
+#include <hboffsetmapbuilder_p.h>
+#include <hbwidgetloader_p.h>
// Global variables
-QString AppName("hbbincssmaker");
+static const QString CSSFileExtension = ".css";
+static const QString WMLFileExtension = ".widgetml";
+static const QString ColorCSSEnding = "_color.css";
+
+static const QString AppName = "hbbincssmaker";
static bool verboseOn = false;
+
QTextStream out(stdout);
QTextStream verboseOut(stderr);
QTextStream err(stderr);
@@ -44,6 +51,17 @@
#define VERBOSEIF(test, statement) if(verboseOn && test) { verboseOut << statement; }
#define VERBOSELN(statement) if(verboseOn) { verboseOut << statement << endl; }
+struct WidgetMLParseInput
+{
+ QString filename;
+ QList<CSSLayoutInfo> layouts;
+
+ void clear()
+ {
+ layouts.clear();
+ filename.clear();
+ }
+};
void testDeclarations(const HbVector<HbCss::Declaration> &decls)
{
@@ -115,72 +133,114 @@
}
}
-class CssMap
+void testLayoutDef(const HbWidgetLoader::LayoutDefinition *layoutDef)
+{
+ VERBOSELN("mesh items count: " << layoutDef->meshItems.count());
+ for (int i = 0; i < layoutDef->meshItems.count(); ++i) {
+ const HbWidgetLoader::MeshItem &meshItem = layoutDef->meshItems.at(i);
+ VERBOSELN("src: " << meshItem.src);
+ VERBOSELN("dst: " << meshItem.dst);
+ VERBOSELN("spacing text: " << meshItem.spacingText);
+ VERBOSELN("spacer: " << meshItem.spacer);
+ }
+}
+
+bool testCss()
{
-public:
- CssMap() {}
- void add(const QString &cssName, unsigned int offset)
- {
- HbOffsetItem mapItem = _mapItems.value(cssName, HbOffsetItem());
- if (mapItem.nameOffset < 0) {
- mapItem.nameOffset = _cssNameBuffer.size();
- mapItem.offset = offset;
- _cssNameBuffer.append(cssName.toLatin1()).append('\0');
- _mapItems.insert(cssName, mapItem);
- } else {
- err << "warning: duplicate cache key for " << cssName << endl;
- }
- }
+ GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
+ HbSharedMemoryManager *shared = static_cast<HbSharedMemoryManager*>(manager);
+ HbSharedCache *cache = shared->cache();
- void registerOffsetHolders() {
- foreach(const HbOffsetItem &mapItem, _mapItems) {
- HbCssConverterUtils::registerOffsetHolder(const_cast<int *>(&mapItem.offset));
+ for (int k = 0; k < cache->mOffsetItemCount; ++k) {
+ if (cache->mOffsetItems[k].offsetCSS >= 0) {
+ HbCss::StyleSheet *sheet = HbMemoryUtils::getAddress<HbCss::StyleSheet>(
+ HbMemoryManager::SharedMemory, cache->mOffsetItems[k].offsetCSS);
+ VERBOSELN("Cssmap item " << k
+ << "- hash value: \"" << cache->mOffsetItems[k].offsetCSS << "\"");
+ // Tests the stylesheet offsets and prints info to verbose out
+ testStyleSheet(sheet);
+
+ //test layout definition.
+ int tableSize = 0;
+ const HbLayoutIndexItem *ptr = cache->layoutIndexItemBegin(
+ cache->mOffsetItems[k].offsetLayoutIndexTable, &tableSize);
+ for (; tableSize > 0; --tableSize, ++ptr) {
+ HbWidgetLoader::LayoutDefinition *layoutDef =
+ HbMemoryUtils::getAddress<HbWidgetLoader::LayoutDefinition>(
+ HbMemoryManager::SharedMemory, ptr->offset);
+ testLayoutDef(layoutDef);
+ }
}
}
+ return true;
+}
- QByteArray data() const {
- QByteArray dataArray;
- int count = _mapItems.size();
- int adjustment = count * sizeof(HbOffsetItem);
- foreach(const HbOffsetItem &mapItem, _mapItems) {
- HbOffsetItem tmp(mapItem);
- // Fix offsets in the items to be based on the beginning of the css map instead of
- // the beginning of the css name buffer.
- tmp.nameOffset += adjustment;
- dataArray.append(reinterpret_cast<const char*>(&tmp), sizeof(HbOffsetItem));
- }
- dataArray.append(_cssNameBuffer);
- return dataArray;
- }
- int size() const { return _mapItems.count(); }
+/*!
+ Collects and return layout names from \a styleRules.
+ \a layoutSet - map of already found layoutnames and sections to prevent duplicate layouts
+ to be added.
-private:
- QMap<QString, HbOffsetItem> _mapItems;
- QByteArray _cssNameBuffer;
-};
+*/
+QList<CSSLayoutInfo> collectLayoutNames(
+ QSet<QPair<QString, QString> > &layoutSet,
+ const HbVector<HbCss::StyleRule> &styleRules)
+{
+ QList<CSSLayoutInfo> layouts;
+ layouts.append(CSSLayoutInfo());
-struct InputFile
-{
- InputFile(const QString &cacheName, const QFileInfo &file) : cacheName(cacheName), file(file)
- {
+ foreach(const HbCss::StyleRule &rule, styleRules) {
+ foreach(const HbCss::Declaration &decl, rule.declarations) {
+ if (decl.propertyId == HbCss::Property_Layout) {
+ if (decl.values.count() == 1) {
+ layouts.last().layoutname = decl.values.at(0).variant.toString();
+ }
+ } else if (decl.propertyId == HbCss::Property_Section) {
+ if (decl.values.count() == 1) {
+ layouts.last().section = decl.values.at(0).variant.toString();
+ }
+ }
+ }
+ const CSSLayoutInfo &infoRef = layouts.last();
+ if (!infoRef.layoutname.isEmpty()) {
+ QPair<QString, QString> layout = qMakePair(infoRef.layoutname,
+ infoRef.section);
+ //only add layout, if not already collected before.
+ if (!layoutSet.contains(layout)) {
+ layoutSet.insert(layout);
+ layouts.append(CSSLayoutInfo());
+ }
+ }
}
-
- QString cacheName;
- QFileInfo file;
-};
-typedef QList<InputFile> InputFileList;
+ layouts.removeLast();
+ return layouts;
+}
-struct InputFileInfo
+/*!
+ Collects all the layouts defined in \a stylesheet and add the result to \a input.
+ returns true, if at least one layout is found.
+*/
+bool collectLayouts(const QString &cssFilePath,
+ HbCss::StyleSheet *styleSheet,
+ WidgetMLParseInput &input)
{
- QString base;
- QString path;
- QString prefix;
-};
-typedef QList<InputFileInfo> InputFileInfoList;
-
-bool operator < (const InputFile & if1, const InputFile & if2)
-{
- return if1.file.size() > if2.file.size();
+ input.clear();
+ QSet<QPair<QString, QString> > layoutSet; //for removing duplicate layout names.
+ foreach(const HbCss::WidgetStyleRules &rule, styleSheet->widgetRules) {
+ layoutSet.clear();
+ input.layouts += collectLayoutNames(layoutSet, rule.styleRules);
+ input.layouts += collectLayoutNames(layoutSet, rule.portraitRules);
+ input.layouts += collectLayoutNames(layoutSet, rule.landscapeRules);
+ }
+ bool hasLayoutDef = false;
+ if (!input.layouts.isEmpty()) {
+ //if css contains at least 1 layout declaration, it might have .widgetml file.
+ QString filePath(cssFilePath);
+ filePath.replace(filePath.size() - CSSFileExtension.size(),
+ CSSFileExtension.size(), WMLFileExtension);
+ input.filename = filePath;
+ hasLayoutDef = true;
+ }
+ return hasLayoutDef;
}
void printHelp()
@@ -206,103 +266,203 @@
return collected;
}
-InputFileList collectCssFiles(const QStringList &inputFilePaths)
+QMap<QString, QFileInfo> collectCssFiles(const QStringList &inputFilePaths)
{
QStringList filters;
filters << "*.css";
- InputFileList inputFiles;
+ QMap<QString, QFileInfo> cssFileMap;
QFileInfoList inputPath;
inputPath.append(QFileInfo());
Q_FOREACH(const QString &path, inputFilePaths) {
inputPath[0].setFile(path);
QFileInfoList allFiles = collectFiles(inputPath, filters);
Q_FOREACH(const QFileInfo &info, allFiles) {
- inputFiles.append(InputFile(info.fileName(), info));
+ QMap<QString, QFileInfo>::const_iterator i = cssFileMap.find(info.fileName());
+ if (i == cssFileMap.end()) {
+ cssFileMap.insert(info.fileName(), info);
+ } else {
+ err << "duplicate css filenames found: " << i.value().absoluteFilePath() <<
+ " & " << info.absoluteFilePath();
+ }
}
}
- return inputFiles;
+ return cssFileMap;
}
-bool writeCssBinary(const QStringList &inputFiles, const QString &targetFile)
+/*!
+ Collects the css files from \a inputFiles, parses them to shared memory, stores
+ offsets to \a offsetMap.
+ returns true on success.
+*/
+bool parseCss(const QStringList &inputFiles, HbOffsetMapBuilder &offsetMap)
{
if (inputFiles.isEmpty()) return false;
- InputFileList cssFiles = collectCssFiles(inputFiles);
- if (cssFiles.isEmpty()) return false;
- qSort(cssFiles);
+ QMap<QString, QFileInfo> cssFiles = collectCssFiles(inputFiles);
HbCss::Parser parser;
HbCss::StyleSheet *styleSheet = 0;
bool success = false;
- CssMap cssMap;
+
GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
- Q_FOREACH(const InputFile &inputFile, cssFiles) {
- const QFileInfo &file = inputFile.file;
- VERBOSE("processing " << file.absoluteFilePath() << "...");
- success = false;
- int offset = manager->alloc(sizeof(HbCss::StyleSheet));
- if (offset >= 0) {
- styleSheet = new (static_cast<char*>(manager->base()) + offset)
- HbCss::StyleSheet(HbMemoryManager::SharedMemory);
- parser.init(file.absoluteFilePath(), true);
- success = parser.parse(styleSheet);
- cssMap.add(inputFile.cacheName, offset);
- VERBOSE("cache key = " << inputFile.cacheName << "...");
+ while (!cssFiles.isEmpty()) {
+ QMap<QString, QFileInfo>::iterator first = cssFiles.begin();
+ QMap<QString, QFileInfo>::iterator CSSFiles[CSSFileTypeEnd];
+
+ QString widgetName(first.key());
+ if (widgetName.endsWith(ColorCSSEnding)) {
+ //color css file, find the layout css pair.
+ CSSFiles[ColorCSSFile] = first;
+ widgetName.remove(widgetName.size() - ColorCSSEnding.size(),
+ ColorCSSEnding.size());
+ CSSFiles[CSSFile] = cssFiles.find(widgetName + CSSFileExtension);
+ } else {
+ //layout css file, find the color css pair.
+ CSSFiles[CSSFile] = first;
+ widgetName.remove(widgetName.size() - CSSFileExtension.size(),
+ CSSFileExtension.size());
+ CSSFiles[ColorCSSFile] = cssFiles.find(widgetName + ColorCSSEnding);
+ }
+ int offsets[] = {-1, -1};
+
+ for (int i = 0; i < CSSFileTypeEnd; ++i) {
+ if (CSSFiles[i] != cssFiles.end()) {
+ const QFileInfo &file = CSSFiles[i].value();
+ VERBOSE("processing " << file.absoluteFilePath() << "...");
+ offsets[i] = manager->alloc(sizeof(HbCss::StyleSheet));
+ if (offsets[i] >= 0) {
+ styleSheet = new (static_cast<char*>(manager->base()) + offsets[i])
+ HbCss::StyleSheet(HbMemoryManager::SharedMemory);
+ parser.init(file.absoluteFilePath(), true);
+ success = parser.parse(styleSheet);
+ VERBOSE("cache key = " << CSSFiles[i].key() << "...");
+ }
+ if (success) {
+ VERBOSELN("ok");
+ } else {
+ VERBOSELN("failed");
+ err << "Failed to parse: " << file.absoluteFilePath() << endl;
+ break;
+ }
+ }
}
+
+ const QFileInfo *info = 0;
+ QString tmp;
+ if (CSSFiles[CSSFile] != cssFiles.end()) {
+ tmp = CSSFiles[CSSFile].key();
+ info = &CSSFiles[CSSFile].value();
+ }
+ if (!offsetMap.addWidgetOffsets(widgetName, info, offsets)) {
+ return false;
+ }
+
+ //remove processed files from the map.
+ cssFiles.erase(CSSFiles[ColorCSSFile]);
+ if (!tmp.isEmpty()) {
+ cssFiles.remove(tmp);
+ }
+ }
+ return success;
+}
+
+/*!
+ Parses widgetml file and all the layouts using the info from \a parseInput for a widget,
+ which hash is \a widgetHash, add offsets to \a offsetMap.
+*/
+bool parseWidgetML(HbOffsetMapBuilder &offsetMap,
+ quint32 widgetHash,
+ const WidgetMLParseInput &parseInput)
+{
+ HbWidgetLoader loader;
+
+ VERBOSELN("processing: " << parseInput.filename);
+ QFile file(parseInput.filename);
+ if (!file.open(QFile::ReadOnly | QFile::Text)) {
+ VERBOSELN("unable to open file: " << parseInput.filename);
+ return false;
+ }
+ HbWidgetLoader::LayoutDefinition *layoutDef = 0;
+ int layoutDefOffset = -1;
+ bool success = true;
+
+ GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
+ QList<LayoutItem> layoutInfoList;
+ Q_FOREACH(const CSSLayoutInfo &info, parseInput.layouts) {
+ VERBOSE("layout: " << info.layoutname << ", " << "section: " << info.section << "...");
+
+ layoutDefOffset = manager->alloc(sizeof(HbWidgetLoader::LayoutDefinition));
+ layoutDef = new(static_cast<char *>(manager->base()) + layoutDefOffset)
+ HbWidgetLoader::LayoutDefinition(HbMemoryManager::SharedMemory);
+ success = loader.loadLayoutDefinition(layoutDef, &file, info.layoutname, info.section);
+
if (success) {
+ layoutInfoList.append(LayoutItem(&info));
+ layoutInfoList.last().offset = layoutDefOffset;
VERBOSELN("ok");
} else {
VERBOSELN("failed");
- err << "Failed to parse: " << file.absoluteFilePath() << endl;
break;
}
+ file.seek(0);
+ }
+ success = offsetMap.addWidgetMLOffsets(parseInput.filename, widgetHash, layoutInfoList);
+ return success;
+}
+
+/*!
+ Parse all the widgetmls to shared memory for widget's found in \a offsetMap,
+ store the offsets to \a offsetMap.
+*/
+bool parseWidgetML(HbOffsetMapBuilder &offsetMap)
+{
+ QList<HbBinMakerOffsetItem> itemList = offsetMap.items();
+ Q_FOREACH(const HbBinMakerOffsetItem &item, itemList) {
+ if (item.offsetCSS >= 0) {
+ HbCss::StyleSheet *sheet = HbMemoryUtils::getAddress<HbCss::StyleSheet>(
+ HbMemoryManager::SharedMemory, item.offsetCSS);
+ WidgetMLParseInput file;
+ if (collectLayouts(item.name, sheet, file)) {
+ parseWidgetML(offsetMap, item.widgetHash, file);
+ }
+ }
}
- if (success) {
- HbSharedMemoryManager *shared = static_cast<HbSharedMemoryManager*>(manager);
-
- // Create shared cache to shared memory.
- QByteArray data(cssMap.data());
-
- if (shared->createSharedCache(data.data(), data.size(), cssMap.size())) {
+ return true;
+}
- // Defragment the chunk contents before dumping it in a file
- int endOffset = HbCssConverterUtils::defragmentChunk();
-
- if (verboseOn) {
- HbSharedCache *cache = shared->cache();
-
- for (int k=0; k<cache->mOffsetItemCount; ++k) {
- HbCss::StyleSheet *sheet = HbMemoryUtils::getAddress<HbCss::StyleSheet>(
- HbMemoryManager::SharedMemory, cache->mOffsetItems[k].offset);
-
- QString name(QLatin1String( ((char*)(cache->mOffsetItems)) + cache->mOffsetItems[k].nameOffset));
+bool writeCssBinary(const QStringList &inputFiles, const QString &targetFile)
+{
+ HbOffsetMapBuilder offsetMap;
+ if (!(parseCss(inputFiles, offsetMap)
+ && parseWidgetML(offsetMap))) {
+ return false;
+ }
+ GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
+ HbSharedMemoryManager *shared = static_cast<HbSharedMemoryManager*>(manager);
- VERBOSE("Cssmap item ");
- VERBOSE(k);
- VERBOSE("- name: \"");
- VERBOSE(name);
- VERBOSELN("\"");
+ // Create shared cache to shared memory.
+ QByteArray data(offsetMap.result());
+ bool success = false;
+ if (shared->createSharedCache(data.data(), data.size(), offsetMap.size())) {
+ // Defragment the chunk contents before dumping it in a file
+ int endOffset = HbCssConverterUtils::defragmentChunk();
+ if (verboseOn) testCss();
- // Tests the stylesheet offsets and prints info to verbose out
- testStyleSheet(sheet);
- }
- }
-
- VERBOSELN("writing the binary file");
- QFile binFile(targetFile);
- if (!binFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
- err << "failed to open target binary file: " << binFile.fileName() << endl;
- return false;
- }
- //int size = shared->size();
- if (binFile.write(static_cast<char*>(manager->base()), endOffset) >= 0) {
+ VERBOSELN("writing the binary file");
+ QFile binFile(targetFile);
+ success = binFile.open(QIODevice::WriteOnly | QIODevice::Truncate);
+ if (success) {
+ success = (binFile.write(static_cast<char*>(manager->base()), endOffset) >= 0);
+ if (success) {
VERBOSELN("Wrote target binary file: " << binFile.fileName());
} else {
err << "failed to write to target binary file: " << binFile.fileName() << endl;
}
} else {
- err << "failed to create shared cache." << endl;
+ err << "failed to open target binary file: " << binFile.fileName() << endl;
}
+ } else {
+ err << "failed to create shared cache." << endl;
}
return success;
}
@@ -310,6 +470,7 @@
int main(int argc, char **argv)
{
QCoreApplication app(argc, argv);
+ int returnValue = 0;
if(argc < 3) {
printHelp();
@@ -335,15 +496,18 @@
if (targetFile.isEmpty()) {
err << "target filename needed" << endl << endl;
printHelp();
+ returnValue = 1;
} else {
QString parentDir(QFileInfo(targetFile).absolutePath());
if (QDir::current().mkpath(parentDir)) {
- writeCssBinary(inputFiles, targetFile);
+ if (!writeCssBinary(inputFiles, targetFile)) {
+ returnValue = 3;
+ }
} else {
err << "failed to create path: " << parentDir << endl;
+ returnValue = 2;
}
}
}
- return 0;
+ return returnValue;
}
-
--- a/src/hbutils/document/hbdocumentloader.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbutils/document/hbdocumentloader.h Fri Jun 11 13:58:22 2010 +0300
@@ -40,7 +40,7 @@
class HbMainWindow;
class HbDocumentLoaderPrivate;
-class HB_TOOLS_EXPORT HbDocumentLoader
+class HB_UTILS_EXPORT HbDocumentLoader
{
public:
HbDocumentLoader();
--- a/src/hbutils/document/hbdocumentloader_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbutils/document/hbdocumentloader_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -31,6 +31,8 @@
#include <hbxmlloaderbinaryactions_p.h>
#include <hbxmlloaderbinarysyntax_p.h>
+#include <QDebug>
+
#ifndef HB_BOOTSTRAPPED
#include <QGraphicsWidget>
@@ -110,6 +112,7 @@
bool HbDocumentLoaderPrivate::createBinary( QIODevice *srcDevice, QIODevice *dstDevice )
{
+ qDebug() << "createBinary, 1";
bool result = true;
syntax->setActions( binaryactions );
#ifdef DEBUG_TIMES
@@ -121,24 +124,31 @@
QList<QString> sectionsList;
QHash< QString, qint64 > sectionsPositionList;
qint64 startPos = srcDevice->pos();
+ qDebug() << "createBinary, 2";
if( syntax->scanForSections( srcDevice, sectionsList ) ) {
+ qDebug() << "createBinary, 3";
srcDevice->seek( startPos );
+ qDebug() << "createBinary, 4";
result = syntax->load( srcDevice, "" );
if( !sectionsList.isEmpty() ) {
for( int i = 0; i < sectionsList.size(); i++ ) {
sectionsPositionList[ sectionsList.at( i ) ] = dstDevice->pos();
srcDevice->seek( startPos );
+ qDebug() << "createBinary, 5, " << i;
result &= syntax->load( srcDevice, sectionsList.at( i ) );
+ qDebug() << "createBinary, 6, " << i;
}
}
} else {
result = false;
}
+ qDebug() << "createBinary, 7";
qint64 sectionsMetaDataPos = dstDevice->pos();
QDataStream stream( dstDevice );
stream << sectionsPositionList;
stream << sectionsMetaDataPos;
+ qDebug() << "createBinary, 8";
#ifdef DEBUG_TIMES
debugPrintX("MYTRACE: DocML create binary, end: %d", debugTime.elapsed());
--- a/src/hbutils/document/hbdocumentloaderplugin.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbutils/document/hbdocumentloaderplugin.h Fri Jun 11 13:58:22 2010 +0300
@@ -39,7 +39,7 @@
};
Q_DECLARE_INTERFACE(HbDocumentLoaderPluginInterface, "com.nokia.hb.HbDocumentLoaderPlugin/1.0")
-class HB_TOOLS_EXPORT HbDocumentLoaderPlugin : public QObject, public HbDocumentLoaderPluginInterface
+class HB_UTILS_EXPORT HbDocumentLoaderPlugin : public QObject, public HbDocumentLoaderPluginInterface
{
Q_OBJECT
Q_INTERFACES(HbDocumentLoaderPluginInterface)
--- a/src/hbutils/hbutils.pro Thu May 27 13:10:59 2010 +0300
+++ b/src/hbutils/hbutils.pro Fri Jun 11 13:58:22 2010 +0300
@@ -33,7 +33,7 @@
DEFINES += HBUTILS_WEBKIT
}
-DEFINES += BUILD_HB_TOOLS HB_PLUGINS_DIR=\"\\\"$${HB_PLUGINS_DIR}\\\"\"
+DEFINES += BUILD_HB_UTILS HB_PLUGINS_DIR=\"\\\"$${HB_PLUGINS_DIR}\\\"\"
INCLUDEPATH += .
DEPENDPATH += .
@@ -44,10 +44,11 @@
# components
include(document/document.pri)
+include(theme/theme.pri)
CONVENIENCE_HEADERS += $${HB_BUILD_DIR}/include/hbutils/hbutils.h
CONVENIENCE_HEADERS += $$files($${HB_BUILD_DIR}/include/hbutils/Hb*)
-HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS $$CONVENIENCE_HEADERS
+HEADERS += $$PUBLIC_HEADERS $$RESTRICTED_HEADERS $$PRIVATE_HEADERS $$CONVENIENCE_HEADERS
# dependencies
hbAddLibrary(hbcore/HbCore)
@@ -61,10 +62,13 @@
pubheaders.files = $$PUBLIC_HEADERS
pubheaders.path = $${HB_INCLUDE_DIR}/hbutils
+ restheaders.files = $$RESTRICTED_HEADERS
+ restheaders.path = $${HB_INCLUDE_DIR}/hbutils/restricted
+
convheaders.files = $$CONVENIENCE_HEADERS
convheaders.path = $${HB_INCLUDE_DIR}/hbutils
- INSTALLS += target pubheaders convheaders
+ INSTALLS += target pubheaders restheaders convheaders
win32:INSTALLS += dlltarget
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbutils/theme/hbthemeservices.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** 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 HbUtils 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.
+**
+****************************************************************************/
+
+
+
+/*!
+ @proto
+ @hbutils
+ \class HbThemeServices
+ \brief HbThemeServices class is used to set and get current theme.
+
+ HbThemeServices class has static functions to change and query current theme.
+*/
+
+#include "hbthemeservices_r.h"
+#include "hbthemeutils_p.h"
+
+#ifdef Q_OS_SYMBIAN
+#include <e32property.h>
+#include "hbthemecommon_symbian_p.h"
+#else
+#include "hbthemeclient_p.h"
+#endif
+
+/*!
+ Sets the active theme that is used with the Hb applications. HbTheme changed() signal will be emitted if theme change is
+ applied succesfully. In addition to the active theme content loading also the underlying priority themes will be updated
+ during the theme change.
+
+ Depending on the platform setTheme functionality might by restricted.
+
+ \param themePath, absolute path to the folder where themes index.theme file is located.
+*/
+void HbThemeServices::setTheme(const QString &themePath)
+{
+#ifdef Q_OS_SYMBIAN
+ RProperty themeRequestProp;
+
+ User::LeaveIfError( themeRequestProp.Attach( KServerUid3, KNewThemeForThemeChanger ) );
+
+ TBuf<256> newThemenameChangeRequest;
+ _LIT(KThemeRequestFormatter, "%d:%S");
+ TBuf<256> newThemename(themePath.utf16());
+ newThemenameChangeRequest.Format(KThemeRequestFormatter, EThemeSelection, &newThemename);
+ themeRequestProp.Set(newThemenameChangeRequest);
+ themeRequestProp.Close();
+#else
+ HbThemeClient::global()->setTheme(themePath);
+#endif
+}
+
+/*!
+ Returns the absolute path to the active theme.
+
+ \return absolute path to the folder where the index.theme file of the active theme is located.
+*/
+const QString HbThemeServices::themePath()
+{
+ QString path("");
+ HbThemeIndexInfo info = HbThemeUtils::getThemeIndexInfo(ActiveTheme);
+ if (info.themeIndexOffset > 0) {
+ path.append(info.path);
+ path.append("/icons/");
+ path.append(info.name);
+ } else {
+ path.append(HbThemeUtils::getThemeSetting(HbThemeUtils::DefaultThemeRootDirSetting));
+ path.append("/themes/icons/");
+ path.append(HbThemeUtils::getThemeSetting(HbThemeUtils::CurrentThemeSetting));
+ }
+ return path;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbutils/theme/hbthemeservices_r.h Fri Jun 11 13:58:22 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 HbUtils 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 HBTHEMESERVICES_R_H
+#define HBTHEMESERVICES_R_H
+
+#include <hbglobal.h>
+
+QT_BEGIN_NAMESPACE
+class QString;
+QT_END_NAMESPACE
+
+class HB_UTILS_RESTRICTED_EXPORT HbThemeServices
+{
+public:
+ static void setTheme(const QString &themePath);
+ static const QString themePath();
+};
+
+#endif // HBTHEMESERVICES_R_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbutils/theme/theme.pri Fri Jun 11 13:58:22 2010 +0300
@@ -0,0 +1,32 @@
+#
+#############################################################################
+##
+## 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.
+##
+#############################################################################
+
+INCLUDEPATH += $$PWD
+DEPENDPATH += $$PWD
+
+RESTRICTED_HEADERS += $$PWD/hbthemeservices_r.h
+
+SOURCES += $$PWD/hbthemeservices.cpp
--- a/src/hbwidgets/dataform/hbdataform.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataform.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -123,6 +123,27 @@
HbDataFormModelItem using API
addConnection(HbDataFormModelItem* item, const char* signal, QObject* receiver, const char* slot)
provided in HbDataForm. The connection will be established when the item visualization is created.
+ Using addConnection() API user can also connect to hbdialog's signals(for ex: aboutToClose) in case
+ of popup items like radio button list item and multi selection list item. Below code snippet demonstrates
+ the same:
+
+ \code
+ HbDataFormModelItem *days = model->appendDataFormItem(HbDataFormModelItem::MultiselectionItem,
+ QString("Days"), themeGeneral);
+ QStringList multiItems;
+ multiItems<<"Sunday"<<"Monday"<<"Tuesday"<<"Wednesday"<<"Thursday"<<"Friday";
+ days->setContentWidgetData(QString("items"), multiItems);
+ QList<QVariant> selected;
+ selected<<2<<3;
+ days->setContentWidgetData(QString("selectedItems"), selected);
+ days->setContentWidgetData(QString("items"), multiItems);
+ form->addConnection(days, SIGNAL(aboutToShow()), this, SLOT(aboutToShow()));
+ form->addConnection(days, SIGNAL(aboutToHide()()), this, SLOT(aboutToHide()()));
+ form->addConnection(days, SIGNAL(aboutToClose()), this, SLOT(aboutToClose()));
+ form->addConnection(days, SIGNAL(finished(HbAction*)), this, SLOT(finished(HbAction*)));
+
+ \endcode
+
Similar way
removeConnection(HbDataFormModelItem *item, const char* signal, QObject *receiver, const char* slot)
and removeAllConnection() API can be used. Connection can be established or removed even at runtime.
--- a/src/hbwidgets/dataform/hbdataformmodelitem.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataformmodelitem.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -630,7 +630,7 @@
- TextItem: HbLineEdit property should be used
- ToggleValueItem: HbPushButton(text and additionalText) property should be used
- RadioButtonListItem: HbRadioButtonList property should be used
- - MultiselectionItem: HbListDialog property should be used
+ - MultiselectionItem: HbListWidget property should be used
- ComboBoxItem: HbComboBox property should be used
*/
void HbDataFormModelItem::setContentWidgetData(
--- a/src/hbwidgets/dataform/hbdataformviewitem_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataformviewitem_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -167,6 +167,8 @@
if(!mRadioButtonList) {
mRadioButtonList = new HbRadioButtonList();
mRadioButtonList->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred));
+ QObject::connect(mRadioButtonList, SIGNAL(itemSelected(int)), this, SIGNAL(itemSelected(int)));
+ QObject::connect(mRadioButtonList, SIGNAL(startPreview(int)), this, SIGNAL(startPreview(int)));
//mRadioButtonList->setClampingStyle(HbScrollArea::StrictClamping);
mRadioButtonList->setItems( mItems );
if( mSelected != -1 ) {
@@ -325,6 +327,10 @@
this, SLOT(updateModel(int)) );
selectItem();
mDialog = new HbDialog();
+ QObject::connect(mDialog, SIGNAL(finished(HbAction*)), this, SIGNAL(finished(HbAction*)));
+ QObject::connect(mDialog, SIGNAL(aboutToShow()), this, SIGNAL(aboutToShow()));
+ QObject::connect(mDialog, SIGNAL(aboutToHide()), this, SIGNAL(aboutToHide()));
+ QObject::connect(mDialog, SIGNAL(aboutToClose()), this, SIGNAL(aboutToClose()));
mDialog->setTimeout(HbPopup::NoTimeout);
mDialog->setAttribute(Qt::WA_DeleteOnClose);
mDialog->setContentWidget(mRadioButtonList);
@@ -447,6 +453,10 @@
// create ListWidget if not yet created
if(!mMultiListWidget) {
mMultiListWidget = new HbListWidget();
+ QObject::connect(mMultiListWidget, SIGNAL(activated(HbListWidgetItem *)), this, SIGNAL(activated(HbListWidgetItem *)));
+ QObject::connect(mMultiListWidget, SIGNAL(pressed(HbListWidgetItem *)), this, SIGNAL(pressed(HbListWidgetItem *)));
+ QObject::connect(mMultiListWidget, SIGNAL(released(HbListWidgetItem *)), this, SIGNAL(released(HbListWidgetItem *)));
+ QObject::connect(mMultiListWidget, SIGNAL(longPressed(HbListWidgetItem *, const QPointF &)), this, SIGNAL(longPressed(HbListWidgetItem *, const QPointF &)));
layout->addItem(mMultiListWidget);
}
--- a/src/hbwidgets/dataform/hbdataformviewitem_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataformviewitem_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -38,6 +38,7 @@
class HbAction;
class HbDialog;
class HbListWidget;
+class HbListWidgetItem;
class QGraphicsLinearLayout;
class QItemSelection;
class HbAction;
@@ -100,6 +101,13 @@
void resetSelection();
signals:
void valueChanged(QPersistentModelIndex, QVariant);
+ void itemSelected(int index);
+ void startPreview(int index);
+ //popup signals
+ void finished(HbAction*);
+ void aboutToShow();
+ void aboutToHide();
+ void aboutToClose();
private:
HbRadioButtonList* mRadioButtonList;
@@ -140,6 +148,10 @@
void aboutToHide();
void aboutToClose();
void finished(HbAction*);
+ void activated(HbListWidgetItem *item);
+ void pressed(HbListWidgetItem *item);
+ void released(HbListWidgetItem *item);
+ void longPressed(HbListWidgetItem *item, const QPointF &coords);
private:
--- a/src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -361,11 +361,15 @@
if (aShow) {
mReceivedButton = CHbDeviceMessageBoxSymbian::EInvalidButton;
error = mDeviceDialog->Show(KDeviceDialogType, *parameters, this);
- User::LeaveIfError(error);
+ if (error != KErrNone) {
+ User::Leave(error); // error can be positive or negative
+ }
mShowCalled = true;
} else {
error = mDeviceDialog->Update(*parameters);
- User::LeaveIfError(error);
+ if (error != KErrNone) {
+ User::Leave(error); // error can be positive or negative
+ }
}
CleanupStack::PopAndDestroy(); // parameters
}
--- a/src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.h Fri Jun 11 13:58:22 2010 +0300
@@ -76,8 +76,8 @@
IMPORT_C void SetAnimationDefinitionL(const TDesC& aAnimationDefinition);
IMPORT_C TPtrC AnimationDefinition() const;
- void SetIconVisible(TBool aVisible);
- TBool IconVisible() const;
+ IMPORT_C void SetIconVisible(TBool aVisible);
+ IMPORT_C TBool IconVisible() const;
IMPORT_C void SetTimeout(TInt aTimeout);
IMPORT_C TInt Timeout() const;
--- a/src/hbwidgets/devicedialogs/hbdevicenotificationdialogsymbian.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdevicenotificationdialogsymbian.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -97,7 +97,10 @@
AddVariantL(KKeyTouchActivation, &iEnable, CHbSymbianVariant::EBool);
AddVariantL(KKeyTimeOut, &iTimeout, CHbSymbianVariant::EInt);
AddVariantL(KKeyTitleTextWrapping, &iWrap, CHbSymbianVariant::EInt);
- User::LeaveIfError(iDeviceDialog->Show(KPluginIdentifier, *iVariantMap, this));
+ TInt error = iDeviceDialog->Show(KPluginIdentifier, *iVariantMap, this);
+ if (error != KErrNone) {
+ User::Leave(error); // error can be positive or negative
+ }
}
void CHbDeviceNotificationDialogSymbianPrivate::UpdateL()
@@ -105,7 +108,10 @@
AddVariantL(KKeyTouchActivation, &iEnable, CHbSymbianVariant::EBool);
AddVariantL(KKeyTimeOut, &iTimeout, CHbSymbianVariant::EInt);
AddVariantL(KKeyTitleTextWrapping, &iWrap, CHbSymbianVariant::EInt);
- User::LeaveIfError(iDeviceDialog->Update(*iVariantMap));
+ TInt error = iDeviceDialog->Update(*iVariantMap);
+ if (error != KErrNone) {
+ User::Leave(error); // error can be positive or negative
+ }
}
void CHbDeviceNotificationDialogSymbianPrivate::Close()
@@ -196,6 +202,10 @@
same rules as for the HbDeviceNotificationDialog apply. Dialog is shown when show() is called. It is recommended that
the dialog data is initialized before calling ShowL() or UpdateL() methods, because those methods use interprocess communication.
+ Two timeout constants are provided for setting the dialog timeout: KHbShortNotificationDialogTimeout and
+ KHbLongNotificationDialogTimeout. The first is equivalent to HbPopup::ConfirmationNoteTimeout and the latter
+ is equivalent to HbPopup::StandardTimeout.
+
\code
Following code snippet creates a device notification dialog containing title, text and icon.
@@ -234,11 +244,42 @@
_LIT(KDialogTitle, "Dialog title");
_LIT(KDialogIcon, "note_info.svg");
- iDialog = CHbDeviceNotificationDialogSymbian::NewL(this);
- iDialog->SetTextL(KDialogText);
- iDialog->SetTitleL(KDialogTitle);
- iDialog->SetIconNameL(KDialogIcon);
- iDialog->ShowL();
+ class DialogObserver : public MHbDeviceNotificationDialogObserver
+ {
+ public:
+ DialogObserver() {}
+ ~DialogObserver() { delete iDialog; }
+ void ShowDialog();
+ ...
+ private:
+ virtual void NotificationDialogActivated(const CHbDeviceNotificationDialogSymbian* aDialog);
+ virtual void NotificationDialogClosed(const CHbDeviceNotificationDialogSymbian* aDialog, TInt aCompletionCode);
+ private:
+ CHbDeviceNotificationDialogSymbian* iDialog;
+ };
+
+ void DialogObserver::NotificationDialogActivated(const CHbDeviceNotificationDialogSymbian* aDialog)
+ {
+ CEikonEnv::Static()->InfoMsg(_L("Device notification dialog activated"));
+ delete aDialog;
+ aDialog = 0;
+ }
+
+ void NotificationDialogClosed(const CHbDeviceNotificationDialogSymbian* aDialog, TInt aCompletionCode)
+ {
+ CEikonEnv::Static()->InfoMsg(_L("Device notification dialog deactivated"));
+ delete aDialog;
+ aDialog = 0;
+ }
+
+ void DialogObserver::ShowDialog()
+ {
+ iDialog = CHbDeviceNotificationDialogSymbian::NewL(this);
+ iDialog->SetTextL(KDialogText);
+ iDialog->SetTitleL(KDialogTitle);
+ iDialog->SetIconNameL(KDialogIcon);
+ iDialog->ShowL();
+ }
\endcode
CHbDeviceNotificationDialogSymbian supports.
@@ -267,10 +308,10 @@
set definition file and animation's logical name.
_LIT(KAnimationDefinitionXML, "C:\animation.axml");
- _LITK(KLogicalIconName, "frame_anim_looping");
+ _LIT(KLogicalIconName, "frame_anim_looping");
iDialog->SetAnimationDefinitionL(KAnimationDefinitionXML);
- iDialog->SetIconNameL(KIconName);
+ iDialog->SetIconNameL(KLogicalIconName);
iDialog->ShowL();
\endcode
\sa HbIconAnimationManager::addDefinitionFile
@@ -476,7 +517,7 @@
is not called.
\param aTimeout - Set timeout for dialog.
- Default value is HbPopup::StandardTimeout (3000 ms).
+ Default value is KHbLongNotificationDialogTimeout (3000 ms).
\sa ShowL(), UpdateL()
*/
EXPORT_C void CHbDeviceNotificationDialogSymbian::SetTimeout(TInt aTimeout)
--- a/src/hbwidgets/devicedialogs/hbdeviceprogressdialogsymbian.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdeviceprogressdialogsymbian.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -156,8 +156,10 @@
CleanupStack::PopAndDestroy(); // actionData
}
iButton.iFlags.iPressed = false;
- User::LeaveIfError(iDeviceDialog->Show(KPluginIdentifier, *iVariantMap, this));
-
+ TInt error = iDeviceDialog->Show(KPluginIdentifier, *iVariantMap, this);
+ if (error != KErrNone) {
+ User::Leave(error); // error can be positive or negative
+ }
iVisible = ETrue;
}
@@ -235,9 +237,11 @@
CleanupStack::PopAndDestroy(); // actionData
}
- User::LeaveIfError(iDeviceDialog->Update(*map));
- delete map;
- map = 0;
+ TInt error = iDeviceDialog->Update(*map);
+ delete map; map = 0;
+ if (error != KErrNone) {
+ User::Leave(error); // error can be positive or negative
+ }
}
void CHbDeviceProgressDialogSymbianPrivate::DataReceived(CHbSymbianVariantMap& aData)
--- a/src/hbwidgets/editors/hbabstractedit.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/editors/hbabstractedit.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -136,6 +136,13 @@
*/
/*!
+ \fn void anchorTapped(const QString &anchor)
+
+ This signal is emitted when a tap gesture happens on a word which has anchor attached.
+
+*/
+
+/*!
\fn QString HbAbstractEdit::toPlainText() const
Returns the contents as plain text.
@@ -176,7 +183,7 @@
{
Q_D(HbAbstractEdit);
if (d->selectionControl) {
- d->selectionControl->detachEditor();
+ d->selectionControl->detachEditorFromDestructor();
}
}
@@ -364,9 +371,7 @@
d->acceptKeyPressEvent(event);
if (!(d->interactionFlags & Qt::TextEditable)) {
- d->repaintOldAndNewSelection(d->selectionCursor);
d->cursorChanged(HbValidator::CursorChangeFromContentUpdate);
- //ensureCursorVisible();
event->ignore();
return;
}
@@ -829,7 +834,6 @@
d->updateCurrentCharFormat();
d->ensureCursorVisible();
- d->repaintOldAndNewSelection(oldCursor);
d->cursorChanged(HbValidator::CursorChangeFromContentSet);
}
}
@@ -919,13 +923,8 @@
return;
setCursorPosition(cursorPos);
- const QTextCursor oldSelection = d->cursor;
d->cursor.select(QTextCursor::WordUnderCursor);
- emit selectionChanged(oldSelection, d->cursor);
- d->repaintOldAndNewSelection(oldSelection);
d->cursorChanged(HbValidator::CursorChangeFromMouse);
- //TODO: focus is in VKB so needs to re-focus to editor
-// setFocus();
}
/*!
@@ -935,10 +934,7 @@
void HbAbstractEdit::selectAll()
{
Q_D(HbAbstractEdit);
- const QTextCursor oldSelection = d->cursor;
d->cursor.select(QTextCursor::Document);
- emit selectionChanged(oldSelection, d->cursor);
- d->repaintOldAndNewSelection(oldSelection);
d->cursorChanged(HbValidator::CursorChangeFromMouse);
}
@@ -949,9 +945,8 @@
void HbAbstractEdit::deselect()
{
Q_D(HbAbstractEdit);
- const QTextCursor oldSelection = d->cursor;
d->cursor.clearSelection();
- emit selectionChanged(oldSelection, d->cursor);
+ d->cursorChanged(HbValidator::CursorChangeFromMouse);
}
/*!
@@ -1133,7 +1128,6 @@
QTextCursor previousCursor(d->cursor);
previousCursor.setPosition(d->previousCursorAnchor);
previousCursor.setPosition(d->previousCursorPosition, QTextCursor::KeepAnchor);
- d->repaintOldAndNewSelection(previousCursor);
d->cursorChanged(HbValidator::CursorChangeFromOperation);
}
--- a/src/hbwidgets/editors/hbabstractedit.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/editors/hbabstractedit.h Fri Jun 11 13:58:22 2010 +0300
@@ -110,6 +110,7 @@
void cursorPositionChanged(int oldPos, int newPos);
void selectionChanged(const QTextCursor &oldCursor, const QTextCursor& newCursor);
void aboutToShowContextMenu(HbMenu *contextMenu, const QPointF &pos);
+ void anchorTapped(const QString &anchor);
public slots:
void updatePrimitives();
--- a/src/hbwidgets/editors/hbabstractedit_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/editors/hbabstractedit_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -248,28 +248,6 @@
void HbAbstractEditPrivate::updatePaletteFromTheme()
{
- Q_Q(HbAbstractEdit);
-
- // TODO: remove once these color dissapear from hbcolorgroup.css
- QColor textColor = HbColorScheme::color("qtc_editor_normal");
- QColor selectedColor = HbColorScheme::color("qtc_editor_selected");
- QColor selectedBackground = HbColorScheme::color("qtc_editor_marker_normal");
- QPalette pal = q->palette();
-
- if (textColor.isValid()) {
- pal.setColor(QPalette::Text, textColor);
- }
-
- if (selectedColor.isValid()) {
- pal.setColor(QPalette::HighlightedText, selectedColor);
- }
-
- if (selectedBackground.isValid()) {
- pal.setColor(QPalette::Highlight, selectedBackground);
- }
- q->setPalette(pal);
-
-
// The link color is used from application's palette
QColor linkColor = HbColorScheme::color("qtc_view_link_normal");
QColor linkVisitedColor = HbColorScheme::color("qtc_view_visited_normal");
@@ -510,13 +488,12 @@
return false;
}
- const QTextCursor oldCursor = cursor;
+ //const QTextCursor oldCursor = cursor;
bool visualNavigation = cursor.visualNavigation();
cursor.setVisualNavigation(true);
cursor.movePosition(op, mode);
cursor.setVisualNavigation(visualNavigation);
cursorChanged(HbValidator::CursorChangeFromOperation);
- repaintOldAndNewSelection(oldCursor);
return true;
}
@@ -649,14 +626,15 @@
Q_Q(HbAbstractEdit);
if (cursor.hasSelection()) {
- if (selectionControl) {
- selectionControl->showHandles();
- q->update();
- }
+ selectionControl = HbSelectionControl::attachEditor(q);
+ selectionControl->showHandles();
} else if (selectionControl){
selectionControl->hideHandles();
- q->update();
}
+
+ QTextCursor oldSelection(selectionCursor);
+ selectionCursor = cursor;
+ repaintOldAndNewSelection(oldSelection);
}
void HbAbstractEditPrivate::_q_scrollStarted()
@@ -761,7 +739,6 @@
}
emit q->selectionChanged(selectionCursor, cursor);
- selectionCursor = cursor;
}
void HbAbstractEditPrivate::acceptKeyPressEvent(QKeyEvent *event)
@@ -1078,7 +1055,6 @@
if (removeSelection && cursor.hasSelection()) {
const QTextCursor oldCursor = cursor;
cursor.clearSelection();
- repaintOldAndNewSelection(oldCursor);
emit q->selectionChanged(oldCursor, cursor);
}
@@ -1102,6 +1078,11 @@
updateCurrentCharFormat();
}
cursorChanged(HbValidator::CursorChangeFromMouse);
+
+ QString anchor(q->anchorAt(point));
+ if(!anchor.isEmpty()) {
+ emit q->anchorTapped(anchor);
+ }
}
}
--- a/src/hbwidgets/editors/hbselectioncontrol_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/editors/hbselectioncontrol_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -91,6 +91,7 @@
void panGestureFinished (HbPanGesture *gesture);
void show();
void _q_aboutToChangeView();
+ void detachEditor(bool updateAtthachedEditorState);
public:
@@ -466,6 +467,21 @@
}
}
+void HbSelectionControlPrivate::detachEditor(bool updateAtthachedEditorState)
+{
+ Q_Q(HbSelectionControl);
+ if (mEdit) {
+ q->hideHandles();
+ reparentHandles(q);
+ if (updateAtthachedEditorState) {
+ mEdit->disconnect(q);
+ mEdit->d_func()->selectionControl = 0;
+ mEdit->deselect();
+ }
+ mEdit = 0;
+ mTopLevelAncestor = 0;
+ }
+}
HbSelectionControl::HbSelectionControl() : HbWidget(*new HbSelectionControlPrivate(),0)
@@ -510,17 +526,14 @@
void HbSelectionControl::detachEditor()
{
Q_D(HbSelectionControl);
- if (d->mEdit) {
- hideHandles();
- d->reparentHandles(this);
- d->mEdit->disconnect(this);
- d->mEdit->d_func()->selectionControl = 0;
- d->mEdit->deselect();
- d->mEdit = 0;
- d->mTopLevelAncestor = 0;
- }
+ d->detachEditor(true);
}
+void HbSelectionControl::detachEditorFromDestructor()
+{
+ Q_D(HbSelectionControl);
+ d->detachEditor(false);
+}
void HbSelectionControl::hideHandles()
{
--- a/src/hbwidgets/editors/hbselectioncontrol_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/editors/hbselectioncontrol_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -58,6 +58,7 @@
static HbSelectionControl* attachEditor(HbAbstractEdit *edit);
void detachEditor();
+ void detachEditorFromDestructor();
void hideHandles();
void showHandles();
bool event(QEvent *event);
--- a/src/hbwidgets/editors/hbsmileyengine_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/editors/hbsmileyengine_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -31,8 +31,8 @@
#include <QObject>
class HbSmileyEnginePrivate;
-QT_FORWARD_DECLARE_CLASS(QTextDocument);
-QT_FORWARD_DECLARE_CLASS(QTextCursor);
+QT_FORWARD_DECLARE_CLASS(QTextDocument)
+QT_FORWARD_DECLARE_CLASS(QTextCursor)
class HB_AUTOTEST_EXPORT HbSmileyEngine : public QObject
{
--- a/src/hbwidgets/editors/hbsmileyengine_p_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/editors/hbsmileyengine_p_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -33,7 +33,7 @@
#include <QPair>
class HbIconAnimator;
-QT_FORWARD_DECLARE_CLASS(QTextDocument);
+QT_FORWARD_DECLARE_CLASS(QTextDocument)
struct HbSmileyDataType {
HbSmileyDataType():cursor(0),animator(0),scaleFactor(1){}
--- a/src/hbwidgets/hbwidgets.pro Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/hbwidgets.pro Fri Jun 11 13:58:22 2010 +0300
@@ -24,10 +24,7 @@
#############################################################################
TEMPLATE = lib
TARGET = $$hbLibraryTarget(HbWidgets)
-QT = core \
- gui \
- svg \
- network
+QT = core gui svg network
DEFINES += BUILD_HB_WIDGETS
# directories
@@ -42,11 +39,10 @@
include(sliders/sliders.pri)
include(widgets/widgets.pri)
include(dataform/dataform.pri)
+
CONVENIENCE_HEADERS += $${HB_BUILD_DIR}/include/hbwidgets/hbwidgets.h
CONVENIENCE_HEADERS += $$files($${HB_BUILD_DIR}/include/hbwidgets/Hb*)
-HEADERS += $$PUBLIC_HEADERS \
- $$PRIVATE_HEADERS \
- $$CONVENIENCE_HEADERS
+HEADERS += $$PUBLIC_HEADERS $$RESTRICTED_HEADERS $$PRIVATE_HEADERS $$CONVENIENCE_HEADERS
# dependencies
hbAddLibrary(hbcore/HbCore)
@@ -55,13 +51,17 @@
!local {
target.path = $${HB_LIB_DIR}
win32:dlltarget.path = $${HB_BIN_DIR}
+
pubheaders.files = $$PUBLIC_HEADERS
pubheaders.path = $${HB_INCLUDE_DIR}/hbwidgets
+
+ restheaders.files = $$RESTRICTED_HEADERS
+ restheaders.path = $${HB_INCLUDE_DIR}/hbwidgets/restricted
+
convheaders.files = $$CONVENIENCE_HEADERS
convheaders.path = $${HB_INCLUDE_DIR}/hbwidgets
- INSTALLS += target \
- pubheaders \
- convheaders
+
+ INSTALLS += target pubheaders restheaders convheaders
win32:INSTALLS += dlltarget
}
@@ -70,7 +70,7 @@
symbian {
defFilePath = defs
-
+
TARGET.EPOCALLOWDLLDATA = 1
TARGET.CAPABILITY = CAP_GENERAL_DLL
TARGET.UID3 = 0x20022FCC
--- a/src/hbwidgets/itemviews/hbabstractitemcontainer_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractitemcontainer_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -362,35 +362,29 @@
HbAbstractViewItem* HbAbstractItemContainerPrivate::item(const QModelIndex &index) const
{
int itemCount = mItems.count();
- for (int i = 0; i < itemCount; ++i) {
- // This could use binary search as model indexes are in sorted.
- if (mItems.at(i)->modelIndex() == index) {
- return mItems.at(i);
- }
- }
-
- // TODO: The lower (commented out) part of the code is an optimized version of the above.
- // However, there are problems with TreeView's deep models concerning the optimized version.
- // The optimized version should be fixed and taken into use later on.
+ if (index.isValid()) {
+ if (itemCount > 0) {
+ HbModelIterator *iterator = mItemView->modelIterator();
+ int positionFirstIndex = iterator->indexPosition(mItems.first()->modelIndex());
- /*
- int itemCount = mItems.count();
- if (itemCount > 0) {
- if (index.isValid()) {
- int itemIndex = mItemView->indexPosition(index) - mItemView->indexPosition(mItems.first()->modelIndex());
- return mItems.value(itemIndex);
- } else {
- for (int i = 0; i < itemCount; ++i) {
- // This could use binary search as model indexes are in sorted.
- HbAbstractViewItem *item = mItems.at(i);
- if (item->modelIndex() == index) {
+ // when new items are inserted, they will appear in the end of container before a model index is assigned to them
+ if (positionFirstIndex >= 0) {
+ int positionIndex = iterator->indexPosition(index);
+ HbAbstractViewItem *item = mItems.value(positionIndex - positionFirstIndex);
+ if ( item
+ && item->modelIndex() == index) {
return item;
}
}
}
+ } else {
+ // searching items e.g. removed from model
+ for (int i = 0; i < itemCount; ++i) {
+ if (!mItems.at(i)->modelIndex().isValid()) {
+ return mItems.at(i);
+ }
+ }
}
- */
-
return 0;
}
@@ -1184,7 +1178,7 @@
newSize.setWidth(d->mItemView->size().width());
}
}
-
+
resize(newSize);
}
--- a/src/hbwidgets/itemviews/hbabstractitemcontainer_p_p.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractitemcontainer_p_p.h Fri Jun 11 13:58:22 2010 +0300
@@ -78,7 +78,7 @@
void increaseBufferSize(int amount);
void decreaseBufferSize(int amount);
- HbAbstractViewItem* item(const QModelIndex &index) const;
+ virtual HbAbstractViewItem* item(const QModelIndex &index) const;
void doRemoveItem(HbAbstractViewItem *item, const QModelIndex &index, bool animate = false);
--- a/src/hbwidgets/itemviews/hbabstractitemview.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractitemview.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -217,6 +217,21 @@
}
/*!
+ Constructs a new HbAbstractItemView with \a parent.
+*/
+HbAbstractItemView::HbAbstractItemView(HbAbstractItemContainer *container,
+ HbModelIterator *modelIterator,
+ QGraphicsItem *parent)
+ : HbScrollArea(*new HbAbstractItemViewPrivate, parent)
+{
+ Q_D(HbAbstractItemView);
+ Q_ASSERT_X(container, "HbAbstractItemView constructor", "Container is null");
+
+ d->q_ptr = this;
+ d->init(container, modelIterator);
+}
+
+/*!
Destructs the abstract item view.
*/
HbAbstractItemView::~HbAbstractItemView()
@@ -350,11 +365,13 @@
void HbAbstractItemView::selectAll()
{
Q_D(HbAbstractItemView);
- if (d->mModelIterator->model()
- && d->mSelectionModel
- && d->mSelectionMode == MultiSelection) {
- QModelIndex firstIndex = d->mModelIterator->nextIndex(QModelIndex());
- QModelIndex lastIndex = d->mModelIterator->previousIndex(QModelIndex());
+ QAbstractItemModel *model = d->mModelIterator->model();
+ if ( model
+ && d->mSelectionModel
+ && d->mSelectionMode == MultiSelection) {
+ QModelIndex rootIndex = d->mModelIterator->rootIndex();
+ QModelIndex firstIndex = model->index(0, 0, rootIndex);
+ QModelIndex lastIndex = model->index(model->rowCount(rootIndex)-1, 0, rootIndex);
d->mSelectionModel->select(QItemSelection(firstIndex, lastIndex), QItemSelectionModel::Select);
}
}
@@ -738,7 +755,7 @@
HbAbstractViewItem *item = d->mContainer->itemByIndex(selectedIndexes.at(i));
if (item) {
item->setCheckState(Qt::Checked);
- if (!d->mClearingSelection) {
+ if (!d->mClearingSelection && !d->mDoingContiguousSelection) {
HbWidgetFeedback::triggered(item, Hb::InstantSelectionChanged);
}
}
@@ -753,7 +770,7 @@
HbAbstractViewItem *item = d->mContainer->itemByIndex(deselectedIndexes.at(i));
if (item) {
item->setCheckState(Qt::Unchecked);
- if (!d->mClearingSelection) {
+ if (!d->mClearingSelection && !d->mDoingContiguousSelection) {
HbWidgetFeedback::triggered(item, Hb::InstantSelectionChanged);
}
}
@@ -1007,6 +1024,8 @@
the same size. This enables the view to do some optimizations for performance purposes.
By default, this property is false.
+
+ \sa uniformItemSizes
*/
void HbAbstractItemView::setUniformItemSizes(bool enable)
{
@@ -1016,6 +1035,8 @@
/*!
Returns the current value of the uniformItemsSizes property
+
+ By default, this property is false.
*/
bool HbAbstractItemView::uniformItemSizes() const
{
--- a/src/hbwidgets/itemviews/hbabstractitemview.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractitemview.h Fri Jun 11 13:58:22 2010 +0300
@@ -151,6 +151,11 @@
HbAbstractItemContainer *container,
HbModelIterator *modelIterator,
QGraphicsItem *parent = 0);
+
+ HbAbstractItemView(HbAbstractItemContainer *container,
+ HbModelIterator *modelIterator,
+ QGraphicsItem *parent = 0);
+
virtual QItemSelectionModel::SelectionFlags selectionCommand(
const HbAbstractViewItem *item,
const QEvent *event);
--- a/src/hbwidgets/itemviews/hbabstractitemview_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractitemview_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -390,6 +390,7 @@
mPreviousSelectedIndex = itemIndex;
mPreviousSelectedCommand = command;
mSelectionModel->select(itemIndex, command);
+ HbWidgetFeedback::triggered(q, Hb::InstantSelectionChanged, Hb::ModifierScrolling);
}
// check if we need to start or keep on scrolling
@@ -508,13 +509,7 @@
QModelIndex lastVisibleModelIndex;
mContainer->firstAndLastVisibleModelIndex(firstVisibleModelIndex, lastVisibleModelIndex);
- if (mModelIterator->model()) {
- if (lastVisibleModelIndex == mModelIterator->index(mModelIterator->indexCount() - 1)) {
- mVisibleIndex = lastVisibleModelIndex;
- } else {
- mVisibleIndex = firstVisibleModelIndex;
- }
- }
+ mVisibleIndex = firstVisibleModelIndex;
}
/*!
--- a/src/hbwidgets/itemviews/hbabstractviewitem.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractviewitem.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -230,13 +230,12 @@
break;
}
case Qt::GestureFinished: {
- HbWidgetFeedback::triggered(q, Hb::InstantReleased, 0);
-
if (gesture->tapStyleHint() == HbTapGesture::Tap
|| (mSharedData->mItemView
&& !mSharedData->mItemView->longPressEnabled())) {
setPressed(false, true);
+ HbWidgetFeedback::triggered(q, Hb::InstantReleased, 0);
HbWidgetFeedback::triggered(q, Hb::InstantClicked);
QPointer<HbAbstractViewItem> item = q;
emit item->activated(position);
@@ -249,13 +248,13 @@
}
}
} else {
+ HbWidgetFeedback::triggered(q, Hb::InstantReleased,0);
emit q->released(position);
}
break;
}
case Qt::GestureCanceled: {
-
// hides focus immediately
setPressed(false, false);
@@ -286,7 +285,13 @@
mPressed = pressed;
if (mSharedData->mPressStateChangeTimer) {
- mSharedData->mPressStateChangeTimer->stop();
+ if(!pressed && animate && mSharedData->mPressStateChangeTimer->isActive()) {
+ // Release happened while press still delayed
+ mSharedData->mPressStateChangeTimer->stop();
+ mSharedData->pressStateChangeTimerTriggered();
+ } else {
+ mSharedData->mPressStateChangeTimer->stop();
+ }
}
if (mPressed) {
--- a/src/hbwidgets/itemviews/hbindexfeedback_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/itemviews/hbindexfeedback_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -502,7 +502,7 @@
{
Q_Q( const HbIndexFeedback );
- qreal retVal;
+ qreal retVal = 0.0;
switch (mIndexFeedbackPolicy) {
case HbIndexFeedback::IndexFeedbackNone:
--- a/src/hbwidgets/itemviews/hbradiobuttonlist.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/itemviews/hbradiobuttonlist.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -67,6 +67,8 @@
An example of how to create a radiobuttonlist inside a popup.
\snippet{decoratorlistdemo/contentwidget.cpp,3}
+ By default the radio button list has uniformItemSizes property set to true.
+
*/
/*!
@@ -170,6 +172,7 @@
q->setSelected(selected);
q->setPreviewMode(previewMode);
q->setLongPressEnabled(false);
+ q->setUniformItemSizes(true);
calculateItemHeight();
}
--- a/src/hbwidgets/itemviews/hbtreeitemselectionmodel_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreeitemselectionmodel_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -83,7 +83,7 @@
QModelIndexList indexes = selection.indexes();
int count = indexes.count();
for (int i = 0; i < count; ++i) {
- QModelIndex index = indexes.at(0);
+ QModelIndex index = indexes.at(i);
if (!index.isValid()) {
return;
}
--- a/src/hbwidgets/itemviews/hbtreemodeliterator_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreemodeliterator_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -41,7 +41,7 @@
/*!
\reimp
-
+ Returns count of visible indexes under \a parent.
Children of collapsed parents are not taken into account.
*/
int HbTreeModelIterator::indexCount(const QModelIndex &parent) const
@@ -73,7 +73,8 @@
/*!
\reimp
- Position depends on item state - expanded/colapsed
+ Returns ordinal of index starting from root. Ordinal for first index under root is 0.
+ Indexes in collapsed parents are taken into account.
*/
int HbTreeModelIterator::indexPosition(const QModelIndex &index) const
{
@@ -94,7 +95,8 @@
/*!
\reimp
- Index is calculated from position and it depends on item state - expanded/colapsed
+ Returnes index of item, which is visible at pos ordinal under parent.
+ Indexes in collapsed parents are not taken into account.
Very slow - need to interate throught whole model in worst case!
*/
QModelIndex HbTreeModelIterator::index(int pos, const QModelIndex &parent) const
@@ -175,12 +177,13 @@
/*!
\reimp
- Next index for valid index is determined in following way:
- - If index is in collapsed branch QModelIndex is returned
+ Next visible index for valid index is determined in following way:
+ - If index is in collapsed branch QModelIndex is returned.
- If index has children and it is expanded then first child is returned
- Otherwise if index has next sibling then that is returned
- Otherwise next valid sibling for parent is returned
- Otherwise QModelIndex is returned
+ If index was invalid then first valid index is returned.
\a index must belong to mRootIndex branch, otherwise result is not determined.
@@ -231,7 +234,7 @@
/*!
\reimp
- Previous index for valid index is determined in following way:
+ Previous visible index for valid index is determined in following way:
- If index is in collapsed branch QModelIndex is returned
- If index has previous sibling last child from it is returned
- Otherwise previous sibling is returned
--- a/src/hbwidgets/itemviews/hbtreemodeliterator_p_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreemodeliterator_p_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -39,8 +39,8 @@
}
/*
- Return first index belonging to specified parent
- If parent is colapsed QModelIndex is returned
+ Return first visible index belonging to specified parent.
+ If parent is collapsed QModelIndex is returned.
*/
QModelIndex HbTreeModelIteratorPrivate::first(const QModelIndex &parent) const
{
@@ -54,7 +54,8 @@
}
/*
- Return last index belonging to specified parent - last child in whole parent branch
+ Return last visible index belonging to specified parent - last child in whole parent branch.
+ If parent is collapsed QModelIndex is returned.
*/
QModelIndex HbTreeModelIteratorPrivate::last(const QModelIndex &parent) const
{
@@ -112,8 +113,11 @@
return -1;
}
}
- mCachedPosition.count = result;
- mCachedPosition.index = index;
+
+ if (mUseCache) {
+ mCachedPosition.count = result;
+ mCachedPosition.index = index;
+ }
return result;
}
@@ -130,8 +134,11 @@
return -1;
}
}
- mCachedPosition.count = result;
- mCachedPosition.index = index;
+
+ if (mUseCache) {
+ mCachedPosition.count = result;
+ mCachedPosition.index = index;
+ }
return result;
}
--- a/src/hbwidgets/itemviews/hbtreeview.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreeview.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -178,19 +178,16 @@
if (d->isParentValid(parent)) {
if (isExpanded(parent) || parent == d->mModelIterator->rootIndex()) {
- int lastStartPoint = 0;
for (int i = start; i <= end; ++i) {
- QModelIndex newParent = d->treeModelIterator()->index(i, parent);
+ HbAbstractItemView::rowsInserted(parent, i, i);
+ // if there is expanded parent under expanding parent, handle it recursively
+ QModelIndex newParent = d->treeModelIterator()->model()->index(i, 0, parent);
int childCount = d->treeModelIterator()->childCount(newParent);
if (childCount > 0 && isExpanded(newParent)) {
- HbAbstractItemView::rowsInserted(parent, lastStartPoint, i);
- lastStartPoint = i;
rowsInserted(newParent, 0, childCount - 1);
- }
+ }
}
- HbAbstractItemView::rowsInserted(parent, lastStartPoint, end);
-
if (d->animationEnabled(true)) {
if (d->mInSetExpanded) {
d->startAppearEffect("treeviewitem", "expand", parent, start, end);
--- a/src/hbwidgets/itemviews/hbtumbleview.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtumbleview.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -52,7 +52,7 @@
{
Q_DECLARE_PRIVATE(HbTumbleViewItemContainer)
public:
- HbTumbleViewItemContainer(QGraphicsItem* parent = 0);
+ HbTumbleViewItemContainer(QGraphicsItem* parent = 0);
QPointF recycleItems(const QPointF &delta);
void setLoopingEnabled(bool looping) ;
@@ -69,6 +69,7 @@
QPointF recycleItems(const QPointF &delta);
HbAbstractViewItem *shiftDownItem(QPointF& delta);
HbAbstractViewItem *shiftUpItem(QPointF& delta);
+ HbAbstractViewItem* item(const QModelIndex &index) const;
bool mIsLooped;
};
@@ -129,11 +130,6 @@
QPointF HbTumbleViewItemContainer::recycleItems(const QPointF &delta)
{
Q_D(HbTumbleViewItemContainer);
-
- if (d->mPrototypes.count() != 1) {
- return delta;
- }
-
QRectF viewRect(d->itemBoundingRect(d->mItemView));
viewRect.moveTopLeft(viewRect.topLeft() + delta);
@@ -396,6 +392,17 @@
return item;
}
+HbAbstractViewItem *HbTumbleViewItemContainerPrivate::item(const QModelIndex &index) const
+{
+ int itemCount = mItems.count();
+ for(int i=0;i<itemCount;++i) {
+ if(mItems.at(i)->modelIndex() == index) {
+ return mItems.at(i);
+ }
+ }
+ return 0;
+}
+
HbTumbleViewPrivate::HbTumbleViewPrivate()
:HbListViewPrivate()
,mHeight(10.0)
@@ -446,6 +453,10 @@
q->setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
q->setHorizontalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
q->setFrictionEnabled(true);
+
+ //dont want this to occupy entire screen. preferred is few items.
+ q->setSizePolicy(QSizePolicy::Preferred,QSizePolicy::Preferred);
+
mDelayedSelectTimer.setSingleShot(true);
bool b = q->connect(q,SIGNAL(scrollingStarted()),q,SLOT(_q_scrollingStarted()));
Q_ASSERT(b);
@@ -524,12 +535,51 @@
}
}
-void HbTumbleView::scrollTo(const QModelIndex &index, ScrollHint)
-{
-#ifdef HBTUMBLE_DEBUG
- qDebug() << "HbTumbleView::scrollTo(" << index.row() << ", )";
-#endif
- HbListView::scrollTo(index, PositionAtCenter);
+void HbTumbleView::scrollTo(const QModelIndex &index, ScrollHint hint)
+{
+ Q_D(HbTumbleView);
+
+ if (!d->mModelIterator->model()
+ || index.model() != d->mModelIterator->model()) {
+ return;
+ }
+
+ //If item is in the buffer, just reveal it.
+ //This is always the case if recycling is off
+ //and sometimes the case when recycling is on
+ if (itemRecycling()) {
+ if ( !d->mContainer->itemByIndex(index)
+ || hint != EnsureVisible) {
+ //Now the item is not in the buffer.
+ //We must first set the item to be in the buffer
+ //If the item is above let's put it first and if it is below put it last
+
+ int newIndex = -1;
+
+ switch (hint) {
+ case PositionAtCenter: {
+ int containerCount = d->mContainer->items().count();
+ newIndex = index.row() - containerCount / 2 ;
+ if(newIndex < 0){
+ if(isLoopingEnabled()){
+ newIndex = d->mModelIterator->indexCount()+newIndex;
+ }
+ else{
+ newIndex = 0;
+ }
+ }
+ break;
+ }
+ case EnsureVisible:
+ case PositionAtTop:
+ case PositionAtBottom:
+ default: {
+ qWarning()<<"Scroll Hint is not supported "; }
+ }
+ d->mContainer->setModelIndexes(d->mModelIterator->index(newIndex));
+ }
+ }
+ HbAbstractItemView::scrollTo(index, hint);
}
void HbTumbleViewPrivate::createPrimitives()
--- a/src/hbwidgets/popups/hbcolordialog.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/popups/hbcolordialog.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -56,6 +56,7 @@
HbGridView* createColorGrid(QObject *receiver, const char *method)
{
mGridView = new HbGridView(this);
+ mGridView->setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAsNeeded);
HbStyle::setItemName(mGridView, "color_grid_view");
mGridView->setColumnCount(4);
--- a/src/hbwidgets/popups/hbmessagebox.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/popups/hbmessagebox.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -50,15 +50,8 @@
HbScrollArea *scroll = scrollArea();
scroll->setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAsNeeded);
clearContextMenuFlag(Hb::ShowTextContextMenuOnLongPress);
- clearContextMenuFlag(Hb::ShowTextContextMenuOnSelectionClicked);
- primitive(HbStyle::P_LineEdit_frame_normal)->setVisible(false);
- primitive(HbStyle::P_LineEdit_frame_highlight)->setVisible(false);
- }
-
- HbScrollBar * getScrollBar() const
- {
- HbScrollArea *scroll = scrollArea();
- return scroll->verticalScrollBar();
+ clearContextMenuFlag(Hb::ShowTextContextMenuOnSelectionClicked);
+ setBackgroundItem(0,0);
}
void focusInEvent(QFocusEvent * event)
@@ -158,7 +151,6 @@
q->addAction(new HbAction(q->tr("No"),q));
break;
}
-
}
/*!
@@ -173,7 +165,7 @@
Using HbMessageBox, the following dialogs can be created:
- <b>Information:</b> a statement to the user to which they may respond by acknowledging the information ('OK').<br>
+ <b>Information:</b> a statement to the user to which dismissed after acknowledging the information ('OK').<br>
<b>Question:</b> a query to the user requiring a response. User needs to select between two alternatives, the positive or negative (For example: 'Delete Mailbox?' 'Yes'/'No').<br>
<b>Warning:</b> a statement to the user to which they may respond by acknowledging the warning ('OK').<br>
@@ -182,7 +174,7 @@
Default properties for the MessageBox (warning, information and question dialogs) are:
Description text: Text shown to the user as information. The amount of text rows is not limited, but after five rows the text starts scrolling.
- Icon: Default icons are available for each dialog type using the MessageBox template. Changing the default icons is not recommended.
+ Icon: Default icons are available for each dialog type using the MessageBox template.
Action buttons (one or two): one button for information and warning MessageBox, two buttons for question MessageBox.
All the three dialogs(information, warning, question) supported by MessageBox are by default modal in nature, with
--- a/src/hbwidgets/popups/hbprogressdialog.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/popups/hbprogressdialog.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -111,7 +111,7 @@
mContentWidget->mProgressBar->setRange(0,100);
}
- HbAction *action = new HbAction(q->tr("Cancel"), q);
+ HbAction *action = new HbAction(hbTrId("txt_common_button_cancel"), q);
QObject::connect(action, SIGNAL(triggered()), q, SLOT(_q_userCancel()));
q->addAction(action);
@@ -231,21 +231,21 @@
\class HbProgressDialog
\brief HbProgressDialog provides feedback on the progress of a slow operation.
- \image html progressdialog2.png "A normal Progress Dialog with icon and text"
+ \image html progressdialog1.png "A normal Progress Dialog with icon and text"
\image html progressdialog2.png "A wait Progress Dialog with icon and text"
- ProgressDialog widget displays that a process is active and also the completion level of the process to the user.
+ ProgressDialog widget displays that an application is active and also the completion level of the process to the user.
A progress dialog is used to give the user an indication of how long an operation is going to take, and
to demonstrate that the application has not frozen. It can also give the user an opportunity to abort the operation.
- Progress dialog provides several types of notifications. The supported types are:
+ Progress dialog provides 2 types of notifications. They are:
\code
enum ProgressDialogType { ProgressDialog, WaitDialog };
\endcode
- Progress dialog has the following mandatory elements:
+ Progress dialog has the following default elements:
\li Progress bar (Determinate type)
\li Description
\li Cancel button (for canceling the process)
@@ -253,7 +253,6 @@
Optionally, progress dialog may also includes:
\li Icon
\li Heading
- \li Close button (same as ‘Cancel’ button during active process, closes the dialog after successful process)
Progress dialog is modal and requires user intervention to dismiss it.
\sa HbDialog
@@ -271,7 +270,7 @@
\endcode
The progress note is closed explicitly when the user clicks Cancel button or the application
- calls cancel().
+ calls cancel() API.
Another use case is an application downloading a file.
\code
@@ -286,6 +285,13 @@
}
\endcode
+
+ Below sample code shows how the \a cancel() signal can be connected so that application can terminate the task.
+
+ \code
+ HbProgressDialog *pDialog = new HbProgressDialog(HbProgressDialog::ProgressDialog);
+ connect(pDialog,SIGNAL(cancelled()),this,SLOT(dialogCancelled()));
+ \endcode
*/
/*!
@@ -310,7 +316,7 @@
/*!
\var HbProgressDialog::WaitDialog
- TThis enum describes the type value as WaitDialog.
+ This enum describes the type value as WaitDialog.
*/
--- a/src/hbwidgets/popups/hbselectiondialog.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/popups/hbselectiondialog.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -41,26 +41,36 @@
@beta
@hbwidgets
\class HbSelectionDialog
- \brief HbSelectionDialog class allows user create a list of options out of which one or more can be selected.
+ \brief HbSelectionDialog class allows user to create a list of options out of which one or more can be selected.
- HbSelectionDialog is a modal dialog which means once it is displayed, user can not perform any action
- untill dialog is closed.
+ SelectionDialog is a modal dialog, for which user has to use default or custom action buttons to dismiss the dialog.
+
+ There are 2 modes of selection for SelectionDialog. SingleSelection or MultiSelection.<br>
- There can be 2 modes of selection. SingleSelection or MultiSelection. If it is SingleSelection, dialog is closed
- as soon as user clicks one of the options.In case of MultiSelection, user has to explicitly press "OK" button to
- close it after selecting the item(s). User can anytime press "Cancel" button to close the dialog without selecting
- anything.
+ <b>SingleSelection</b>: User can select one item from the list at a time and the SelectionDialog will be dismissed
+ as soon as the user selects the item.<br>
+
+ <b>MultiSelection</b>: User can select multiple items from the list. To dismiss the dialog user has to explicitly press "OK/Cancel" button.
+ User can anytime press "Cancel" button to close the dialog without any selection.
User can provide the data for options in different forms. It can be simple list of strings, list of custom
items or a model itself.
+
+ Below is a snippet of code which shows SelectionDialog in a single selection mode.
+
+ \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,55}
+
+ slot implementation:
+
+ \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,56}
+
*/
/*!
- @beta
Constructor of HbSelectionDialog
- \param parent. Parent widget
+ \param parent Parent item to SelectionDialog.
*/
HbSelectionDialog::HbSelectionDialog(QGraphicsItem* parent):
HbDialog(*new HbSelectionDialogPrivate, parent)
@@ -71,7 +81,6 @@
}
/*!
- @beta
Destructor
*/
HbSelectionDialog::~HbSelectionDialog()
@@ -79,8 +88,6 @@
}
/*!
- @beta
-
\reimp
*/
void HbSelectionDialog::showEvent(QShowEvent *event)
@@ -89,10 +96,9 @@
}
/*!
- @beta
Sets the \a SelectionMode of the list.
- \param mode. It can be SingleSelection or MultiSelection .Default value is \a NoSelection.
+ \param mode It can be SingleSelection or MultiSelection.
\sa selectionMode()
*/
@@ -104,7 +110,6 @@
}
/*!
- @beta
Returns current SelectionMode of the list.Default value is \a NoSelection.
\sa setSelectionMode()
@@ -116,11 +121,10 @@
}
/*!
- @beta
Sets the string list items to be displayed.
- \param items. A items is the list of strings
- \param currentIndex. A currentIndex is the index of default selection
+ \param items list of string items as input to SelectionDialog in QStringList format.
+ \param currentIndex index of item to be selected in the SelectionDialog by default.
\sa stringItems()
*/
@@ -131,7 +135,6 @@
}
/*!
- @beta
Returns list of string list items earlier set by setStringItems().
\sa setStringItems()
@@ -143,7 +146,6 @@
}
/*!
- @beta
Returns list of selected indexes. List contains only one item if
\a SelectionMode is \a NoSelection or \a SingleSelection. It may
contain more items if \a SelectionMode is \a MultiSelection.
@@ -158,12 +160,11 @@
}
/*!
- @beta
set the item selected.
It can select one item if \a Selection mode is \a SingleSelection
it can select more item if \a SelectionMode is \a MultiSelection.
- \param items.
+ \param items indices of the items to be selected in SelectionDialog.
\sa selectedItems
*/
@@ -174,7 +175,6 @@
}
/*!
- @beta
Returns list of selected model indexes. List contains only one item if
\a SelectionMode is \a NoSelection or \a SingleSelection. It may
contain more items if \a SelectionMode is \a MultiSelection.
@@ -189,16 +189,15 @@
}
/*!
- @beta
Sets the list of custom list items to be displayed.\a items is the
list of custom items.\a bTransferOwnership is a flag defining the owner
of the items. If \a true, items will be deleted when dialog is deleted else
user is responsible for deleting the items.Default value is \a false.
\a current is the index of default selection.
- \param items. items is the list of custom items
- \param transferOwnership. true or false
- \param currentIndex
+ \param items list of custom items to be set as input to SelectionDialog.
+ \param transferOwnership Transfer the ownership of items to SelectionDialog by passing true else false.
+ \param currentIndex index of the item to be selected in SelectionDialog.
\sa widgetItems();
*/
@@ -209,7 +208,6 @@
}
/*!
- @beta
Returns list of custom list items earlier set by setWidgetItems().
\sa setWidgetItems().
@@ -221,10 +219,9 @@
}
/*!
- @beta
Sets the Model containing data for the list items.
- \param model.
+ \param model which has data for items to be set as input to SelectionDialog.
\sa model()
*/
@@ -235,7 +232,6 @@
}
/*!
- @beta
Returns model eariler set by setModel().
\sa setModel()
@@ -246,5 +242,4 @@
return d->model();
}
-
#include "moc_hbselectiondialog.cpp"
--- a/src/hbwidgets/popups/hbselectiondialog_p.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/popups/hbselectiondialog_p.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -84,7 +84,7 @@
lbCounter->setText(QString(QString::number(selectedItems) + "/" + QString::number(totalItems)));
//update checked state of "MarkAll" checkbox
- if (selectedItems == totalItems){
+ if (totalItems > 0 && (selectedItems == totalItems)){
chkMark->blockSignals(true); //should not call _q_checkboxclicked()
chkMark->setChecked(true);
chkMark->blockSignals(false);
@@ -107,11 +107,13 @@
indexStart = itemModel->index(0,0);
indexEnd = itemModel->index(itemModel->rowCount()-1,0);
totalItems = itemModel->rowCount();
+ Q_UNUSED( totalItems ); // todo: remove totalItems if not needed
}
QItemSelectionModel* selectionModel = mListWidget->selectionModel();
if(selectionModel){
selectedItems = selectionModel->selectedRows().count();
+ Q_UNUSED( selectedItems ); // todo: remove selectedItems if not needed
if(value){ //Select All
selectionModel->select(QItemSelection(indexStart,indexEnd),QItemSelectionModel::Select);
}
--- a/src/hbwidgets/sliders/hbprogressbar.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/sliders/hbprogressbar.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -53,7 +53,7 @@
progress (value() - minimum()) divided by maximum() - minimum().
By default the min value is 0 and max value is 100.If minimum and maximum both are set to 0, the bar shows a busy indicator
- instead of a percentage of steps.
+ instead of a percentage of steps.The ProgressBar is always non interactive.
ProgressBar also supports adding text . Min-Max text pair is also supported which is commonly
used for progress indication for music.
--- a/src/hbwidgets/sliders/hbprogressslider.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/sliders/hbprogressslider.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -212,14 +212,15 @@
@beta
@hbwidgets
\class HbProgressSlider
- \brief ProgressSlider is used to indicate the current position of a playing music or video.It can show the progress
+ \brief ProgressSlider is used to indicate the current position of a playing music or video. It can show the progress
of a progressing music or video along with the status of the buffered data.
\image html progressslider.png "A Progress Slider with Min-Max text at bottom "
+ \image html progressslider2.png "A Progress Slider with Min-Max text at bottom and with pregress value"
- ProgressSlider is a basic slider but the track is like a progressbar indicating how much progress
- has been done. its a slider with progressbar as its track with some additional behaviour.
+ ProgressSlider has a track like Progress Bar indicating how much progress
+ has been done. It is a Progress Bar with some additional behaviour.
There is also a progressValue which indicates the amount of buffered data.General use
for this widget would be for playing music online which indicates sliderValue as currentTime and
progressValue as the buffered amount.
@@ -233,11 +234,11 @@
void sliderReleased();
void sliderMoved(int value);
- sliderPressed is emits when the track is pressed.
- sliderReleased is emits when the track is released.
- sliderMoved is emits when the handle is moved in any direction.
+ sliderPressed is emitted when the track is pressed.
+ sliderReleased is emitted when the track is released.
+ sliderMoved is emitted when the handle is moved in any direction.
- The Application can customize the Slider behaviour by listening the signals sliderPressed and sliderReleased.By default there
+ The Application can customize the Slider behaviour by listening to the signals sliderPressed and sliderReleased.By default there
is no behaviour defined by HbProgressSlider for these actions.
By default the min value is 0 and max value is 100. The application can set the progressValue (buffer data) and
@@ -268,7 +269,7 @@
/*!
@beta
- Constructs a progressslider with a parent.
+ Constructs a Progress Slider with a parent.
*/
HbProgressSlider::HbProgressSlider(QGraphicsItem *parent) :
@@ -299,7 +300,7 @@
/*!
@beta
- Constructs a progress bar with the given parent.
+ Constructs a Progress Bar with the given parent.
\param parent The parent of ProgressBar
*/
HbProgressSlider::HbProgressSlider(HbProgressSliderPrivate &dd,QGraphicsItem *parent) :
@@ -323,7 +324,7 @@
/*!
@beta
- Destructor for the progressslider.
+ Destructor for the Progress Slider.
*/
HbProgressSlider::~HbProgressSlider()
{
--- a/src/hbwidgets/sliders/hbratingslider.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/sliders/hbratingslider.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -140,14 +140,15 @@
/*!
\class HbRatingSlider
- \brief This is a widget through which user can do rating for videos , music etc.
+ \brief This is a widget that enables a user to rate contents like videos , music etc.
\image html ratingslider.png "A Rating Slider with rating done"
- By default there are 5 ratings. The default rating graphics comes from theme.It supports custom graphics
- also.The custom graphics should contain only 1 star.Using the API \a setNumberOfIcons() number of icons can be
- configured.By default it is 5 and maximum number of icons is 10.
+ The default version of Rating Slider contains 5 repeated icons drawn side by side, using a single themed graphics.
+ The application can replace the themed graphic with a custom graphic.
+ The custom graphics should contain only one icon (eg one star) which will be multipled by the API \a setNumberOfIcons().
+ By default it is 5 and maximum number of icons are 10.
- Along with the rating HbRatingSlider can be used to show the cumulative rating also.
+ Along with the rating Rating Slider can be used to show the cumulative rating also.
To use HbRatingSlider with default settings it just needs to be created.
example code:
@@ -160,8 +161,16 @@
void ratingDone(int ratingValue);
void ratingChanged(int ratingValue);
- ratingDone is emits when the user does the rating and releases the finger.
- ratingChanged is emits when the user changes the rating by simply moving on the Rating Slider
+ ratingDone is emitted when the user does the rating and releases the finger.
+ ratingChanged is emitted when the user presses and drags the finger on Rating Slider.
+
+ To use HbRatingSlider with default settings it just needs to be created.
+ example code:
+ \code
+ HbMainWindow window;
+ HbRatingSlider *rs = new HbRatingSlider();
+ window.addView(rs);
+ \endcode
HbRatingSlider supports integer ratings.But using the API \a setStepCount() fraction ratings can also be
shown on Rating Slider
@@ -175,7 +184,7 @@
\endcode
This will show as 2.5/5. Now if on the same ratingslider
- the Application wants to configure a rating slider with range 1-5
+ the Application wants to configure a Rating Slider with range 1-5
on emitting the signal rating changed it can set to 5.
*/
@@ -187,6 +196,9 @@
*/
+
+
+
HbRatingSlider::HbRatingSlider(QGraphicsItem *parent) :
HbWidget(*new HbRatingSliderPrivate,parent)
{
@@ -235,7 +247,7 @@
@beta
Sets the number of icons. There can be n number of repeated icons. This method can be used to set
- the number of icons required.The default image is "*" and have 5 stars.
+ the number of icons required.The default image is "*" and has 5 stars.
\param number. A value between 1 and 10
@@ -269,7 +281,7 @@
/*!
@beta
- Sets the step count for the rating slider.This indicates the interval of the rating. Eg. If step count is 10
+ Sets the step count for the Rating Slider.This indicates the interval of the rating. Eg. If step count is 10
then 10 rating is possible.
\param count. A value between 1 and 100. This can be considerd as the maximum rating possible.
@@ -354,8 +366,8 @@
/*!
@beta
- It sets the unrated graphics name.This is the graphics shown when rating slider is displayed.
- the grpahics can be a single star kind of or multi star image. If it is single star then use setNumberOfIcons for
+ It sets the unrated graphics name.This is the graphics shown when Rating Slider is displayed.
+ the graphicscan be a single star kind of or multi star image. If it is single star then use setNumberOfIcons for
setting number of stars.
\param name. The graphics name along with the path.
@@ -389,7 +401,7 @@
@beta
It sets the rated graphics name.This is the graphics shown when rating is on going.
- the grpahics can be a single star kind of or multi star image. If it is single star then use setNumberOfIcons for
+ the graphicscan be a single star kind of or multi star image. If it is single star then use setNumberOfIcons for
setting number of stars.
\param name. The graphics name along with the path.
--- a/src/hbwidgets/widgets/hbcombobox.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/widgets/hbcombobox.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -134,6 +134,7 @@
d->init( );
updatePrimitives( );
setProperty( "state", "normal" );
+ setFlag(QGraphicsItem::ItemSendsScenePositionChanges);
}
/*!
@@ -1043,6 +1044,24 @@
/*!
\reimp
*/
+QVariant HbComboBox::itemChange( GraphicsItemChange change, const QVariant & value )
+{
+ Q_D( HbComboBox );
+ switch( change ) {
+ case QGraphicsItem::ItemScenePositionHasChanged:
+ if( ( d->mDropDown ) && ( d->mDropDown->mList ) && ( d->mDropDown->isVisible( ) ) ) {
+ d->positionDropDown( );
+ }
+ break;
+ default:
+ break;
+ }
+ return HbWidget::itemChange( change, value );
+}
+
+/*!
+ \reimp
+ */
void HbComboBox::changeEvent( QEvent *event )
{
switch ( event->type( ) ) {
@@ -1055,6 +1074,7 @@
HbWidget::changeEvent( event );
}
+
// End of file
--- a/src/hbwidgets/widgets/hbcombobox.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/widgets/hbcombobox.h Fri Jun 11 13:58:22 2010 +0300
@@ -135,6 +135,7 @@
void keyReleaseEvent( QKeyEvent *event );
void changeEvent( QEvent *event );
bool eventFilter( QObject *obj, QEvent *event );
+ QVariant itemChange ( GraphicsItemChange change, const QVariant & value );
private:
Q_DECLARE_PRIVATE_D( d_ptr, HbComboBox )
--- a/src/hbwidgets/widgets/hbpushbutton.cpp Thu May 27 13:10:59 2010 +0300
+++ b/src/hbwidgets/widgets/hbpushbutton.cpp Fri Jun 11 13:58:22 2010 +0300
@@ -453,6 +453,9 @@
HbStyleOptionPushButton buttonOption;
initStyleOption( &buttonOption );
style()->updatePrimitive( d->iconItem, HbStyle::P_PushButton_icon, &buttonOption );
+ if ( isEnabled() ) {
+ setProperty("state", "normal");
+ }
}
if( doPolish ) {
